Changeset 4694 for palm/trunk/SOURCE/surface_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/surface_mod.f90 (modified) (3 diffs)

palm/trunk/SOURCE/surface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Fix reading of surface data from MPI restart file
+!
+! 4682 2020-09-17 14:13:27Z pavelkrc
 ! Fix indexing of horizontal surfaces in write restart for full-3D cases
 !
@@ -5626 +5629 @@
           DO  j = nys, nyn
              surf_match_def  = surf_def_h(l)%end_index(j,i) >= surf_def_h(l)%start_index(j,i)
+             IF ( l < 2 )  THEN
+                surf_match_lsm  = surf_lsm_h(l)%end_index(j,i) >= surf_lsm_h(l)%start_index(j,i)
+                surf_match_usm  = surf_usm_h(l)%end_index(j,i) >= surf_usm_h(l)%start_index(j,i)
+             ELSE
+                surf_match_lsm  = .FALSE.
+                surf_match_usm  = .FALSE.
+             ENDIF
              IF ( surf_match_def )  THEN
 !
@@ -5640 +5650 @@
                 ENDDO
              ENDIF
+!--          Natural- and urban-like horizontal surfaces.
+             IF ( surf_match_lsm )  THEN
+                mm = surf_lsm_h(l)%start_index(j,i)
+                DO  m = surf_h(l)%start_index(j,i), surf_h(l)%end_index(j,i)
+                   IF ( surf_lsm_h(l)%end_index(j,i) >= mm )                                             &
+                      CALL restore_surface_elements( surf_lsm_h(l), mm, surf_h(l), m )
+                   mm = mm + 1
+                ENDDO
+             ENDIF
+             IF ( surf_match_usm )  THEN
+                mm = surf_usm_h(l)%start_index(j,i)
+                DO  m = surf_h(l)%start_index(j,i), surf_h(l)%end_index(j,i)
+                   IF ( surf_usm_h(l)%end_index(j,i) >= mm )                                             &
+                      CALL restore_surface_elements( surf_usm_h(l), mm, surf_h(l), m )
+                   mm = mm + 1
+                ENDDO
+             ENDIF
           ENDDO
-       ENDDO
-    ENDDO
-!
-!-- Natural- and urban-like horizontal surfaces.
-    DO  i = nxl, nxr
-       DO  j = nys, nyn
-          surf_match_lsm  = surf_lsm_h(l)%end_index(j,i) >= surf_lsm_h(l)%start_index(j,i)
-          surf_match_usm  = surf_usm_h(l)%end_index(j,i) >= surf_usm_h(l)%start_index(j,i)
-
-          IF ( surf_match_lsm )  THEN
-             mm = surf_lsm_h(l)%start_index(j,i)
-             DO  m = surf_h(0)%start_index(j,i), surf_h(0)%end_index(j,i)
-                IF ( surf_lsm_h(l)%end_index(j,i) >= mm )                                             &
-                   CALL restore_surface_elements( surf_lsm_h(l), mm, surf_h(0), m )
-                mm = mm + 1
-             ENDDO
-          ENDIF
-
-          IF ( surf_match_usm )  THEN
-             mm = surf_usm_h(l)%start_index(j,i)
-             DO  m = surf_h(0)%start_index(j,i), surf_h(0)%end_index(j,i)
-                IF ( surf_usm_h(l)%end_index(j,i) >= mm )                                             &
-                   CALL restore_surface_elements( surf_usm_h(l), mm, surf_h(0), m )
-                mm = mm + 1
-             ENDDO
-          ENDIF
        ENDDO
     ENDDO