Changeset 879 for palm/trunk/SOURCE/poismg.f90

Timestamp:

Apr 12, 2012 3:38:37 PM (12 years ago)

Author:

raasch

Message:

Bugfix: preprocessor statements for parallel execution added

File:

• palm/trunk/SOURCE/poismg.f90 (modified) (4 diffs)

palm/trunk/SOURCE/poismg.f90

@@ -7 +7 @@
 ! Current revisions:
 ! -----------------
-!
+! Bugfix: preprocessor statements for parallel execution added
 !
 ! Former revisions:
@@ -88 +88 @@
 !-- Initialize arrays and variables used in this subroutine
 
-!--    If the number of grid points of the gathered grid, which is collected
-!--    on PE0, is larger than the number of grid points of an PE, than array
-!--    p3 will be enlarged. 
+!-- If the number of grid points of the gathered grid, which is collected
+!-- 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(         &
-                    mg_switch_to_pe0_level)-1:nyn_mg(mg_switch_to_pe0_level)+1,   &
-                    nxl_mg(mg_switch_to_pe0_level)-1:nxr_mg(                    &
+       ALLOCATE( p3(nzb:nzt_mg(mg_switch_to_pe0_level)+1,nys_mg(               &
+                    mg_switch_to_pe0_level)-1:nyn_mg(mg_switch_to_pe0_level)+1,&
+                    nxl_mg(mg_switch_to_pe0_level)-1:nxr_mg(                   &
                     mg_switch_to_pe0_level)+1) )
     ELSE
        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
+ 
 !
 !-- Ghost boundaries have to be added to divergence array.
@@ -1272 +1277 @@
 !--    from the coarse to the next finer grid.
        IF ( grid_level == mg_switch_to_pe0_level+1 )  THEN
+
+#if defined( __parallel )
 !
 !--       At this level, the new residual first has to be scattered from
@@ -1352 +1359 @@
 
           DEALLOCATE( p2_sub )
+#endif
 
        ELSE
+
           CALL prolong( p2, p3 )