Changeset 3534 for palm/trunk/UTIL

Timestamp:

Nov 19, 2018 3:35:16 PM (6 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:

• Makefile_utilities (modified) (5 diffs)
• inifor/src/inifor_defs.f90 (modified) (2 diffs)
• inifor/src/inifor_io.f90 (modified) (2 diffs)
• inifor/src/inifor_transform.f90 (modified) (2 diffs)

palm/trunk/UTIL/Makefile_utilities

@@ -23 +23 @@
 # -----------------
 # $Id$
+# inifor build added
+# 
+# 3523 2018-11-13 16:09:31Z suehring
 # Enable compilation of post-processing tool for surface output - interface
 # for posix conform sytemcalls is implemented.
@@ -66 +69 @@
 PROG3 =  agent_preprocessing
 PROG4 =  surface_output_to_vtk
+PROG5 =  inifor
+
+SOURCES5 = \
+ inifor.f90 \
+ inifor_control.f90 \
+ inifor_defs.f90 \
+ inifor_grid.f90 \
+ inifor_io.f90 \
+ inifor_transform.f90 \
+ inifor_types.f90 \
+ inifor_util.f90
+
 
 OBJS1 =  combine_plot_fields.o
@@ -71 +86 @@
 OBJS3 =  agent_preprocessing.o
 OBJS4 =  surface_output_to_vtk.o
+OBJS5=$(SOURCES5:.f90=.o)
 
 CC = cc
@@ -84 +100 @@
 
 
-all: $(PROG1) $(PROG2) $(PROG3) $(PROG4)
+all: $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5)
 
 $(PROG1): $(OBJS1)
@@ -98 +114 @@
         $(F90_SER) -o $(PROG4) $(OBJS4) $(LDFLAGS)
 
+$(PROG5): $(OBJS5)
+        $(F90_SER) -o $(PROG5) $(OBJS5) $(LDFLAGS)
+
 .f90.o:
         $(F90_SER) $(F90FLAGS) $(COPT) -c $<
 
 
+inifor.o: \
+ inifor_control.o \
+ inifor_defs.o \
+ inifor_grid.o \
+ inifor_io.o \
+ inifor_transform.o \
+ inifor_types.o
+inifor_control.o: \
+ inifor_defs.o \
+ inifor_util.o
+inifor_grid.o: \
+ inifor_control.o \
+ inifor_defs.o \
+ inifor_io.o \
+ inifor_transform.o \
+ inifor_types.o \
+ inifor_util.o
+inifor_io.o: \
+ inifor_control.o \
+ inifor_defs.o \
+ inifor_types.o \
+ inifor_util.o
+inifor_transform.o: \
+ inifor_control.o \
+ inifor_defs.o \
+ inifor_types.o \
+ inifor_util.o
+inifor_types.o: \
+ inifor_defs.o
+inifor_util.o: \
+ inifor_types.o

palm/trunk/UTIL/inifor/src/inifor_defs.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! NEW_LINE intrinsic replaced by ACHAR to avoid compile time error
+! 
+! 3456 2018-10-30 14:29:54Z eckhard
 ! Bumped version number
 ! 
@@ -100 +103 @@
  CHARACTER(LEN=*), PARAMETER ::  VERSION = '1.4.1'            !< INIFOR version number
  CHARACTER(LEN=*), PARAMETER ::  COPYRIGHT = 'Copyright 2017-2018 Leibniz Universitaet Hannover' // &
-     NEW_LINE(' ') // ' Copyright 2017-2018 Deutscher Wetterdienst Offenbach' !< Copyright notice
+     ACHAR( 10 ) // ' Copyright 2017-2018 Deutscher Wetterdienst Offenbach' !< Copyright notice
 
  END MODULE defs

palm/trunk/UTIL/inifor/src/inifor_io.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! bugfix: INTENT attribute changed
+! 
+! 3456 2018-10-30 14:29:54Z eckhard
 ! NetCDf output of internal arrays only with --debug option 
 ! 
@@ -172 +175 @@
     SUBROUTINE get_input_dimensions(in_var, ncid)
 
-       TYPE(nc_var), INTENT(INOUT)     ::  in_var
-       INTEGER, INTENT(OUT)            ::  ncid
+       TYPE(nc_var), INTENT(INOUT) ::  in_var
+       INTEGER, INTENT(IN)         ::  ncid
 
        INTEGER ::  i

palm/trunk/UTIL/inifor/src/inifor_transform.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! bugfix: working precision added
+! 
+! 3447 2018-10-29 15:52:54Z eckhard
 ! Renamed source files for compatibilty with PALM build system
 ! 
@@ -348 +351 @@
 
        p(1) = constant_density_pressure(p(k_min), zk, rhok, drhodz,            &
-                                        0.0, G)
+                                        0.0_dp, G)
 
     END SUBROUTINE get_surface_pressure