Changeset 1032 for palm/trunk/SOURCE/init_masks.f90

Timestamp:

Oct 21, 2012 1:03:21 PM (12 years ago)

Author:

letzel

Message:

• mask locations determined based on scalar positions (init_masks)
• save memory by not allocating pt_2 in case of neutral = .T. (init_3d_model, swap_timelevel)
• minor reformatting (check_for_restart)

File:

• palm/trunk/SOURCE/init_masks.f90 (modified) (3 diffs)

palm/trunk/SOURCE/init_masks.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! hotfix: mask locations determined based on scalar positions
 ! netCDF4 without parallel file support implemented
 !
@@ -464 +465 @@
              count = count + 1
              IF ( dim == 1 .OR. dim == 2 )  THEN
-                m = NINT( mask(mid,dim,count) * mask_scale(dim) * ddxyz )
+                m = NINT( mask(mid,dim,count) * mask_scale(dim) * ddxyz - 0.5 )
              ELSEIF ( dim == 3 )  THEN
                 ind_array =  &
@@ -515 +516 @@
                 CALL message( 'init_masks', 'PA0332', 1, 2, 0, 6, 0 )
              ENDIF
-             loop_begin  = NINT( mask_loop(mid,dim,1) * mask_scale(dim) * ddxyz )
-             loop_end    = NINT( mask_loop(mid,dim,2) * mask_scale(dim) * ddxyz )
-             loop_stride = NINT( mask_loop(mid,dim,3) * mask_scale(dim) * ddxyz )
+             loop_begin  = NINT( mask_loop(mid,dim,1) * mask_scale(dim) &
+                  * ddxyz - 0.5 )
+             loop_end    = NINT( mask_loop(mid,dim,2) * mask_scale(dim) &
+                  * ddxyz - 0.5 )
+             loop_stride = NINT( mask_loop(mid,dim,3) * mask_scale(dim) &
+                  * ddxyz )
           ELSEIF ( dim == 3 )  THEN
              IF ( mask_loop(mid,dim,2) < 0.0 )  THEN