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

Timestamp:

Jul 17, 2019 4:00:03 PM (4 years ago)

Author:

suehring

Message:

Bugfix, set Neumann boundary conditions for the subgrid TKE at vertical walls instead of implicit Dirichlet conditions that always act as a sink term for the subgrid TKE. Therefore, add new data structure for vertical surfaces and revise the setting of the boundary grid point index space. Moreover, slightly revise setting of boundary conditions at upward- and downward facing surfaces. Finally, setting of boundary conditions for subgrid TKE and dissipation (in RANS mode) is now modularized. Update test case results.

File:

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

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Slightly revise setting of boundary conditions at horizontal walls, use 
+! data-structure offset index instead of pre-calculate it for each facing
+! 
+! 4079 2019-07-09 18:04:41Z suehring
 ! Application of monotonic flux limiter for the vertical scalar advection 
 ! up to the topography top (only for the cache-optimized version at the 
@@ -8017 +8021 @@
     INTEGER(iwp) ::  j    !< grid index y direction
     INTEGER(iwp) ::  k    !< grid index y direction
-    INTEGER(iwp) ::  kb   !< variable to set respective boundary value, depends on facing.
     INTEGER(iwp) ::  l    !< running index boundary type, for up- and downward-facing walls
     INTEGER(iwp) ::  m    !< running index surface elements
@@ -8030 +8033 @@
 !--       belongs to the atmospheric grid point, therefore, set s_p at k-1
           DO  l = 0, 1
-!
-!--          Set kb, for upward-facing surfaces value at topography top (k-1) is 
-!--          set, for downward-facing surfaces at topography bottom (k+1)
-             kb = MERGE ( -1, 1, l == 0 )
              !$OMP PARALLEL PRIVATE( ib, ic, icc, ig, i, j, k )
              !$OMP DO
@@ -8043 +8042 @@
 
                 DO  ib = 1, nbins_aerosol
-                   aerosol_number(ib)%conc_p(k+kb,j,i) = aerosol_number(ib)%conc(k+kb,j,i)
+                   aerosol_number(ib)%conc_p(k+bc_h(l)%koff,j,i) =             &
+                                    aerosol_number(ib)%conc(k+bc_h(l)%koff,j,i)
                    DO  ic = 1, ncomponents_mass
                       icc = ( ic - 1 ) * nbins_aerosol + ib
-                      aerosol_mass(icc)%conc_p(k+kb,j,i) = aerosol_mass(icc)%conc(k+kb,j,i)
+                      aerosol_mass(icc)%conc_p(k+bc_h(l)%koff,j,i) =           &
+                                    aerosol_mass(icc)%conc(k+bc_h(l)%koff,j,i)
                    ENDDO
                 ENDDO
                 IF ( .NOT. salsa_gases_from_chem )  THEN
                    DO  ig = 1, ngases_salsa
-                      salsa_gas(ig)%conc_p(k+kb,j,i) = salsa_gas(ig)%conc(k+kb,j,i)
+                      salsa_gas(ig)%conc_p(k+bc_h(l)%koff,j,i) =               &
+                                    salsa_gas(ig)%conc(k+bc_h(l)%koff,j,i)
                    ENDDO
                 ENDIF
@@ -8063 +8065 @@
 
           DO l = 0, 1
-!
-!--          Set kb, for upward-facing surfaces value at topography top (k-1) is 
-!--          set, for downward-facing surfaces at topography bottom (k+1)
-             kb = MERGE( -1, 1, l == 0 )
              !$OMP PARALLEL PRIVATE( ib, ic, icc, ig, i, j, k )
              !$OMP DO
@@ -8076 +8074 @@
 
                 DO  ib = 1, nbins_aerosol
-                   aerosol_number(ib)%conc_p(k+kb,j,i) = aerosol_number(ib)%conc_p(k,j,i)
+                   aerosol_number(ib)%conc_p(k+bc_h(l)%koff,j,i) =             &
+                                               aerosol_number(ib)%conc_p(k,j,i)
                    DO  ic = 1, ncomponents_mass
                       icc = ( ic - 1 ) * nbins_aerosol + ib
-                      aerosol_mass(icc)%conc_p(k+kb,j,i) = aerosol_mass(icc)%conc_p(k,j,i)
+                      aerosol_mass(icc)%conc_p(k+bc_h(l)%koff,j,i) =           &
+                                               aerosol_mass(icc)%conc_p(k,j,i)
                    ENDDO
                 ENDDO
                 IF ( .NOT. salsa_gases_from_chem ) THEN
                    DO  ig = 1, ngases_salsa
-                      salsa_gas(ig)%conc_p(k+kb,j,i) = salsa_gas(ig)%conc_p(k,j,i)
+                      salsa_gas(ig)%conc_p(k+bc_h(l)%koff,j,i) =               &
+                                               salsa_gas(ig)%conc_p(k,j,i)
                    ENDDO
                 ENDIF