Changeset 2942 for palm

Timestamp:

Apr 3, 2018 1:51:09 PM (7 years ago)

Author:

suehring

Message:

Bugfix in assigning surface element data after restart.

File:

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

palm/trunk/SOURCE/surface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Bugfix in assigning surface element data after restart
+! 
+! 2940 2018-04-03 11:22:42Z suehring
 ! Bugfix in reading restart data of vertical surface elements
 ! 
@@ -3928 +3931 @@
                    DO  m = surf_h(l)%start_index(j,i),                         &
                            surf_h(l)%end_index(j,i)
-                      CALL restore_surface_elements( surf_def_h(l),            &
-                                                     mm, surf_h(l), m )
+                      IF ( surf_def_h(l)%end_index(jc,ic) >= mm )              &
+                         CALL restore_surface_elements( surf_def_h(l),         &
+                                                        mm, surf_h(l), m )
                       mm = mm + 1
                    ENDDO
@@ -3938 +3942 @@
                    DO  m = surf_h(l)%start_index(j,i),                         &
                            surf_h(l)%end_index(j,i)
-                      CALL restore_surface_elements( surf_lsm_h,               &
-                                                     mm, surf_h(l), m )
+                      IF ( surf_lsm_h%end_index(jc,ic) >= mm )                 &
+                         CALL restore_surface_elements( surf_lsm_h,            &
+                                                        mm, surf_h(l), m )
                       mm = mm + 1
                    ENDDO
@@ -3948 +3953 @@
                    DO  m = surf_h(l)%start_index(j,i),                         &
                            surf_h(l)%end_index(j,i)
-                      CALL restore_surface_elements( surf_usm_h,               &
-                                                     mm, surf_h(l), m )
+                      IF ( surf_usm_h%end_index(jc,ic) >= mm )                 &
+                         CALL restore_surface_elements( surf_usm_h,            &
+                                                        mm, surf_h(l), m )
                       mm = mm + 1
                    ENDDO
@@ -3977 +3983 @@
                    DO  m = surf_v(l)%start_index(j,i),                         &
                            surf_v(l)%end_index(j,i)
-                      CALL restore_surface_elements( surf_def_v(l),            &
-                                                     mm, surf_v(l), m )
+                      IF ( surf_def_v(l)%end_index(jc,ic) >= mm )              &
+                         CALL restore_surface_elements( surf_def_v(l),         &
+                                                        mm, surf_v(l), m )
                       mm = mm + 1
                    ENDDO
@@ -3987 +3994 @@
                    DO  m = surf_v(l)%start_index(j,i),                         &
                            surf_v(l)%end_index(j,i)
-                      CALL restore_surface_elements( surf_lsm_v(l),            &
-                                                     mm, surf_v(l), m )
+                      IF ( surf_lsm_v(l)%end_index(jc,ic) >= mm )              &
+                         CALL restore_surface_elements( surf_lsm_v(l),         &
+                                                        mm, surf_v(l), m )
                       mm = mm + 1
                    ENDDO
@@ -3997 +4005 @@
                    DO  m = surf_v(l)%start_index(j,i),                         &
                            surf_v(l)%end_index(j,i)
-                      CALL restore_surface_elements( surf_usm_v(l),            &
-                                                     mm, surf_v(l), m )
+                      IF ( surf_usm_v(l)%end_index(jc,ic) >= mm )              &
+                         CALL restore_surface_elements( surf_usm_v(l),         &
+                                                        mm, surf_v(l), m )
                       mm = mm + 1
                    ENDDO
@@ -4027 +4036 @@
              TYPE( surf_type ) ::  surf_target !< target surface type
              TYPE( surf_type ) ::  surf_file   !< surface type on file
+
 
              IF ( INDEX( restart_string(1:length), '%us' ) /= 0 )  THEN