Changeset 4617 for palm/trunk/SOURCE/read_restart_data_mod.f90

Timestamp:

Jul 22, 2020 9:48:50 AM (4 years ago)

Author:

raasch

Message:

cyclic fill mode implemented for MPI-IO, check, if boundary conditions in the prerun are both set to cyclic

File:

• palm/trunk/SOURCE/read_restart_data_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/read_restart_data_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! check, if boundary conditions in the prerun are both set to cyclic
+!
+! 4590 2020-07-06 14:34:59Z suehring
 ! Bugfix in allocation of hom and hom_sum in case of mpi-io restart when
 ! chemistry or salsa are employed
@@ -1176 +1179 @@
 
     CHARACTER (LEN=10) ::  version_on_file
+    CHARACTER (LEN=20) ::  bc_lr_on_file
+    CHARACTER (LEN=20) ::  bc_ns_on_file
     CHARACTER (LEN=20) ::  momentum_advec_check
     CHARACTER (LEN=20) ::  scalar_advec_check
@@ -1308 +1313 @@
                 ENDIF
 
+             CASE ( 'bc_lr' )
+                READ ( 13 )  bc_lr_on_file
+                IF ( TRIM( bc_lr_on_file ) /= 'cyclic' )  THEN
+                   message_string = 'bc_lr in the prerun was set /= "cyclic"'
+                   CALL message( 'rrd_read_parts_of_global', 'PA0498', 1, 2, 0, 6, 0 )
+                ENDIF
+
+             CASE ( 'bc_ns' )
+                READ ( 13 )  bc_ns_on_file
+                IF ( TRIM( bc_ns_on_file ) /= 'cyclic' )  THEN
+                   message_string = 'bc_ns in the prerun was set /= "cyclic"'
+                   CALL message( 'rrd_read_parts_of_global', 'PA0498', 1, 2, 0, 6, 0 )
+                ENDIF
+
              CASE ( 'hom' )
                 ALLOCATE( hom_on_file(0:nz+1,2,pr_palm+max_pr_user_on_file,    &
@@ -1445 +1464 @@
        ENDIF
 
-       CALL rrd_mpi_io( 'nx', nx_on_file )
-       CALL rrd_mpi_io( 'ny', ny_on_file )
-       CALL rrd_mpi_io_global_array( 'ref_state', ref_state )
+       CALL rrd_mpi_io( 'bc_lr', bc_lr_on_file )
+       CALL rrd_mpi_io( 'bc_ns', bc_ns_on_file )
+       IF ( TRIM( bc_lr_on_file ) /= 'cyclic'  .OR.  TRIM( bc_ns_on_file ) /= 'cyclic' )  THEN
+          message_string = 'bc_lr and/or bc_ns in the prerun was set /= "cyclic"'
+          CALL message( 'rrd_read_parts_of_global', 'PA0498', 1, 2, 0, 6, 0 )
+       ENDIF
 
        scalar_advec_check = scalar_advec
@@ -1457 +1479 @@
           CALL message( 'rrd_read_parts_of_global', 'PA0101', 1, 2, 0, 6, 0 )
        ENDIF
+
+       CALL rrd_mpi_io( 'nx', nx_on_file )
+       CALL rrd_mpi_io( 'ny', ny_on_file )
+       CALL rrd_mpi_io_global_array( 'ref_state', ref_state )
 
 !
@@ -2270 +2296 @@
 
 !
-!--    Read global restart data using MPI-IO
+!--    Read local restart data using MPI-IO
 !
 !--    Open the MPI-IO restart file.