Changeset 2232 for palm/trunk/SOURCE/advec_u_pw.f90

Timestamp:

May 30, 2017 5:47:52 PM (7 years ago)

Author:

suehring

Message:

Adjustments according new topography and surface-modelling concept implemented

File:

• palm/trunk/SOURCE/advec_u_pw.f90 (modified) (7 diffs)

palm/trunk/SOURCE/advec_u_pw.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! topography representation via flags
 ! 
 ! Former revisions:
@@ -96 +96 @@
 
        USE indices,                                                            &
-           ONLY:  nxlu, nxr, nyn, nys, nzb_u_inner, nzt
+           ONLY:  nxlu, nxr, nyn, nys, nzb, nzt, wall_flags_0
 
        USE kinds
@@ -114 +114 @@
        DO  i = nxlu, nxr
           DO  j = nys, nyn
-             DO  k = nzb_u_inner(j,i)+1, nzt
+             DO  k = nzb+1, nzt
                 tend(k,j,i) = tend(k,j,i) - 0.25_wp * (                        &
                          ( u(k,j,i+1) * ( u(k,j,i+1) + u(k,j,i) - gu )         &
@@ -123 +123 @@
                          - u(k-1,j,i) * ( w(k-1,j,i) + w(k-1,j,i-1) ) )        &
                                                                   * ddzw(k)    &
-                                                      )
+                                                      )                        &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 1 ) )
              ENDDO
           ENDDO
@@ -148 +150 @@
 
        USE indices,                                                            &
-           ONLY:  nzb_u_inner, nzt
+           ONLY:  nzb, nzt, wall_flags_0
 
        USE kinds
@@ -164 +166 @@
        gu = 2.0_wp * u_gtrans
        gv = 2.0_wp * v_gtrans
-       DO  k = nzb_u_inner(j,i)+1, nzt
+       DO  k = nzb+1, nzt
           tend(k,j,i) = tend(k,j,i) - 0.25_wp * (                              &
                          ( u(k,j,i+1) * ( u(k,j,i+1) + u(k,j,i) - gu )         &
@@ -173 +175 @@
                          - u(k-1,j,i) * ( w(k-1,j,i) + w(k-1,j,i-1) ) )        &
                                                                   * ddzw(k)    &
-                                                )
+                                                )                              &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 1 ) )
        ENDDO