Changeset 4346 for palm/trunk/SOURCE/coriolis.f90

Timestamp:

Dec 18, 2019 11:55:56 AM (5 years ago)

Author:

motisi

Message:

Introduction of wall_flags_total_0, which currently sets bits based on static topography information used in wall_flags_static_0

File:

• palm/trunk/SOURCE/coriolis.f90 (modified) (12 diffs)

palm/trunk/SOURCE/coriolis.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Introduction of wall_flags_total_0, which currently sets bits based on static
+! topography information used in wall_flags_static_0
+! 
+! 4329 2019-12-10 15:46:36Z motisi
 ! Renamed wall_flags_0 to wall_flags_static_0
 ! 
@@ -79 +83 @@
            
        USE indices,                                                            &
-           ONLY:  nxl, nxlu, nxr, nyn, nys, nysv, nzb, nzt, wall_flags_static_0
+           ONLY:  nxl, nxlu, nxr, nyn, nys, nysv, nzb, nzt,                    &
+                  wall_flags_total_0
                    
        USE kinds
@@ -107 +112 @@
           CASE ( 1 )
              !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k, flag) &
-             !$ACC PRESENT(wall_flags_static_0) &
+             !$ACC PRESENT(wall_flags_total_0) &
              !$ACC PRESENT(v, w, vg) &
              !$ACC PRESENT(tend)
@@ -115 +120 @@
 !
 !--                   Predetermine flag to mask topography
-                      flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 1 ) )
+                      flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 1 ) )
 
                       tend(k,j,i) = tend(k,j,i) + flag *                                           &
@@ -132 +137 @@
           CASE ( 2 )
              !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k, flag) &
-             !$ACC PRESENT(wall_flags_static_0) &
+             !$ACC PRESENT(wall_flags_total_0) &
              !$ACC PRESENT(u, w, ug) &
              !$ACC PRESENT(tend)
@@ -140 +145 @@
 !
 !--                   Predetermine flag to mask topography
-                      flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 2 ) )
+                      flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 2 ) )
 
                       tend(k,j,i) = tend(k,j,i) - flag *                                           &
@@ -157 +162 @@
           CASE ( 3 )
              !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k, flag) &
-             !$ACC PRESENT(wall_flags_static_0) &
+             !$ACC PRESENT(wall_flags_total_0) &
              !$ACC PRESENT(u, v) &
              !$ACC PRESENT(tend)
@@ -165 +170 @@
 !
 !--                   Predetermine flag to mask topography
-                      flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 3 ) )
+                      flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 3 ) )
 
                       tend(k,j,i) = tend(k,j,i)                                                 &
@@ -205 +210 @@
            
        USE indices,                                                            &
-           ONLY:  nzb, nzt, wall_flags_static_0
+           ONLY:  nzb, nzt, wall_flags_total_0
            
        USE kinds
@@ -235 +240 @@
 !
 !--             Predetermine flag to mask topography
-                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 1 ) )
+                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 1 ) )
 
                 tend(k,j,i) = tend(k,j,i) + flag *                                                 &
@@ -252 +257 @@
 !
 !--             Predetermine flag to mask topography
-                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 2 ) )
+                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 2 ) )
 
                 tend(k,j,i) = tend(k,j,i) - flag *                                                 &
@@ -269 +274 @@
 !
 !--             Predetermine flag to mask topography
-                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 3 ) )
+                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_total_0(k,j,i), 3 ) )
 
                 tend(k,j,i) = tend(k,j,i)                                                 &