Changeset 4486 for palm/trunk/SOURCE

Timestamp:

Apr 2, 2020 8:45:12 PM (5 years ago)

Author:

maronga

Message:

1.5-order-dai SGS schema modified for use with topography

File:

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

palm/trunk/SOURCE/turbulence_closure_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: include topography in calculation of distance_to_wall (1.5-order-dai
+! closure)
+! 
+! 4481 2020-03-31 18:55:54Z maronga
 ! - added new LES closure after Dai et al. (2020), which provides much better grid
 !   convergence in stable boundary layer runs. The implementation is experimental
@@ -1481 +1485 @@
        DO  k = nzb, nzt+1
           delta(k,:,:) = gridsize_geometric_mean(k)
-
-!
-!--       If Dai et al. (2020) closure is used, the distance to the wall must be stored
-          IF ( les_dai )  THEN
-             distance_to_wall(k,:,:) = zu(k)
-          ENDIF
        ENDDO
+
+!
+!--    If Dai et al. (2020) closure is used, the distance to the wall (distance to nearest upward facing surface)
+!--    must be stored
+       IF ( les_dai )  THEN
+          DO  i = nxl, nxr
+             DO  j = nys, nyn
+                DO  k = nzb, nzt+1
+                   distance_to_wall(k,j,i) = zu(k) - zw(topo_top_ind(j,i,0))
+                ENDDO
+             ENDDO
+          ENDDO
+       ENDIF
 
        IF ( wall_adjustment )  THEN
@@ -1870 +1881 @@
     !$ACC ENTER DATA COPYIN(delta(nzb:nzt+1,nysg:nyng,nxlg:nxrg))
 
-    IF ( les_dai )  THEN
-       CALL exchange_horiz( distance_to_wall, nbgp )
-       !$ACC ENTER DATA COPYIN(distance_to_wall(nzb:nzt+1,nysg:nyng,nxlg:nxrg))
-    ENDIF
+     IF ( les_dai )  THEN
+        CALL exchange_horiz( distance_to_wall, nbgp )
+        !$ACC ENTER DATA COPYIN(distance_to_wall(nzb:nzt+1,nysg:nyng,nxlg:nxrg))
+     ENDIF