Changeset 4329 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Dec 10, 2019 3:46:36 PM (5 years ago)

Author:

motisi

Message:

Renamed wall_flags_0 to wall_flags_static_0

File:

• palm/trunk/SOURCE/prognostic_equations.f90 (modified) (18 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Renamed wall_flags_0 to wall_flags_static_0
+! 
+! 4182 2019-08-22 15:20:23Z scharf
 ! Corrected "Former revisions" section
 ! 
@@ -203 +206 @@
         ONLY:  advc_flags_s,                                                   &
                nbgp, nxl, nxlg, nxlu, nxr, nxrg, nyn, nyng, nys, nysg, nysv,   &
-               nzb, nzt, wall_flags_0
+               nzb, nzt, wall_flags_static_0
 
     USE kinds
@@ -373 +376 @@
                                                      * ( u(k,j,i) - u_init(k) ) &
                                         ) * MERGE( 1.0_wp, 0.0_wp,              &
-                                                   BTEST( wall_flags_0(k,j,i), 1 )&
+                                                   BTEST( wall_flags_static_0(k,j,i), 1 )&
                                                  )
              ENDDO
@@ -451 +454 @@
                                                      * ( v(k,j,i) - v_init(k) )&
                                         ) * MERGE( 1.0_wp, 0.0_wp,             &
-                                                   BTEST( wall_flags_0(k,j,i), 2 )&
+                                                   BTEST( wall_flags_static_0(k,j,i), 2 )&
                                                  )
              ENDDO
@@ -525 +528 @@
                                              - tsc(5) * rdf(k) * w(k,j,i)      &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_0(k,j,i), 3 )&
+                                                BTEST( wall_flags_static_0(k,j,i), 3 )&
                                               )
           ENDDO
@@ -623 +626 @@
                                           )                                    &
                                        * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_0(k,j,i), 0 )&
+                                                BTEST( wall_flags_static_0(k,j,i), 0 )&
                                               )
              ENDDO
@@ -713 +716 @@
                                         )                                      &
                                        * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_0(k,j,i), 0 )&
+                                                BTEST( wall_flags_static_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)
@@ -811 +814 @@
                                         )                                      &
                                        * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_0(k,j,i), 0 )&
+                                                BTEST( wall_flags_static_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)
@@ -924 +927 @@
 !-- 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_0) &
+    !$ACC PRESENT(u, tend, tu_m, u_init, rdf, wall_flags_static_0) &
     !$ACC PRESENT(tsc(2:5)) &
     !$ACC PRESENT(u_p)
@@ -935 +938 @@
                                                         ( u(k,j,i) - u_init(k) ) &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                  &
-                                                 BTEST( wall_flags_0(k,j,i), 1 ) &
+                                                 BTEST( wall_flags_static_0(k,j,i), 1 ) &
                                               )
           ENDDO
@@ -1027 +1030 @@
 !-- 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_0) &
+    !$ACC PRESENT(v, tend, tv_m, v_init, rdf, wall_flags_static_0) &
     !$ACC PRESENT(tsc(2:5)) &
     !$ACC PRESENT(v_p)
@@ -1038 +1041 @@
                                                       ( v(k,j,i) - v_init(k) ) &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_0(k,j,i), 2 )&
+                                                BTEST( wall_flags_static_0(k,j,i), 2 )&
                                               )
           ENDDO
@@ -1126 +1129 @@
 !-- 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_0) &
+    !$ACC PRESENT(w, tend, tw_m, v_init, rdf, wall_flags_static_0) &
     !$ACC PRESENT(tsc(2:5)) &
     !$ACC PRESENT(w_p)
@@ -1136 +1139 @@
                                                - tsc(5) * rdf(k) * w(k,j,i)    &
                                      ) * MERGE( 1.0_wp, 0.0_wp,                &
-                                                BTEST( wall_flags_0(k,j,i), 3 )&
+                                                BTEST( wall_flags_static_0(k,j,i), 3 )&
                                               )
           ENDDO
@@ -1264 +1267 @@
 !--    Prognostic equation for potential temperature
        !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) &
-       !$ACC PRESENT(pt, tend, tpt_m, wall_flags_0) &
+       !$ACC PRESENT(pt, tend, tpt_m, wall_flags_static_0) &
        !$ACC PRESENT(pt_init, rdf_sc, ptdf_x, ptdf_y) &
        !$ACC PRESENT(tsc(3:5)) &
@@ -1278 +1281 @@
                                           )                                    &
                                    * MERGE( 1.0_wp, 0.0_wp,                    &
-                                             BTEST( wall_flags_0(k,j,i), 0 )   &
+                                             BTEST( wall_flags_static_0(k,j,i), 0 )   &
                                           )
              ENDDO
@@ -1399 +1402 @@
                                                       ( q(k,j,i) - q_init(k) ) &
                                         ) * MERGE( 1.0_wp, 0.0_wp,             &
-                                                   BTEST( wall_flags_0(k,j,i), 0 ) &
+                                                   BTEST( wall_flags_static_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)
@@ -1520 +1523 @@
                                         )                                      &
                                    * MERGE( 1.0_wp, 0.0_wp,                    &
-                                             BTEST( wall_flags_0(k,j,i), 0 )   &
+                                             BTEST( wall_flags_static_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)