Changeset 1931 for palm/trunk/SOURCE/poismg_mod.f90

Timestamp:

Jun 10, 2016 12:06:59 PM (8 years ago)

Author:

suehring

Message:

Rename multigrid into multigrid_noopt and multigrid_fast into multigrid, subroutines poismg is renamed into poismg_noopt and poismg_fast_mod into poismg_mod

File:

• palm/trunk/SOURCE/poismg_mod.f90 (moved) (moved from palm/trunk/SOURCE/poismg_fast_mod.f90) (35 diffs)

palm/trunk/SOURCE/poismg_mod.f90

@@ -1 @@
-!> @file poismg_fast_mod.f90
+!> @file poismg.f90
 !--------------------------------------------------------------------------------!
 ! This file is part of PALM.
@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! Rename subroutines and cpu-measure log points to indicate default version
 ! 
 ! Former revisions:
@@ -92 +92 @@
     REAL(wp), DIMENSION(:,:), SAVE, ALLOCATABLE ::  f1_mg_b, f2_mg_b, f3_mg_b  !< blocked version of f1_mg ...
 
-    INTERFACE poismg_fast
-       MODULE PROCEDURE poismg_fast
-    END INTERFACE poismg_fast
+    INTERFACE poismg
+       MODULE PROCEDURE poismg
+    END INTERFACE poismg
 
     INTERFACE sort_k_to_even_odd_blocks
@@ -102 +102 @@
     END INTERFACE sort_k_to_even_odd_blocks
 
-    PUBLIC poismg_fast
+    PUBLIC poismg
 
  CONTAINS
@@ -112 +112 @@
 !> V- or W-Cycle scheme.
 !------------------------------------------------------------------------------!
-    SUBROUTINE poismg_fast( r )
+    SUBROUTINE poismg( r )
 
        USE arrays_3d,                                                          &
@@ -140 +140 @@
 
 
-       CALL cpu_log( log_point_s(29), 'poismg_fast', 'start' )
+       CALL cpu_log( log_point_s(29), 'poismg', 'start' )
 !
 !--    Initialize arrays and variables used in this subroutine
@@ -198 +198 @@
                   mgcycles < maximum_mgcycles )
  
-          CALL next_mg_level_fast( d, p_loc, p3, r)
+          CALL next_mg_level( d, p_loc, p3, r)
 
 !
@@ -204 +204 @@
 !--       cycles to be performed
           IF ( maximum_mgcycles == 0 )  THEN
-             CALL resid_fast( d, p_loc, r )
+             CALL resid( d, p_loc, r )
              maxerror = SUM( r(nzb+1:nzt,nys:nyn,nxl:nxr)**2 )
 
@@ -224 +224 @@
           IF ( mgcycles > 1000  .AND.  mg_cycles == -1 )  THEN
              message_string = 'no sufficient convergence within 1000 cycles'
-             CALL message( 'poismg_fast', 'PA0283', 1, 2, 0, 6, 0 )
+             CALL message( 'poismg', 'PA0283', 1, 2, 0, 6, 0 )
           ENDIF
 
@@ -238 +238 @@
        grid_level = 0
 
-       CALL cpu_log( log_point_s(29), 'poismg_fast', 'stop' )
-
-    END SUBROUTINE poismg_fast
+       CALL cpu_log( log_point_s(29), 'poismg', 'stop' )
+
+    END SUBROUTINE poismg
 
 
@@ -248 +248 @@
 !> Computes the residual of the perturbation pressure.
 !------------------------------------------------------------------------------!
-    SUBROUTINE resid_fast( f_mg, p_mg, r )
+    SUBROUTINE resid( f_mg, p_mg, r )
 
 
@@ -366 +366 @@
        CALL cpu_log( log_point_s(53), 'resid', 'stop' )
 
-    END SUBROUTINE resid_fast
+    END SUBROUTINE resid
 
 
@@ -375 +375 @@
 !> scheme
 !------------------------------------------------------------------------------!
-    SUBROUTINE restrict_fast( f_mg, r )
+    SUBROUTINE restrict( f_mg, r )
 
 
@@ -503 +503 @@
        CALL sort_k_to_even_odd_blocks( f_mg , l)
 
-    END SUBROUTINE restrict_fast
+    END SUBROUTINE restrict
 
 
@@ -512 +512 @@
 !> to the next finer grid.
 !------------------------------------------------------------------------------!
-    SUBROUTINE prolong_fast( p, temp )
+    SUBROUTINE prolong( p, temp )
 
 
@@ -670 +670 @@
        CALL cpu_log( log_point_s(55), 'prolong', 'stop' )
 
