Changeset 4346 for palm/trunk/SOURCE/prognostic_equations.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/prognostic_equations.f90 (modified) (18 diffs)

palm/trunk/SOURCE/prognostic_equations.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
 ! 
@@ -206 +210 @@
         ONLY:  advc_flags_s,                                                   &
                nbgp, nxl, nxlg, nxlu, nxr, nxrg, nyn, nyng, nys, nysg, nysv,   &
-               nzb, nzt, wall_flags_static_0
+               nzb, nzt, wall_flags_total_0
 
     USE kinds
@@ -376 +380 @@
                                                      * ( u(k,j,i) - u_init(k) ) &
                                         ) * MERGE( 1.0_wp, 0.0_wp,              &
-                                                   BTEST( wall_flags_static_0(k,j,i), 1 )&
+                                           BTEST( wall_flags_total_0(k,j,i), 1 )&
                                                  )
              ENDDO
@@ -454 +458 @@
                                                      * ( v(k,j,i) - v_init(k) )&
                                         ) * MERGE( 1.0_wp, 0.0_wp,             &
-                                                   BTEST( wall_flags_static_0(k,j,i), 2 )&
+                                          BTEST( wall_flags_total_0(k,j,i), 2 )&
                                                  )
              ENDDO
@@ -528 +532 @@
                                              - tsc(5) * rdf(k) * w(k,j,i)      &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_static_0(k,j,i), 3 )&
+                                          BTEST( wall_flags_total_0(k,j,i), 3 )&
                                               )
           ENDDO
@@ -626 +630 @@
                                           )                                    &
                                        * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_static_0(k,j,i), 0 )&
+                                          BTEST( wall_flags_total_0(k,j,i), 0 )&
                                               )
              ENDDO
@@ -716 +720 @@
                                         )                                      &
                                        * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_static_0(k,j,i), 0 )&
+                                          BTEST( wall_flags_total_0(k,j,i), 0 )&
                                               )                
                 IF ( q_p(k,j,i) < 0.0_wp )  q_p(k,j,i) = 0.1_wp * q(k,j,i)
@@ -814 +818 @@
                                         )                                      &
                                        * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_static_0(k,j,i), 0 )&
+                                          BTEST( wall_flags_total_0(k,j,i), 0 )&
                                               )
                 IF ( s_p(k,j,i) < 0.0_wp )  s_p(k,j,i) = 0.1_wp * s(k,j,i)
@@ -927 +931 @@
 !-- Prognostic equation for u-velocity component
     !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
-    !$ACC PRESENT(u, tend, tu_m, u_init, rdf, wall_flags_static_0) &
+    !$ACC PRESENT(u, tend, tu_m, u_init, rdf, wall_flags_total_0) &
     !$ACC PRESENT(tsc(2:5)) &
     !$ACC PRESENT(u_p)
@@ -938 +942 @@
                                                         ( u(k,j,i) - u_init(k) ) &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                  &
-                                                 BTEST( wall_flags_static_0(k,j,i), 1 ) &
+                                           BTEST( wall_flags_total_0(k,j,i), 1 ) &
                                               )
           ENDDO
@@ -1030 +1034 @@
 !-- Prognostic equation for v-velocity component
     !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
-    !$ACC PRESENT(v, tend, tv_m, v_init, rdf, wall_flags_static_0) &
+    !$ACC PRESENT(v, tend, tv_m, v_init, rdf, wall_flags_total_0) &
     !$ACC PRESENT(tsc(2:5)) &
     !$ACC PRESENT(v_p)
@@ -1041 +1045 @@
                                                       ( v(k,j,i) - v_init(k) ) &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_static_0(k,j,i), 2 )&
+                                          BTEST( wall_flags_total_0(k,j,i), 2 )&
                                               )
           ENDDO
@@ -1129 +1133 @@
 !-- Prognostic equation for w-velocity component
     !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
-    !$ACC PRESENT(w, tend, tw_m, v_init, rdf, wall_flags_static_0) &
+    !$ACC PRESENT(w, tend, tw_m, v_init, rdf, wall_flags_total_0) &
     !$ACC PRESENT(tsc(2:5)) &
     !$ACC PRESENT(w_p)
@@ -1139 +1143 @@
                                                - tsc(5) * rdf(k) * w(k,j,i)    &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_static_0(k,j,i), 3 )&
+                                          BTEST( wall_flags_total_0(k,j,i), 3 )&
                                               )
           ENDDO
@@ -1267 +1271 @@
 !--    Prognostic equation for potential temperature
        !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
-       !$ACC PRESENT(pt, tend, tpt_m, wall_flags_static_0) &
+       !$ACC PRESENT(pt, tend, tpt_m, wall_flags_total_0) &
        !$ACC PRESENT(pt_init, rdf_sc, ptdf_x, ptdf_y) &
        !$ACC PRESENT(tsc(3:5)) &
@@ -1281 +1285 @@
                                           )                                    &
                                    * MERGE( 1.0_wp, 0.0_wp,                    &
-                                             BTEST( wall_flags_static_0(k,j,i), 0 )   &
+                                       BTEST( wall_flags_total_0(k,j,i), 0 )   &
                                           )
              ENDDO
@@ -1402 +1406 @@
                                                       ( q(k,j,i) - q_init(k) ) &
                                         ) * MERGE( 1.0_wp, 0.0_wp,             &
-                                                   BTEST( wall_flags_static_0(k,j,i), 0 ) &
+                                         BTEST( wall_flags_total_0(k,j,i), 0 ) &
                                                  )
                 IF ( q_p(k,j,i) < 0.0_wp )  q_p(k,j,i) = 0.1_wp * q(k,j,i)
@@ -1523 +1527 @@
                                         )                                      &
                                    * MERGE( 1.0_wp, 0.0_wp,                    &
-                                             BTEST( wall_flags_static_0(k,j,i), 0 )   &
+                                       BTEST( wall_flags_total_0(k,j,i), 0 )   &
                                           )
                 IF ( s_p(k,j,i) < 0.0_wp )  s_p(k,j,i) = 0.1_wp * s(k,j,i)