Changeset 4109 for palm/trunk/SOURCE/turbulence_closure_mod.f90

Timestamp:

Jul 22, 2019 5:00:34 PM (5 years ago)

Author:

suehring

Message:

Control discretization of advection term: separate initialization of WS advection flags for momentum and scalars. In this context, resort the bits and do some minor formatting; Make initialization of scalar-advection flags more flexible, i.e. introduce an arguemnt list to indicate non-cyclic boundaries (required for decycled scalars such as chemical species or aerosols); Introduce extended 'degradation zones', where horizontal advection of passive scalars is discretized by first-order scheme at all grid points that in the vicinity of buildings (<= 3 grid points). Even though no building is within the numerical stencil, first-order scheme is used. At fourth and fifth grid point the order of the horizontal advection scheme is successively upgraded. These extended degradation zones are used to avoid stationary numerical oscillations, which are responsible for high concentration maxima that may appear under shear-free stable conditions. Therefore, an additional 3D interger array used to store control flags is introduced; Change interface for scalar advection routine; Bugfix, avoid uninitialized value sk_num in vector version of WS scalar advection; Chemistry: Decycling boundary conditions are only set at the ghost points not on the prognostic grid points; Land-surface model: Relax checks for non-consistent initialization in case static or dynamic input is provided. For example, soil_temperature or deep_soil_temperature is not mandatory any more if dynamic input is available. Also, improper settings of x_type in namelist are only checked if no static file is available.

File:

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

palm/trunk/SOURCE/turbulence_closure_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! pass integer flag array as well as boundary flags to WS scalar advection 
+! routine
 ! 
 ! Former revisions:
@@ -248 +249 @@
 
     USE indices,                                                              &
-        ONLY:  nbgp, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt,    &
+        ONLY:  advc_flags_s,                                                  &
+               nbgp, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt,    &
                wall_flags_0
 
@@ -2329 +2331 @@
              IF ( timestep_scheme(1:5) == 'runge' )  THEN
                 IF ( ws_scheme_sca )  THEN
-                   CALL advec_s_ws( e, 'e' )
+                   CALL advec_s_ws( advc_flags_s, e, 'e',                      &
+                                    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 )
                 ELSE
                    CALL advec_s_pw( e )
@@ -2443 +2449 @@
              IF ( timestep_scheme(1:5) == 'runge' )  THEN
                 IF ( ws_scheme_sca )  THEN
-                   CALL advec_s_ws( diss, 'diss' )
+                   CALL advec_s_ws( advc_flags_s, diss, 'diss',                &
+                                    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 )
                 ELSE
                    CALL advec_s_pw( diss )
@@ -2549 +2559 @@
            .AND.  .NOT. use_upstream_for_tke )  THEN
            IF ( ws_scheme_sca )  THEN
-               CALL advec_s_ws( i, j, e, 'e', flux_s_e, diss_s_e, &
-                                flux_l_e, diss_l_e , i_omp, tn )
+               CALL advec_s_ws( advc_flags_s,                                  &
+                                i, j, e, 'e', flux_s_e, diss_s_e,              &
+                                flux_l_e, diss_l_e , i_omp, 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 )
            ELSE
                CALL advec_s_pw( i, j, e )
@@ -2618 +2633 @@
            .AND.  .NOT. use_upstream_for_tke )  THEN
            IF ( ws_scheme_sca )  THEN
-               CALL advec_s_ws( i, j, diss, 'diss', flux_s_diss, diss_s_diss,  &
-                                flux_l_diss, diss_l_diss, i_omp, tn )
+               CALL advec_s_ws( advc_flags_s,                                  &
+                                i, j, diss, 'diss', flux_s_diss, diss_s_diss,  &
+                                flux_l_diss, diss_l_diss, i_omp, 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 )
            ELSE
                CALL advec_s_pw( i, j, diss )
@@ -3451 +3471 @@
        dvdy(k) =           ( v(k,j+1,i) - v(k,j,i)     ) * ddy
        dvdz(k) = 0.5_wp  * ( v(k+1,j,i) + v(k+1,j+1,i) -                 &
-                               v(k-1,j,i) - v(k-1,j+1,i) ) * dd2zu(k)
+                             v(k-1,j,i) - v(k-1,j+1,i) ) * dd2zu(k)
 
        dwdx(k) = 0.25_wp * ( w(k,j,i+1) + w(k-1,j,i+1) -                 &