Changeset 3534 for palm/trunk/UTIL


Ignore:
Timestamp:
Nov 19, 2018 3:35:16 PM (3 years ago)
Author:
raasch
Message:

inifor integrated in build mechanism, some bugfixes in inifor to avoid compile time errors, batch_scp for sending back the job protocol file is called via login-node if a login-node has been set in the config-file, ssh-calls rearranged to avoid output of system/user-profile messages

Location:
palm/trunk/UTIL
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/UTIL/Makefile_utilities

    r3523 r3534  
    2323# -----------------
    2424# $Id$
     25# inifor build added
     26#
     27# 3523 2018-11-13 16:09:31Z suehring
    2528# Enable compilation of post-processing tool for surface output - interface
    2629# for posix conform sytemcalls is implemented.
     
    6669PROG3 =  agent_preprocessing
    6770PROG4 =  surface_output_to_vtk
     71PROG5 =  inifor
     72
     73SOURCES5 = \
     74 inifor.f90 \
     75 inifor_control.f90 \
     76 inifor_defs.f90 \
     77 inifor_grid.f90 \
     78 inifor_io.f90 \
     79 inifor_transform.f90 \
     80 inifor_types.f90 \
     81 inifor_util.f90
     82
    6883
    6984OBJS1 =  combine_plot_fields.o
     
    7186OBJS3 =  agent_preprocessing.o
    7287OBJS4 =  surface_output_to_vtk.o
     88OBJS5=$(SOURCES5:.f90=.o)
    7389
    7490CC = cc
     
    84100
    85101
    86 all: $(PROG1) $(PROG2) $(PROG3) $(PROG4)
     102all: $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5)
    87103
    88104$(PROG1): $(OBJS1)
     
    98114        $(F90_SER) -o $(PROG4) $(OBJS4) $(LDFLAGS)
    99115
     116$(PROG5): $(OBJS5)
     117        $(F90_SER) -o $(PROG5) $(OBJS5) $(LDFLAGS)
     118
    100119.f90.o:
    101120        $(F90_SER) $(F90FLAGS) $(COPT) -c $<
    102121
    103122
     123inifor.o: \
     124 inifor_control.o \
     125 inifor_defs.o \
     126 inifor_grid.o \
     127 inifor_io.o \
     128 inifor_transform.o \
     129 inifor_types.o
     130inifor_control.o: \
     131 inifor_defs.o \
     132 inifor_util.o
     133inifor_grid.o: \
     134 inifor_control.o \
     135 inifor_defs.o \
     136 inifor_io.o \
     137 inifor_transform.o \
     138 inifor_types.o \
     139 inifor_util.o
     140inifor_io.o: \
     141 inifor_control.o \
     142 inifor_defs.o \
     143 inifor_types.o \
     144 inifor_util.o
     145inifor_transform.o: \
     146 inifor_control.o \
     147 inifor_defs.o \
     148 inifor_types.o \
     149 inifor_util.o
     150inifor_types.o: \
     151 inifor_defs.o
     152inifor_util.o: \
     153 inifor_types.o
  • palm/trunk/UTIL/inifor/src/inifor_defs.f90

    r3456 r3534  
    2626! -----------------
    2727! $Id$
     28! NEW_LINE intrinsic replaced by ACHAR to avoid compile time error
     29!
     30! 3456 2018-10-30 14:29:54Z eckhard
    2831! Bumped version number
    2932!
     
    100103 CHARACTER(LEN=*), PARAMETER ::  VERSION = '1.4.1'            !< INIFOR version number
    101104 CHARACTER(LEN=*), PARAMETER ::  COPYRIGHT = 'Copyright 2017-2018 Leibniz Universitaet Hannover' // &
    102      NEW_LINE(' ') // ' Copyright 2017-2018 Deutscher Wetterdienst Offenbach' !< Copyright notice
     105     ACHAR( 10 ) // ' Copyright 2017-2018 Deutscher Wetterdienst Offenbach' !< Copyright notice
    103106
    104107 END MODULE defs
  • palm/trunk/UTIL/inifor/src/inifor_io.f90

    r3456 r3534  
    2626! -----------------
    2727! $Id$
     28! bugfix: INTENT attribute changed
     29!
     30! 3456 2018-10-30 14:29:54Z eckhard
    2831! NetCDf output of internal arrays only with --debug option
    2932!
     
    172175    SUBROUTINE get_input_dimensions(in_var, ncid)
    173176
    174        TYPE(nc_var), INTENT(INOUT)     ::  in_var
    175        INTEGER, INTENT(OUT)            ::  ncid
     177       TYPE(nc_var), INTENT(INOUT) ::  in_var
     178       INTEGER, INTENT(IN)         ::  ncid
    176179
    177180       INTEGER ::  i
  • palm/trunk/UTIL/inifor/src/inifor_transform.f90

    r3447 r3534  
    2626! -----------------
    2727! $Id$
     28! bugfix: working precision added
     29!
     30! 3447 2018-10-29 15:52:54Z eckhard
    2831! Renamed source files for compatibilty with PALM build system
    2932!
     
    348351
    349352       p(1) = constant_density_pressure(p(k_min), zk, rhok, drhodz,            &
    350                                         0.0, G)
     353                                        0.0_dp, G)
    351354
    352355    END SUBROUTINE get_surface_pressure
Note: See TracChangeset for help on using the changeset viewer.