Changeset 880 for palm/trunk

Timestamp:

Apr 13, 2012 6:28:59 AM (13 years ago)

Author:

raasch

Message:

Bugfix: preprocessor statements for parallel execution added

Location:

palm/trunk/SOURCE

Files:

• modules.f90 (modified) (4 diffs)
• poismg.f90 (modified) (2 diffs)
• surface_coupler.f90 (modified) (4 diffs)

palm/trunk/SOURCE/modules.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! gathered_size, subdomain_size moved to control_parameters
 !
 ! Former revisions:
@@ -515 +515 @@
                 dosp_time_count = 0, dots_time_count = 0, &
                 do2d_xy_n = 0, do2d_xz_n = 0, do2d_yz_n = 0, do3d_avs_n = 0, &
-                dp_level_ind_b = 0, &
-                dvrp_filecount = 0, dz_stretch_level_index, gamma_mg, &
+                dp_level_ind_b = 0, dvrp_filecount = 0, &
+                dz_stretch_level_index, gamma_mg, gathered_size, &
                 grid_level, ibc_e_b, ibc_p_b, ibc_p_t, ibc_pt_b, ibc_pt_t, &
                 ibc_q_b, ibc_q_t, ibc_sa_t, ibc_uv_b, ibc_uv_t, &
@@ -529 +529 @@
                 nz_do1d, nz_do3d = -9999, outflow_damping_width = -1, &
                 pch_index = 0, prt_time_count = 0, recycling_plane, runnr = 0, &
-                skip_do_avs = 0, terminate_coupled = 0, &
+                skip_do_avs = 0, subdomain_size, terminate_coupled = 0, &
                 terminate_coupled_remote = 0, timestep_count = 0
 
@@ -1321 +1321 @@
 #endif
 
-    INTEGER ::  comm1dx, comm1dy, comm2d, comm_inter, comm_palm, gathered_size,&
-                ierr, myidx, myidy, ndim = 2, ngp_a, ngp_o, ngp_xy, ngp_y,     &
-                pleft, pnorth, pright, psouth,                                 &
-                sendrecvcount_xy, sendrecvcount_yz, sendrecvcount_zx,          &
-                sendrecvcount_zyd, sendrecvcount_yxd, subdomain_size,          &
+    INTEGER ::  comm1dx, comm1dy, comm2d, comm_inter, comm_palm, ierr, myidx,  &
+                myidy, ndim = 2, ngp_a, ngp_o, ngp_xy, ngp_y, pleft, pnorth,   &
+                pright, psouth, sendrecvcount_xy, sendrecvcount_yz,            &
+                sendrecvcount_zx, sendrecvcount_zyd, sendrecvcount_yxd,        &
                 type_x, type_x_int, type_xy, type_y, type_y_int
 

palm/trunk/SOURCE/poismg.f90

@@ -91 +91 @@
 !-- on PE0, is larger than the number of grid points of an PE, than array
 !-- p3 will be enlarged.
-#if defined( __parallel ) 
     IF ( gathered_size > subdomain_size )  THEN 
        ALLOCATE( p3(nzb:nzt_mg(mg_switch_to_pe0_level)+1,nys_mg(               &
@@ -100 +99 @@
        ALLOCATE ( p3(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
     ENDIF
-#else
-   ALLOCATE ( p3(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
-#endif
  
 !

palm/trunk/SOURCE/surface_coupler.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: preprocessor statements for parallel execution added
 !
 ! Former revisions:
@@ -390 +390 @@
 
   SUBROUTINE interpolate_to_atmos( tag )
+
+#if defined( __parallel )
 
     USE arrays_3d
@@ -454 +456 @@
     CALL MPI_BARRIER( comm2d, ierr )
 
+#endif
+
   END SUBROUTINE interpolate_to_atmos
 
 
   SUBROUTINE interpolate_to_ocean( tag )
+
+#if defined( __parallel )
 
     USE arrays_3d
@@ -518 +524 @@
     CALL MPI_BARRIER( comm2d, ierr )  
 
+#endif
+
   END SUBROUTINE interpolate_to_ocean