Changeset 2232 for palm/trunk/SOURCE/advec_s_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_s_pw.f90 (modified) (7 diffs)

palm/trunk/SOURCE/advec_s_pw.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! topography representation via flags
 ! 
 ! Former revisions:
@@ -104 +104 @@
 
        USE indices,                                                            &
-           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner,&
-                  nzt
+           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb,             &
+                  nzt, wall_flags_0
 
        USE kinds
@@ -125 +125 @@
        DO  i = nxl, nxr
           DO  j = nys, nyn
-             DO  k = nzb_s_inner(j,i)+1, nzt
-                tend(k,j,i) = tend(k,j,i)                                      &
-              -0.5_wp * ( ( u(k,j,i+1) - u_gtrans ) * ( sk(k,j,i+1) - sk(k,j,i) ) &
+             DO  k = nzb+1, nzt
+                tend(k,j,i) = tend(k,j,i) +                                       &
+            ( -0.5_wp * ( ( u(k,j,i+1) - u_gtrans ) * ( sk(k,j,i+1) - sk(k,j,i) ) &
                         - ( u(k,j,i)   - u_gtrans ) * ( sk(k,j,i-1) - sk(k,j,i) ) &
                         ) * ddx                                                   &
@@ -135 +135 @@
               -         (   w(k,j,i)                * ( sk(k+1,j,i) - sk(k,j,i) ) &
                         -   w(k-1,j,i)              * ( sk(k-1,j,i) - sk(k,j,i) ) &
-                        ) * dd2zu(k)
+                        ) * dd2zu(k)                                              &
+            ) * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
              ENDDO
           ENDDO
@@ -160 +161 @@
 
        USE indices,                                                            &
-           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt
+           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt, wall_flags_0
 
        USE kinds
@@ -178 +179 @@
 
 
-       DO  k = nzb_s_inner(j,i)+1, nzt
-          tend(k,j,i) = tend(k,j,i)                                            &
-              -0.5_wp * ( ( u(k,j,i+1) - u_gtrans ) * ( sk(k,j,i+1) - sk(k,j,i) ) &
+       DO  k = nzb+1, nzt
+          tend(k,j,i) = tend(k,j,i) +                                             &
+            ( -0.5_wp * ( ( u(k,j,i+1) - u_gtrans ) * ( sk(k,j,i+1) - sk(k,j,i) ) &
                         - ( u(k,j,i)   - u_gtrans ) * ( sk(k,j,i-1) - sk(k,j,i) ) &
                         ) * ddx                                                   &
@@ -188 +189 @@
               -         (   w(k,j,i)                * ( sk(k+1,j,i) - sk(k,j,i) ) &
                         -   w(k-1,j,i)              * ( sk(k-1,j,i) - sk(k,j,i) ) &
-                        ) * dd2zu(k)
+                        ) * dd2zu(k)                                              &
+            ) * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
        ENDDO