Changeset 595 for palm/trunk

Timestamp:

Nov 12, 2010 9:52:10 AM (14 years ago)

Author:

helmke

Message:

Calculation of z locations for masked output changed

Location:

palm/trunk/SOURCE

Files:

• init_masks.f90 (modified) (3 diffs)
• read_var_list.f90 (modified) (1 diff)

palm/trunk/SOURCE/init_masks.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! Calculation of z locations for masked output changed
 !
 ! Former revisions:
@@ -469 +469 @@
              ELSEIF ( dim == 3 )  THEN
                 ind_array =  &
-                     MINLOC( ABS( mask(mid,dim,count) * mask_scale(dim) - zw ) )
+                     MINLOC( ABS( mask(mid,dim,count) * mask_scale(dim) - zu ) )
                 m = ind_array(1) - 1 + nzb  ! MINLOC uses lower array bound 1
              ENDIF
@@ -523 +523 @@
              IF ( mask_loop(mid,dim,2) < 0.0 )  THEN
                 tmp2 = mask_loop(mid,dim,2)
-                mask_loop(mid,dim,2) = zw(nz) / mask_scale(dim)   ! (default)
+                mask_loop(mid,dim,2) = zu(nz) / mask_scale(dim)   ! (default)
              ENDIF
              IF ( MAXVAL( mask_loop(mid,dim,1:2) )  &
-                  > zw(nz) / mask_scale(dim) )  THEN
+                  > zu(nz) / mask_scale(dim) )  THEN
                 WRITE ( message_string, '(2(A,I3,A,I1,A,F9.3),A,I1,A,F9.3)' ) &
                      'mask_loop(',mid,',',dim,',1)=',mask_loop(mid,dim,1), &
                      ' and/or mask_loop(',mid,',',dim,',2)=', &
-                     mask_loop(mid,dim,2),'&exceed zw(nz)/mask_scale(',dim, &
-                     ')=',zw(nz)/mask_scale(dim)
+                     mask_loop(mid,dim,2),'&exceed zu(nz)/mask_scale(',dim, &
+                     ')=',zu(nz)/mask_scale(dim)
                 CALL message( 'init_masks', 'PA0333', 1, 2, 0, 6, 0 )
              ENDIF
              ind_array =  &
-                  MINLOC( ABS( mask_loop(mid,dim,1) * mask_scale(dim) - zw ) )
+                  MINLOC( ABS( mask_loop(mid,dim,1) * mask_scale(dim) - zu ) )
              loop_begin =  &
                   ind_array(1) - 1 + nzb ! MINLOC uses lower array bound 1
              ind_array =  &
-                  MINLOC( ABS( mask_loop(mid,dim,2) * mask_scale(dim) - zw ) )
+                  MINLOC( ABS( mask_loop(mid,dim,2) * mask_scale(dim) - zu ) )
              loop_end = ind_array(1) - 1 + nzb ! MINLOC uses lower array bound 1
 !

palm/trunk/SOURCE/read_var_list.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! remove print command
 !
 ! Former revisions: