Changeset 1032 for palm/trunk

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)

Location:

palm/trunk/SOURCE

Files:

• check_for_restart.f90 (modified) (3 diffs)
• init_3d_model.f90 (modified) (4 diffs)
• init_masks.f90 (modified) (3 diffs)
• swap_timelevel.f90 (modified) (3 diffs)

palm/trunk/SOURCE/check_for_restart.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! minor reformatting
 !
 ! Former revisions:
@@ -97 +97 @@
 #if defined( __parallel )
        IF ( myid == 0 ) THEN
-          CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,          &
-                             target_id, 0,                                      &
-                             terminate_coupled_remote, 1, MPI_INTEGER,          &
-                             target_id, 0,                                      &
+          CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,         &
+                             target_id, 0,                                     &
+                             terminate_coupled_remote, 1, MPI_INTEGER,         &
+                             target_id, 0,                                     &
                              comm_inter, status, ierr )
        ENDIF
-       CALL MPI_BCAST( terminate_coupled_remote, 1, MPI_INTEGER, 0, comm2d, ierr)
+       CALL MPI_BCAST( terminate_coupled_remote, 1, MPI_INTEGER, 0, comm2d,  &
+                       ierr )
 #endif
     ENDIF
@@ -147 +148 @@
 #if defined( __parallel )
              IF ( myid == 0 ) THEN
-                CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,    &
-                                   target_id,  0,                               &
-                                   terminate_coupled_remote, 1, MPI_INTEGER,    &
-                                   target_id,  0,                               &
+                CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER,   &
+                                   target_id,  0,                              &
+                                   terminate_coupled_remote, 1, MPI_INTEGER,   &
+                                   target_id,  0,                              &
                                    comm_inter, status, ierr )   
              ENDIF
-             CALL MPI_BCAST( terminate_coupled_remote, 1, MPI_INTEGER, 0, comm2d, ierr)  
-            
+             CALL MPI_BCAST( terminate_coupled_remote, 1, MPI_INTEGER, 0,  &
+                             comm2d, ierr )  
 #endif
           ENDIF

palm/trunk/SOURCE/init_3d_model.f90

@@ -7 +7 @@
 ! Current revisions:
 ! ------------------
-! 
+! save memory by not allocating pt_2 in case of neutral = .T.
+!
 !
 ! Former revisions:
@@ -274 +275 @@
               e_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg),   &
               pt_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),  &
-              pt_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg),  &
               pt_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg),  &
               u_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),   &
@@ -285 +285 @@
               w_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg),   &
               w_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+    IF ( .NOT. neutral )  THEN
+       ALLOCATE( pt_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+    ENDIF
 #endif
 
@@ -473 +476 @@
 !-- Initial assignment of the pointers
     e  => e_1;   e_p  => e_2;   te_m  => e_3
-    pt => pt_1;  pt_p => pt_2;  tpt_m => pt_3
+    IF ( .NOT. neutral )  THEN
+       pt => pt_1;  pt_p => pt_2;  tpt_m => pt_3
+    ELSE
+       pt => pt_1;  pt_p => pt_1;  tpt_m => pt_3
+    ENDIF
     u  => u_1;   u_p  => u_2;   tu_m  => u_3
     v  => v_1;   v_p  => v_2;   tv_m  => v_3

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

palm/trunk/SOURCE/swap_timelevel.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! save memory by not allocating pt_2 in case of neutral = .T.
 !
 ! Former revisions:
@@ -83 +83 @@
           v  => v_1;   v_p  => v_2
           w  => w_1;   w_p  => w_2
-          pt => pt_1;  pt_p => pt_2
+          IF ( .NOT. neutral )  THEN
+             pt => pt_1;  pt_p => pt_2
+          ENDIF
           IF ( .NOT. constant_diffusion )  THEN
              e => e_1;    e_p => e_2
@@ -100 +102 @@
           v  => v_2;   v_p  => v_1
           w  => w_2;   w_p  => w_1
-          pt => pt_2;  pt_p => pt_1
+          IF ( .NOT. neutral )  THEN
+             pt => pt_2;  pt_p => pt_1
+          ENDIF
           IF ( .NOT. constant_diffusion )  THEN
              e => e_2;    e_p => e_1