Changeset 2945 for palm/trunk/SOURCE/netcdf_data_input_mod.f90

Timestamp:

Apr 4, 2018 4:27:14 PM (6 years ago)

Author:

suehring

Message:

Bugfix in parallelization of synthetic turbulence generator; revision in control mimic of synthetic turbulence generator in case of RAN-LES nesting; checks for dynamic input file added; control mimic for topography input slightly revised.

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - Mimic for topography input slightly revised, in order to enable consistency 
+!   checks
+! - Add checks for dimensions in dynamic input file and move already existing
+!   checks 
+! 
+! 2938 2018-03-27 15:52:42Z suehring
 ! Initial read of geostrophic wind components from dynamic driver. 
 ! 
@@ -104 +110 @@
        INTEGER(iwp) :: nx                             !< dimension length in x
        INTEGER(iwp) :: ny                             !< dimension length in y
+       INTEGER(iwp) :: nz                             !< dimension length in z
        REAL(wp), DIMENSION(:), ALLOCATABLE :: x       !< dimension array in x
        REAL(wp), DIMENSION(:), ALLOCATABLE :: y       !< dimension array in y
+       REAL(wp), DIMENSION(:), ALLOCATABLE :: z       !< dimension array in z
     END TYPE dims_xy
 !
@@ -316 +324 @@
 !
 !-- Define variables
-    TYPE(dims_xy)    ::  dim_static !< data structure for x, y-dimension in static input file
+    TYPE(dims_xy)    ::  dim_static  !< data structure for x, y-dimension in static input file
 
     TYPE(force_type) ::  force     !< data structure for data input at lateral and top boundaries (provided by Inifor)  
@@ -1672 +1680 @@
        REAL(wp) ::  dum           !< dummy variable to skip columns while reading topography file   
 
-       IF ( TRIM( topography ) /= 'read_from_file' )  RETURN
 
        DO  ii = 0, io_blocks-1
@@ -1695 +1702 @@
                 CALL inquire_variable_names( id_topo, var_names )
 !
-!--             Read x, y - dimensions
+!--             Read x, y - dimensions. Only required for consistency checks.
                 CALL get_dimension_length( id_topo, dim_static%nx, 'x' )
                 CALL get_dimension_length( id_topo, dim_static%ny, 'y' )
@@ -1830 +1837 @@
 !
 !--          ASCII input
-             ELSE
+             ELSEIF ( TRIM( topography ) == 'read_from_file' )  THEN
 
                 OPEN( 90, FILE='TOPOGRAPHY_DATA'//TRIM( coupling_char ),       &
@@ -2013 +2020 @@
              CALL get_dimension_length( id_dynamic, init_3d%ny,  'y'  )
              CALL get_dimension_length( id_dynamic, init_3d%nyv, 'yv' )
-!
-!--          Check for correct horizontal dimension. Please note, u- and v-grid
-!--          hase 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 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
@@ -2376 +2374 @@
 
        USE indices,                                                            &
-           ONLY:  nx, nxl, nxlu, nxr, ny, nyn, nys, nysv, nzb, nzt
+           ONLY:  nxl, nxlu, nxr, nyn, nys, nysv, nzb, nzt
 
        IMPLICIT NONE
@@ -2780 +2778 @@
            ONLY:  initializing_actions, forcing, message_string
 
+       USE indices,                                                            &
+           ONLY:  nx, ny, nz
+
        IMPLICIT NONE
 
@@ -2798 +2799 @@
                            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 ( 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