Changeset 4487 for palm/trunk/SOURCE/salsa_mod.f90

Timestamp:

Apr 3, 2020 9:38:20 AM (5 years ago)

Author:

raasch

Message:

bugfix for subroutine calls that contain the decycle_chem and decycle_salsa switches as arguments

File:

• palm/trunk/SOURCE/salsa_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! bugfix for subroutine calls that contain the decycle_salsa switches as arguments
+! 
+! 4481 2020-03-31 18:55:54Z maronga
 ! Bug fix to the previous commit: the logical switch monotonic_limiter_z missing
 ! from advec_s_ws in salsa_tendency_ij
@@ -1748 +1751 @@
 !--    oscillations, which are responsible for high concentration maxima that may appear e.g. under
 !--    shear-free stable conditions.
-       CALL ws_init_flags_scalar( bc_dirichlet_l  .OR.  bc_radiation_l  .OR.  decycle_salsa_lr,    &
-                                  bc_dirichlet_n  .OR.  bc_radiation_n  .OR.  decycle_salsa_ns,    &
-                                  bc_dirichlet_r  .OR.  bc_radiation_r  .OR.  decycle_salsa_lr,    &
-                                  bc_dirichlet_s  .OR.  bc_radiation_s  .OR.  decycle_salsa_ns,    &
-                                  salsa_advc_flags_s, .TRUE. )
+       CALL ws_init_flags_scalar(                                                                  &
+                 bc_dirichlet_l  .OR.  bc_radiation_l  .OR.  ( decycle_salsa_lr .AND. nxl == 0  ), &
+                 bc_dirichlet_n  .OR.  bc_radiation_n  .OR.  ( decycle_salsa_ns .AND. nyn == ny ), &
+                 bc_dirichlet_r  .OR.  bc_radiation_r  .OR.  ( decycle_salsa_lr .AND. nxr == nx ), &
+                 bc_dirichlet_s  .OR.  bc_radiation_s  .OR.  ( decycle_salsa_ns .AND. nys == 0  ), &
+                 salsa_advc_flags_s, .TRUE. )
     ENDIF
 
@@ -8105 +8109 @@
        IF ( ws_scheme_sca )  THEN
           CALL advec_s_ws( salsa_advc_flags_s, i, j, rs, id,                                       &
-                           flux_s, diss_s, flux_l, diss_l, i_omp_start, tn,                        &
-                           bc_dirichlet_l  .OR.  bc_radiation_l  .OR.  decycle_salsa_lr,           &
-                           bc_dirichlet_n  .OR.  bc_radiation_n  .OR.  decycle_salsa_ns,           &
-                           bc_dirichlet_r  .OR.  bc_radiation_r  .OR.  decycle_salsa_lr,           &
-                           bc_dirichlet_s  .OR.  bc_radiation_s  .OR.  decycle_salsa_ns,           &
-                           monotonic_limiter_z )
+                 flux_s, diss_s, flux_l, diss_l, i_omp_start, tn,                                  &
+                 bc_dirichlet_l  .OR.  bc_radiation_l  .OR.  ( decycle_salsa_lr .AND. nxl == 0  ), &
+                 bc_dirichlet_n  .OR.  bc_radiation_n  .OR.  ( decycle_salsa_ns .AND. nyn == ny ), &
+                 bc_dirichlet_r  .OR.  bc_radiation_r  .OR.  ( decycle_salsa_lr .AND. nxr == nx ), &
+                 bc_dirichlet_s  .OR.  bc_radiation_s  .OR.  ( decycle_salsa_ns .AND. nys == 0  ), &
+                 monotonic_limiter_z )
        ELSE
           CALL advec_s_pw( i, j, rs )
@@ -8242 +8246 @@
        IF ( ws_scheme_sca )  THEN
           CALL advec_s_ws( salsa_advc_flags_s, rs, id,                                             &
-                           bc_dirichlet_l  .OR.  bc_radiation_l  .OR.  decycle_salsa_lr,           &
-                           bc_dirichlet_n  .OR.  bc_radiation_n  .OR.  decycle_salsa_ns,           &
-                           bc_dirichlet_r  .OR.  bc_radiation_r  .OR.  decycle_salsa_lr,           &
-                           bc_dirichlet_s  .OR.  bc_radiation_s  .OR.  decycle_salsa_ns )
+                 bc_dirichlet_l  .OR.  bc_radiation_l  .OR.  ( decycle_salsa_lr .AND. nxl == 0  ), &
+                 bc_dirichlet_n  .OR.  bc_radiation_n  .OR.  ( decycle_salsa_ns .AND. nyn == ny ), &
+                 bc_dirichlet_r  .OR.  bc_radiation_r  .OR.  ( decycle_salsa_lr .AND. nxr == nx ), &
+                 bc_dirichlet_s  .OR.  bc_radiation_s  .OR.  ( decycle_salsa_ns .AND. nys == 0  ) )
        ELSE
           CALL advec_s_pw( rs )