Changeset 4478 for palm/trunk/SOURCE

Timestamp:

Mar 27, 2020 2:06:23 PM (5 years ago)

Author:

monakurppa

Message:

Bug fixes in salsa_mod.f90 and update of urban_environment_salsa

File:

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

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Bug fixes:
+! - call salsa_driver in salsa_init also for the ghost points
+! - decycle flags missing from advec_s_ws call in salsa_tendency
+! 
+! 4457 2020-03-11 14:20:43Z raasch
 ! use statement for exchange horiz added
 ! 
@@ -1810 +1815 @@
 
 !-- Initalisation run of SALSA + calculate the vertical top index of the topography
-    DO  i = nxl, nxr
-       DO  j = nys, nyn
+    DO  i = nxlg, nxrg
+       DO  j = nysg, nyng
 
           k_topo_top(j,i) = MAXLOC( MERGE( 1, 0, BTEST( wall_flags_total_0(:,j,i), 12 ) ), &
@@ -8095 +8100 @@
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        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,                  &
-                           bc_dirichlet_n  .OR.  bc_radiation_n,                                   &
-                           bc_dirichlet_r  .OR.  bc_radiation_r,                                   &
-                           bc_dirichlet_s  .OR.  bc_radiation_s, monotonic_limiter_z )
+          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 )
        ELSE
           CALL advec_s_pw( i, j, rs )
@@ -8230 +8236 @@
     IF ( timestep_scheme(1:5) == 'runge' )  THEN
        IF ( ws_scheme_sca )  THEN
-          CALL advec_s_ws( salsa_advc_flags_s, rs, id, bc_dirichlet_l  .OR.  bc_radiation_l,       &
-                           bc_dirichlet_n  .OR.  bc_radiation_n,                                   &
-                           bc_dirichlet_r  .OR.  bc_radiation_r,                                   &
-                           bc_dirichlet_s  .OR.  bc_radiation_s )
+          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 )
        ELSE
           CALL advec_s_pw( rs )