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

Timestamp:

Sep 23, 2020 3:09:19 PM (4 years ago)

Author:

pavelkrc

Message:

Fix writing and reading of surface data to/from MPI restart file + small fixes

File:

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

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Fix reading of surface data from MPI restart file
+!
+! 4671 2020-09-09 20:27:58Z pavelkrc
 ! Implementation of downward facing USM and LSM surfaces for RTM 4.1
 ! Author: J. Resler (Institute of Computer Science, Prague)
@@ -7611 +7614 @@
     INTEGER(iwp) ::  l   !< running index surface orientation
 
-    INTEGER(iwp), DIMENSION(nys:nyn,nxl:nxr) ::  end_index
+    !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
+    !INTEGER(iwp), DIMENSION(nys:nyn,nxl:nxr) ::  start_index
 
     LOGICAL      :: array_found
@@ -7690 +7693 @@
                                           global_start )
 
+       IF ( MAXVAL( surf_lsm_h(l)%end_index ) <= 0 )  CYCLE
+
        CALL rrd_mpi_io_surface( 't_soil_h(' // dum // ')', t_soil_h(l)%var_2d )
        CALL rrd_mpi_io_surface( 'm_soil_h(' // dum // ')',  m_soil_h(l)%var_2d )
@@ -7705 +7710 @@
 !kk    Has to be discussed with the developpers
 
-       CALL rrd_mpi_io( 'lsm_start_index_v_' // dum,  start_index )
-       CALL rrd_mpi_io( 'lsm_end_index_v_' // dum,  end_index )
+       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( start_index, end_index, ldum, global_start )
-
-       IF ( MAXVAL( end_index ) <= 0 )  CYCLE
+       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
 
        CALL rrd_mpi_io_surface( 't_soil_v(' // dum // ')', t_soil_v(l)%var_2d )