Changeset 3538 for palm/trunk/SOURCE/advec_w_pw.f90

Timestamp:

Nov 20, 2018 10:55:41 AM (6 years ago)

Author:

suehring

Message:

Remove unnecessary double masking of topography in advection and buoyancy terms

File:

• palm/trunk/SOURCE/advec_w_pw.f90 (modified) (5 diffs)

palm/trunk/SOURCE/advec_w_pw.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Remove unnecessary double-masking of topography
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -105 +108 @@
 
        USE indices,                                                            &
-           ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
+           ONLY:  nxl, nxr, nyn, nys, nzb, nzt
 
        USE kinds
@@ -133 +136 @@
                          - w(k-1,j,i) * ( w(k,j,i) + w(k-1,j,i) ) )            &
                                                                   * ddzu(k+1)  &
-                                                      )                        &
-                                      * MERGE( 1.0_wp, 0.0_wp,                 &
-                                               BTEST( wall_flags_0(k,j,i), 3 ) )
+                                                      )
              ENDDO
           ENDDO
@@ -160 +161 @@
 
        USE indices,                                                            &
-           ONLY:  nzb, nzt, wall_flags_0
+           ONLY:  nzb, nzt
 
        USE kinds
@@ -185 +186 @@
                          - w(k-1,j,i) * ( w(k,j,i) + w(k-1,j,i) ) )            &
                                                                   * ddzu(k+1)  &
-                                                )                              &
-                                      * MERGE( 1.0_wp, 0.0_wp,                 &
-                                               BTEST( wall_flags_0(k,j,i), 3 ) )
+                                                )
        ENDDO
     END SUBROUTINE advec_w_pw_ij