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

Timestamp:

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

Author:

suehring

Message:

Remove unnecessary double masking of topography in advection and buoyancy terms

File:

• palm/trunk/SOURCE/buoyancy.f90 (modified) (9 diffs)

palm/trunk/SOURCE/buoyancy.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Remove unnecessary double-masking of topography
+! 
+! 3294 2018-10-01 02:37:10Z raasch
 ! module use statements moved to global declaration section
 ! 
@@ -152 +155 @@
        USE indices,                                                            &
            ONLY:  nxl, nxlg, nxlu, nxr, nxrg, nyn, nyng, nys, nysg, nzb,       &
-                  nzt, wall_flags_0
+                  nzt
 
 
@@ -179 +182 @@
                              ( var(k,j,i)   - ref_state(k) )   / ref_state(k) + &
                              ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1) &
-                          ) * MERGE( 1.0_wp, 0.0_wp,                            &
-                                     BTEST( wall_flags_0(k,j,i), 0 ) )
+                          )
                 ENDDO
              ENDDO
@@ -200 +202 @@
                            0.5_wp * ( ( pt(k,j,i-1)         + pt(k,j,i)         ) &
                                     - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) &
-                                    ) / pt_surface                                &
-                                      * MERGE( 1.0_wp, 0.0_wp,                    &
-                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                                    ) / pt_surface
                    ENDDO
                 ENDDO
@@ -215 +215 @@
                            0.5_wp * ( ( pt(k,j,i)         + pt(k+1,j,i)         ) &
                                     - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) &
-                                    ) / pt_surface                                &
-                                      * MERGE( 1.0_wp, 0.0_wp,                    &
-                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                                    ) / pt_surface
                    ENDDO
                 ENDDO
@@ -247 +245 @@
 
        USE indices,                                                            &
-           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt, wall_flags_0
+           ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt
 
        IMPLICIT NONE
@@ -270 +268 @@
                         ( var(k,j,i)   - ref_state(k)   ) / ref_state(k)   +   &
                         ( var(k+1,j,i) - ref_state(k+1) ) / ref_state(k+1)     &
-                                                                          )    &
-                                      * MERGE( 1.0_wp, 0.0_wp,                 &
-                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                                                                          )
           ENDDO
 
@@ -288 +284 @@
                            0.5_wp * ( ( pt(k,j,i-1)         + pt(k,j,i)         ) &
                                     - ( pt_slope_ref(k,i-1) + pt_slope_ref(k,i) ) &
-                                    ) / pt_surface                                &
-                                      * MERGE( 1.0_wp, 0.0_wp,                    &
-                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                                    ) / pt_surface
              ENDDO
 
@@ -299 +293 @@
                            0.5_wp * ( ( pt(k,j,i)         + pt(k+1,j,i)         ) &
                                     - ( pt_slope_ref(k,i) + pt_slope_ref(k+1,i) ) &
-                                    ) / pt_surface                                &
-                                      * MERGE( 1.0_wp, 0.0_wp,                    &
-                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                                    ) / pt_surface
              ENDDO