Changeset 2946

Timestamp:

Apr 4, 2018 5:01:23 PM (7 years ago)

Author:

suehring

Message:

Bugfix for revision 2945, perform checks only if dynamic input file is available; remove unused module load

Location:

palm/trunk/SOURCE

Files:

• netcdf_data_input_mod.f90 (modified) (2 diffs)
• synthetic_turbulence_generator_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix for revision 2945, perform checks only if dynamic input file is 
+! available.
+! 
+! 2945 2018-04-04 16:27:14Z suehring
 ! - Mimic for topography input slightly revised, in order to enable consistency 
 !   checks
@@ -2803 +2807 @@
 !--    Check for correct horizontal and vertical dimension. 
 !--    Please note, u- and v-grid has 1 grid point less on Inifor grid. 
-       IF ( init_3d%nx-1 /= nx  .OR.  init_3d%nxu-1 /= nx - 1  .OR.            &
-            init_3d%ny-1 /= ny  .OR.  init_3d%nyv-1 /= ny - 1 )  THEN
-          message_string = 'Number of inifor horizontal grid points does '  // &
-                           'not match the number of numeric grid points.'
-          CALL message( 'netcdf_data_input_mod', 'NDI003', 1, 2, 0, 6, 0 )
-       ENDIF
-
-       IF ( init_3d%nzu /= nz )  THEN
-          message_string = 'Number of inifor vertical grid points does '  // &
-                           'not match the number of numeric grid points.'
-          CALL message( 'netcdf_data_input_mod', 'NDI003', 1, 2, 0, 6, 0 )
+       IF ( input_pids_dynamic )  THEN
+
+          IF ( init_3d%nx-1 /= nx  .OR.  init_3d%nxu-1 /= nx - 1  .OR.         &
+               init_3d%ny-1 /= ny  .OR.  init_3d%nyv-1 /= ny - 1 )  THEN
+             message_string = 'Number of inifor horizontal grid points does '//&
+                              'not match the number of numeric grid points.'
+             CALL message( 'netcdf_data_input_mod', 'NDI003', 1, 2, 0, 6, 0 )
+          ENDIF
+
+          IF ( init_3d%nzu /= nz )  THEN
+             message_string = 'Number of inifor vertical grid points does ' // &
+                              'not match the number of numeric grid points.'
+             CALL message( 'netcdf_data_input_mod', 'NDI003', 1, 2, 0, 6, 0 )
+          ENDIF
+
        ENDIF
 

palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Remove unused module load
+! 
+! 2945 2018-04-04 16:27:14Z suehring
 ! - Bugfix in parallelization of synthetic turbulence generator in case the 
 !   z-dimension is not an integral divisor of the number of processors along  
@@ -1393 +1396 @@
         ONLY: ny
 
-    USE pegrid
-
     IMPLICIT NONE