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

palm/trunk/SOURCE/advec_s_pw.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Remove unnecessary double-masking of topography
+! 
+! 3302 2018-10-03 02:39:40Z raasch
 ! Stokes drift velocity added
 ! 
@@ -116 +119 @@
 
        USE indices,                                                            &
-           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb,             &
-                  nzt, wall_flags_0
+           ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt
 
        USE kinds
@@ -163 +165 @@
                                                    ( sk(k-1,j,i) - sk(k,j,i) ) &
                                                  ) * dd2zu(k)                  &
-                                      ) * MERGE( 1.0_wp, 0.0_wp,               &
-                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                                      )
              ENDDO
           ENDDO
@@ -189 +190 @@
 
        USE indices,                                                            &
-           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt, wall_flags_0
+           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt
 
        USE kinds
@@ -233 +234 @@
                                                   ( sk(k-1,j,i) - sk(k,j,i) )  &
                                                 ) * dd2zu(k)                   &
-                                    ) * MERGE( 1.0_wp, 0.0_wp,                 &
-                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                                    )
        ENDDO