Changeset 1902 for palm/trunk/SOURCE

Timestamp:

May 9, 2016 11:18:56 AM (8 years ago)

Author:

suehring

Message:

Consider masking_method only for multigrid solver, no for multigrid_fast

Location:

palm/trunk/SOURCE

Files:

• header.f90 (modified) (2 diffs)
• init_grid.f90 (modified) (2 diffs)

palm/trunk/SOURCE/header.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! Write information about masking_method only for multigrid solver
 !
 ! Former revisions:
@@ -550 +550 @@
                              nzt_mg(1)
        ENDIF
-       IF ( masking_method )  WRITE ( io, 144 )
+       IF ( psolver == 'multigrid' .AND. masking_method )  WRITE ( io, 144 )
     ENDIF
     IF ( call_psolver_at_all_substeps  .AND. timestep_scheme(1:5) == 'runge' ) &

palm/trunk/SOURCE/init_grid.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Set topography flags only for multigrid solver, not for multigrid_fast
 ! 
 ! Former revisions:
@@ -1165 +1165 @@
 !--       In case of masking method, flags are not set and multigrid method
 !--       works like FFT-solver
-          IF ( .NOT. masking_method )  THEN
+          IF ( psolver == 'multigrid' .AND. .NOT. masking_method )  THEN
 
              DO  i = nxl_l-1, nxr_l+1