Changeset 1575 for palm/trunk/SOURCE/init_pegrid.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/init_pegrid.f90 (modified) (5 diffs)

palm/trunk/SOURCE/init_pegrid.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! adjustments for psolver-queries, calculation of ngp_xz added
 ! 
 ! Former revisions:
@@ -761 +761 @@
 !-- Calculate number of grid levels necessary for the multigrid poisson solver
 !-- as well as the gridpoint indices on each level
-    IF ( psolver == 'multigrid' )  THEN
+    IF ( psolver(1:9) == 'multigrid' )  THEN
 
 !
@@ -977 +977 @@
 !-- Do these calculations for the model grid and (if necessary) also
 !-- for the coarser grid levels used in the multigrid method
-    ALLOCATE ( ngp_yz(0:maximum_grid_level), type_xz(0:maximum_grid_level),&
-               type_yz(0:maximum_grid_level) )
+    ALLOCATE ( ngp_xz(0:maximum_grid_level), ngp_yz(0:maximum_grid_level),     &
+               type_xz(0:maximum_grid_level), type_yz(0:maximum_grid_level) )
 
     nxl_l = nxl; nxr_l = nxr; nys_l = nys; nyn_l = nyn; nzb_l = nzb; nzt_l = nzt
@@ -1007 +1007 @@
 !
 !-- Definition of MPI-datatypes for multigrid method (coarser level grids)
-    IF ( psolver == 'multigrid' )  THEN
+    IF ( psolver(1:9) == 'multigrid' )  THEN
 !    
 !--    Definition of MPI-datatyoe as above, but only 1 ghost level is used
        DO  i = maximum_grid_level, 1 , -1
 
+          ngp_xz(i) = (nzt_l - nzb_l + 2) * (nxr_l - nxl_l + 3)
           ngp_yz(i) = (nzt_l - nzb_l + 2) * (nyn_l - nys_l + 3)
 
@@ -1129 +1130 @@
 !
 !-- Allocate wall flag arrays used in the multigrid solver
-    IF ( psolver == 'multigrid' )  THEN
+    IF ( psolver(1:9) == 'multigrid' )  THEN
 
        DO  i = maximum_grid_level, 1, -1