Changeset 2947

Timestamp:

Apr 4, 2018 6:01:41 PM (7 years ago)

Author:

suehring

Message:

Checks for dynamic input further revised

File:

• palm/trunk/SOURCE/netcdf_data_input_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Checks for dynamic input revised
+! 
+! 2946 2018-04-04 17:01:23Z suehring
 ! Bugfix for revision 2945, perform checks only if dynamic input file is 
 ! available.
@@ -1964 +1967 @@
 
        USE indices,                                                            &
-           ONLY:  nx, nxl, nxlu, nxr, ny, nyn, nys, nysv, nzb, nzt
+           ONLY:  nx, nxl, nxlu, nxr, ny, nyn, nys, nysv, nzb, nz, nzt
 
        IMPLICIT NONE
@@ -2024 +2027 @@
              CALL get_dimension_length( id_dynamic, init_3d%ny,  'y'  )
              CALL get_dimension_length( id_dynamic, init_3d%nyv, 'yv' )
+
+!
+!--          Check for correct horizontal and vertical dimension. Please note,
+!--          checks are performed directly here and not called from 
+!--          check_parameters as some varialbes are still not allocated there.  
+!--          Moreover, 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-1 /= 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
 !
 !--          Read vertical dimensions. Later, these are required for eventual
@@ -2782 +2806 @@
            ONLY:  initializing_actions, forcing, message_string
 
-       USE indices,                                                            &
-           ONLY:  nx, ny, nz
-
        IMPLICIT NONE
 
@@ -2803 +2824 @@
                            TRIM( coupling_char )
           CALL message( 'netcdf_data_input_mod', 'NDI010', 1, 2, 0, 6, 0 )
-       ENDIF
-!
-!--    Check for correct horizontal and vertical dimension. 
-!--    Please note, u- and v-grid has 1 grid point less on Inifor grid. 
-       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