Changeset 4429 for palm/trunk/SOURCE/poismg_noopt_mod.f90

Timestamp:

Feb 27, 2020 3:24:30 PM (4 years ago)

Author:

raasch

Message:

serial (non-MPI) test case added, several bugfixes for the serial mode

File:

• palm/trunk/SOURCE/poismg_noopt_mod.f90 (modified) (10 diffs)

palm/trunk/SOURCE/poismg_noopt_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: cpp-directives added for serial mode
+! 
+! 4414 2020-02-19 20:16:04Z suehring
 ! Remove double-declared use only construct.
 ! 
@@ -1172 +1175 @@
 !> Gather subdomain data from all PEs.
 !------------------------------------------------------------------------------!
+#if defined( __parallel )
     SUBROUTINE mg_gather_noopt( f2, f2_sub )
 
@@ -1207 +1211 @@
 
 
-#if defined( __parallel )
        CALL cpu_log( log_point_s(34), 'mg_gather_noopt', 'start' )
 
@@ -1242 +1245 @@
 
        CALL cpu_log( log_point_s(34), 'mg_gather_noopt', 'stop' )
-#endif
        
     END SUBROUTINE mg_gather_noopt
-
+#endif
 
 
@@ -1254 +1256 @@
 !>       non-blocking communication
 !------------------------------------------------------------------------------!
+#if defined( __parallel )
     SUBROUTINE mg_scatter_noopt( p2, p2_sub )
 
@@ -1267 +1270 @@
 
        IMPLICIT NONE
-
-       INTEGER(iwp) ::  nwords  !<
 
        REAL(wp), DIMENSION(nzb:nzt_mg(grid_level-1)+1,                         &
@@ -1278 +1279 @@
                            mg_loc_ind(1,myid)-1:mg_loc_ind(2,myid)+1) ::  p2_sub  !<
 
-!
-!--    Find out the number of array elements of the subdomain array
-       nwords = SIZE( p2_sub )
-
-#if defined( __parallel )
+
        CALL cpu_log( log_point_s(35), 'mg_scatter_noopt', 'start' )
 
@@ -1289 +1286 @@
 
        CALL cpu_log( log_point_s(35), 'mg_scatter_noopt', 'stop' )
-#endif
        
     END SUBROUTINE mg_scatter_noopt
+#endif
 
 
@@ -1352 +1349 @@
 
        REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  f2_sub  !<
+
+#if defined( __parallel )
        REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  p2_sub  !<
+#endif
 
 !
@@ -1437 +1437 @@
 !
 !--          Gather all arrays from the subdomains on PE0
+#if defined( __parallel )
              CALL mg_gather_noopt( f2, f2_sub )
+#endif
 
 !