Changeset 845 for palm/trunk/SOURCE

Timestamp:

Mar 7, 2012 10:23:05 AM (12 years ago)

Author:

maronga

Message:

Bugfixes for namelist file check

Location:

palm/trunk/SOURCE

Files:

• Makefile_check (modified) (4 diffs)
• check_namelist_files.f90 (modified) (2 diffs)
• check_parameters.f90 (modified) (4 diffs)

palm/trunk/SOURCE/Makefile_check

@@ -4 +4 @@
 # Current revisions:
 # ------------------
-#
+# Added init_cloud_physics
 #
 # Former revisions:
@@ -30 +30 @@
 RCS = check_open.f90 check_namelist_files.f90 check_parameters.f90 \
       close_file.f90 cpu_log.f90 exchange_horiz.f90 exchange_horiz_2d.f90 \
-      fft_xy.f90 init_grid.f90 init_masks.f90 \
+      fft_xy.f90 init_grid.f90 init_masks.f90 init_cloud_physics.f90 \
       init_pegrid.f90 local_flush.f90 local_stop.f90 local_system.f90 \
       message.f90 modules.f90 package_parin.f90 parin.f90 poisfft.f90 \
@@ -52 +52 @@
 OBJS = check_open.o check_namelist_files.o check_parameters.o close_file.o \
       cpu_log.o exchange_horiz.o exchange_horiz_2d.o fft_xy.o init_grid.o \
-      init_masks.o init_pegrid.o \
+      init_masks.o init_pegrid.o init_cloud_physics.o\
       local_flush.o local_stop.o local_system.o message.o \
       modules.o package_parin.o parin.o poisfft.o \
@@ -100 +100 @@
 exchange_horiz_2d.o: modules.o
 fft_xy.o: modules.o singleton.o temperton_fft.o
+init_cloud_physics.o: modules.o
 init_grid.o: modules.o
 init_masks.o: modules.o

palm/trunk/SOURCE/check_namelist_files.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! Added call to init_cloud_physics
 !
 ! Former revisions:
@@ -48 +48 @@
     CALL init_grid
 
-
+!
 !-- Check control parameters and deduce further quantities    
     CALL check_parameters
 
-
+!
+!-- Check absolute temperature and pressure. Delete this call in case that
+!-- init_3d_model is compiled for the parameter file check
+    CALL init_cloud_physics
 
  END PROGRAM check_namelist_files

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: exclude __netcdf4 directive part from namelist file check compilation
 !
 ! Former revisions:
@@ -231 +231 @@
 #if defined( __parallel )
 
-#if defined( __check )
-
 !
 !--    NOTE: coupled runs have not been implemented in the check_namelist_files
@@ -238 +236 @@
 !--    check_namelist_files will need the following information of the other 
 !--    model (atmosphere/ocean).
-       dt_coupling = remote
-       dt_max = remote
-       restart_time = remote
-       dt_restart= remote
-       simulation_time_since_reference = remote
-       dx = remote
-
-#endif
+!       dt_coupling = remote
+!       dt_max = remote
+!       restart_time = remote
+!       dt_restart= remote
+!       simulation_time_since_reference = remote
+!       dx = remote
+
 
 #if ! defined( __check )
@@ -2987 +2984 @@
 !-- Check the NetCDF data format
     IF ( netcdf_data_format > 2 )  THEN
-#if defined( __netcdf4 )
+#if defined( __netcdf4 ) && ! defined ( __check )
        CONTINUE
 #else