Changeset 4855 for palm/trunk/SOURCE

Timestamp:

Jan 25, 2021 12:30:54 PM (4 years ago)

Author:

raasch

Message:

bugfix: mean w removal not applied to ghost points of the total domain in case of non-cyclic setups (pres), bugfix for correct identification of indices of extreme values in case of non-cyclic boundary conditions

Location:

palm/trunk/SOURCE

Files:

• global_min_max.f90 (modified) (3 diffs)
• pres.f90 (modified) (3 diffs)

palm/trunk/SOURCE/global_min_max.f90

@@ -23 +23 @@
 ! -----------------
 ! $Id$
+! bugfix for correct identification of indices of extreme values in case of non-cyclic
+! boundary conditions
+!
+! 4828 2021-01-05 11:21:41Z Giersch
 ! preprocessor branch for ibm removed
 !
@@ -51 +55 @@
                             value1_ijk )
 
+
+    USE control_parameters,                                                                        &
+        ONLY:  bc_lr, bc_ns
 
     USE indices,                                                                                   &
@@ -388 +395 @@
 
 !
-!-- Limit index values to the range 0..nx, 0..ny
-    IF ( value_ijk(3) < 0  ) value_ijk(3) = nx +1 + value_ijk(3)
-    IF ( value_ijk(3) > nx ) value_ijk(3) = value_ijk(3) - (nx+1)
-    IF ( value_ijk(2) < 0  ) value_ijk(2) = ny +1 + value_ijk(2)
-    IF ( value_ijk(2) > ny ) value_ijk(2) = value_ijk(2) - (ny+1)
+!-- Limit index values to the range 0..nx, 0..ny. Non-cyclic setups may have extrema at the
+!-- outer borders, which should be correctly identified.
+    IF ( bc_lr == 'cyclic' )  THEN
+       IF ( value_ijk(3) < 0  ) value_ijk(3) = nx +1 + value_ijk(3)
+       IF ( value_ijk(3) > nx ) value_ijk(3) = value_ijk(3) - (nx+1)
+    ENDIF
+    IF ( bc_ns == 'cyclic' )  THEN
+       IF ( value_ijk(2) < 0  ) value_ijk(2) = ny +1 + value_ijk(2)
+       IF ( value_ijk(2) > ny ) value_ijk(2) = value_ijk(2) - (ny+1)
+    ENDIF
 
  END SUBROUTINE global_min_max

palm/trunk/SOURCE/pres.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: mean w removal not applied to ghost points of the total domain in case of non-cyclic
+! setups
+!
+! 4828 2021-01-05 11:21:41Z Giersch
 ! Bugfix in OpenMP directives - intel compiler do not allow reduction operations on array elements
 !
@@ -357 +361 @@
           w_l(k) = w_l(k) / ngp_2dh_outer(k,0)
        ENDDO
-       DO  i = nxlg, nxrg
-          DO  j = nysg, nyng
+       DO  i = nxl, nxr
+          DO  j = nys, nyn
              DO  k = nzb+1, nzt
                 w(k,j,i) = w(k,j,i) - w_l(k)                                                       &
@@ -365 +369 @@
           ENDDO
        ENDDO
+!
+!--    Instead of running the above loop over ghost points, they are set via exchange_horiz,
+!--    in order to correctly consider non-cyclic boundary conditions, where ghost boundaries
+!--    of the total domain must not be set. Otherwise w may continuously increase/decrease
+!--    at these points.
+       CALL exchange_horiz( w, nbgp )
     ENDIF