Changeset 1575 for palm/trunk/SOURCE/pres.f90

Timestamp:

Mar 27, 2015 9:56:27 AM (9 years ago)

Author:

raasch

Message:

optimized multigrid method installed, new parameter seed_follows_topography for particle release, small adjustment in subjob for HLRN

File:

• palm/trunk/SOURCE/pres.f90 (modified) (7 diffs)

palm/trunk/SOURCE/pres.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! poismg_fast + respective module added, adjustments for psolver-queries
 ! 
 ! Former revisions:
@@ -114 +114 @@
         ONLY:  poisfft
 
+    USE poismg_mod
+
     USE statistics,                                                            &
         ONLY:  statistic_regions, sums_divnew_l, sums_divold_l, weight_pres,   &
@@ -144 +146 @@
 !-- Multigrid method expects array d to have one ghost layer.
 !-- 
-    IF ( psolver == 'multigrid' )  THEN
+    IF ( psolver(1:9) == 'multigrid' )  THEN
      
        DEALLOCATE( d )
@@ -293 +295 @@
     CALL cpu_log( log_point_s(1), 'divergence', 'start' )
 
-    IF ( psolver == 'multigrid' )  THEN
+    IF ( psolver(1:9) == 'multigrid' )  THEN
        !$OMP PARALLEL DO SCHEDULE( STATIC )
        DO  i = nxl-1, nxr+1
@@ -388 +390 @@
 !
 !-- Compute the pressure perturbation solving the Poisson equation
-    IF ( psolver(1:7) == 'poisfft' )  THEN
+    IF ( psolver == 'poisfft' )  THEN
 
 !
 !--    Solve Poisson equation via FFT and solution of tridiagonal matrices
-       IF ( psolver == 'poisfft' )  THEN
-
-          CALL poisfft( d )
-
-       ENDIF
+       CALL poisfft( d )
 
 !
@@ -492 +490 @@
        tend = p_loc
 
-    ELSEIF ( psolver == 'multigrid' )  THEN
+    ELSEIF ( psolver(1:9) == 'multigrid' )  THEN
 
 !
@@ -511 +509 @@
        ENDIF
 
-       CALL poismg( tend )
+       IF ( psolver == 'multigrid' )  THEN
+          CALL poismg( tend )
+       ELSE
+          CALL poismg_fast( tend )
+       ENDIF
 
        IF ( gathered_size > subdomain_size )  THEN