Changeset 4893 for palm/trunk/SOURCE/land_surface_model_mod.f90

Timestamp:

Mar 2, 2021 4:39:14 PM (3 years ago)

Author:

raasch

Message:

revised output of surface data via MPI-IO for better performance

File:

• palm/trunk/SOURCE/land_surface_model_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -24 +24 @@
 ! -----------------
 ! $Id$
+! revised output of surface data via MPI-IO for better performance
+!
+! 4876 2021-02-17 12:27:36Z raasch
 ! bugfix for instantaneous c_liq output
 !
@@ -6249 +6252 @@
     INTEGER(iwp)      ::  l      !< index variable for surface orientation
 
-    INTEGER(iwp),DIMENSION(nys:nyn,nxl:nxr) ::  global_start_index  !< index for surface data (MPI-IO)
+    INTEGER(iwp),DIMENSION(nys:nyn,nxl:nxr) ::  global_end_index    !< end index for surface data (MPI-IO)
+    INTEGER(iwp),DIMENSION(nys:nyn,nxl:nxr) ::  global_start_index  !< start index for surface data (MPI-IO)
 
     LOGICAL ::  surface_data_to_write  !< switch for MPI-I/O if PE has surface data to write
@@ -6435 +6439 @@
 
           CALL rd_mpi_io_surface_filetypes( surf_lsm_h(l)%start_index, surf_lsm_h(l)%end_index,    &
-                                            surface_data_to_write, global_start_index )
-
-          CALL wrd_mpi_io( 'lsm_start_index_h_' // dum,  surf_lsm_h(l)%start_index )
-          CALL wrd_mpi_io( 'lsm_end_index_h_' // dum,  surf_lsm_h(l)%end_index )
+                                            surface_data_to_write, global_start_index,             &
+                                            global_end_index )
+
           CALL wrd_mpi_io( 'lsm_global_start_index_h_' // dum, global_start_index )
+          CALL wrd_mpi_io( 'lsm_global_end_index_h_' // dum, global_end_index )
 
           IF ( .NOT. surface_data_to_write )  CYCLE
 
           CALL wrd_mpi_io_surface( 't_soil_h(' // dum // ')', t_soil_h(l)%var_2d )
-          CALL wrd_mpi_io_surface( 'm_soil_h(' // dum // ')',  m_soil_h(l)%var_2d )
+          CALL wrd_mpi_io_surface( 'm_soil_h(' // dum // ')', m_soil_h(l)%var_2d )
           CALL wrd_mpi_io_surface( 'm_liq_h(' // dum // ')', m_liq_h(l)%var_1d )
           CALL wrd_mpi_io_surface( 't_surface_h(' // dum // ')', t_surface_h(l)%var_1d )
@@ -6454 +6458 @@
 
           CALL rd_mpi_io_surface_filetypes ( surf_lsm_v(l)%start_index, surf_lsm_v(l)%end_index,   &
-                                             surface_data_to_write, global_start_index )
-
-          CALL wrd_mpi_io( 'lsm_start_index_v_' // dum,  surf_lsm_v(l)%start_index )
-          CALL wrd_mpi_io( 'lsm_end_index_v_' // dum,  surf_lsm_v(l)%end_index )
-          CALL wrd_mpi_io( 'lsm_global_start_index_v_' // dum , global_start_index )
+                                            surface_data_to_write, global_start_index,             &
+                                            global_end_index )
+
+          CALL wrd_mpi_io( 'lsm_global_start_index_v_' // dum, global_start_index )
+          CALL wrd_mpi_io( 'lsm_global_end_index_v_' // dum, global_end_index )
 
           IF ( .NOT. surface_data_to_write )  CYCLE
@@ -7133 +7137 @@
     INTEGER(iwp) ::  l   !< running index surface orientation
 
-    !INTEGER(iwp), DIMENSION(nys:nyn,nxl:nxr) ::  end_index
-    INTEGER(iwp), DIMENSION(nys:nyn,nxl:nxr) ::  global_start
-    !INTEGER(iwp), DIMENSION(nys:nyn,nxl:nxr) ::  start_index
-
-    LOGICAL      :: array_found
-    LOGICAL      :: ldum
+    INTEGER(iwp), DIMENSION(nys:nyn,nxl:nxr) ::  global_end_index
+    INTEGER(iwp), DIMENSION(nys:nyn,nxl:nxr) ::  global_start_index
+
+    LOGICAL ::  array_found
+    LOGICAL ::  data_to_read    !< switch to steer reading of data
 
 
@@ -7205 +7208 @@
        WRITE( dum, '(I1)')  l
 
-       CALL rrd_mpi_io( 'lsm_start_index_h_' // dum,  surf_lsm_h(l)%start_index )
-       CALL rrd_mpi_io( 'lsm_end_index_h_' // dum,  surf_lsm_h(l)%end_index )
-       CALL rrd_mpi_io( 'lsm_global_start_index_h_' // dum, global_start )
-
-       CALL rd_mpi_io_surface_filetypes ( surf_lsm_h(l)%start_index, surf_lsm_h(l)%end_index, ldum,&
-                                          global_start )
-
-       IF ( MAXVAL( surf_lsm_h(l)%end_index ) <= 0 )  CYCLE
+!
+!--    surf_lsm_h(l)%start_index and surf_lsm_h(l)%end_index are already set and should not be read
+!--    from restart file.
+       CALL rrd_mpi_io( 'lsm_global_start_index_h_' // dum, global_start_index )
+       CALL rrd_mpi_io( 'lsm_global_end_index_h_' // dum, global_end_index )
+
+       CALL rd_mpi_io_surface_filetypes ( surf_lsm_h(l)%start_index, surf_lsm_h(l)%end_index,      &
+                                          data_to_read, global_start_index, global_end_index )
+       IF ( .NOT. data_to_read )  CYCLE
 
        CALL rrd_mpi_io_surface( 't_soil_h(' // dum // ')', t_soil_h(l)%var_2d )
@@ -7218 +7222 @@
        CALL rrd_mpi_io_surface( 'm_liq_h(' // dum // ')', m_liq_h(l)%var_1d )
        CALL rrd_mpi_io_surface( 't_surface_h(' // dum // ')', t_surface_h(l)%var_1d )
+
     ENDDO
 
@@ -7224 +7229 @@
        WRITE( dum, '(I1)')  l
 
-!kk    In case of nothing to do, the settings of start_index and end_index differ
-!kk    between writing and reading restart file
-!kk
-!kk    Has to be discussed with the developers
-
-       CALL rrd_mpi_io( 'lsm_start_index_v_' // dum,  surf_lsm_v(l)%start_index )
-       CALL rrd_mpi_io( 'lsm_end_index_v_' // dum,  surf_lsm_v(l)%end_index )
-       CALL rrd_mpi_io( 'lsm_global_start_index_v_' // dum , global_start )
-
-       CALL rd_mpi_io_surface_filetypes( surf_lsm_v(l)%start_index, surf_lsm_v(l)%end_index, ldum, &
-                                         global_start )
-
-       IF ( MAXVAL( surf_lsm_v(l)%end_index ) <= 0 )  CYCLE
+!
+!--    surf_lsm_v(l)%start_index and surf_lsm_v(l)%end_index are already set and should not be read
+!--    from restart file.
+       CALL rrd_mpi_io( 'lsm_global_start_index_v_' // dum , global_start_index )
+       CALL rrd_mpi_io( 'lsm_global_end_index_v_' // dum , global_end_index )
+
+       CALL rd_mpi_io_surface_filetypes( surf_lsm_v(l)%start_index, surf_lsm_v(l)%end_index,       &
+                                         data_to_read, global_start_index, global_end_index )
+       IF ( .NOT. data_to_read )  CYCLE
 
        CALL rrd_mpi_io_surface( 't_soil_v(' // dum // ')', t_soil_v(l)%var_2d )