-    END SUBROUTINE prolong_fast
+    END SUBROUTINE prolong
 
 
@@ -679 +679 @@
 !> 3D-Red-Black decomposition (GS-RB) is used.
 !------------------------------------------------------------------------------!
-    SUBROUTINE redblack_fast( f_mg, p_mg )
+    SUBROUTINE redblack( f_mg, p_mg )
 
 
@@ -981 +981 @@
        ENDDO
 
-    END SUBROUTINE redblack_fast
+    END SUBROUTINE redblack
 
 
@@ -1236 +1236 @@
 !> Gather subdomain data from all PEs.
 !------------------------------------------------------------------------------!
-    SUBROUTINE mg_gather_fast( f2, f2_sub )
+    SUBROUTINE mg_gather( f2, f2_sub )
 
        USE control_parameters,                                                 &
@@ -1307 +1307 @@
 #endif
     
-    END SUBROUTINE mg_gather_fast
+    END SUBROUTINE mg_gather
 
 
@@ -1317 +1317 @@
 !>       non-blocking communication
 !------------------------------------------------------------------------------!
-    SUBROUTINE mg_scatter_fast( p2, p2_sub )
+    SUBROUTINE mg_scatter( p2, p2_sub )
 
        USE control_parameters,                                                 &
@@ -1353 +1353 @@
 #endif
     
-    END SUBROUTINE mg_scatter_fast
+    END SUBROUTINE mg_scatter
 
 
@@ -1366 +1366 @@
 !> but leads to an increase in computing time.
 !------------------------------------------------------------------------------!
-    RECURSIVE SUBROUTINE next_mg_level_fast( f_mg, p_mg, p3, r )
+    RECURSIVE SUBROUTINE next_mg_level( f_mg, p_mg, p3, r )
 
        USE control_parameters,                                                 &
@@ -1425 +1425 @@
           ind_even_odd = even_odd_level(grid_level)
 
-          CALL redblack_fast( f_mg, p_mg )
+          CALL redblack( f_mg, p_mg )
 
           ngsrb = ngsrb / 2
@@ -1438 +1438 @@
           ind_even_odd = even_odd_level(grid_level)
 
-          CALL redblack_fast( f_mg, p_mg )
+          CALL redblack( f_mg, p_mg )
 
 !
 !--       Determination of the actual residual
-          CALL resid_fast( f_mg, p_mg, r )
+          CALL resid( f_mg, p_mg, r )
 
 !--       Restriction of the residual (finer grid values!) to the next coarser
@@ -1485 +1485 @@
                               nxl_mg(grid_level)-1:nxr_mg(grid_level)+1) )
 
-             CALL restrict_fast( f2_sub, r )
+             CALL restrict( f2_sub, r )
 
 !
@@ -1501 +1501 @@
 !
 !--          Gather all arrays from the subdomains on PE0
-             CALL mg_gather_fast( f2, f2_sub )
+             CALL mg_gather( f2, f2_sub )
 
 !
@@ -1546 +1546 @@
           ELSE
 
-             CALL restrict_fast( f2, r )
+             CALL restrict( f2, r )
 
              ind_even_odd = even_odd_level(grid_level)  ! must be after restrict
@@ -1556 +1556 @@
 !
 !--       Repeat the same procedure till the coarsest grid is reached
-          CALL next_mg_level_fast( f2, p2, p3, r )
+          CALL next_mg_level( f2, p2, p3, r )
 
        ENDIF
@@ -1577 +1577 @@
                        mg_loc_ind(1,myid)-1:mg_loc_ind(2,myid)+1) )
 
-             CALL mg_scatter_fast( p2, p2_sub )
+             CALL mg_scatter( p2, p2_sub )
 
 !
@@ -1647 +1647 @@
              ENDIF
 
-             CALL prolong_fast( p2_sub, p3 )
+             CALL prolong( p2_sub, p3 )
 
 !
@@ -1662 +1662 @@
           ELSE
 
-             CALL prolong_fast( p2, p3 )
+             CALL prolong( p2, p3 )
 
           ENDIF
@@ -1679 +1679 @@
 !
 !--       Relaxation of the new solution
-          CALL redblack_fast( f_mg, p_mg )
+          CALL redblack( f_mg, p_mg )
 
        ENDIF
@@ -1698 +1698 @@
 
 !
-!--    Reset counter for the next call of poismg_fast
+!--    Reset counter for the next call of poismg
        grid_level_count(grid_level) = 0
 
@@ -1716 +1716 @@
     20 CONTINUE
 
-    END SUBROUTINE next_mg_level_fast
+    END SUBROUTINE next_mg_level