Changeset 2369 for palm/trunk

Timestamp:

Aug 22, 2017 3:20:37 PM (7 years ago)

Author:

suehring

Message:

Bugfix, no masking of topography in eqn_seawater

File:

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

palm/trunk/SOURCE/eqn_state_seawater.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix, do not mask topography here, since density becomes zero, leading to
+! division by zero in production_e
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -123 +127 @@
            ONLY:  hyp, prho, pt_p, rho_ocean, sa_p
        USE indices,                                                            &
-           ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
+           ONLY:  nxl, nxr, nyn, nys, nzb, nzt
 
        USE surface_mod,                                                        &
@@ -138 +142 @@
        INTEGER(iwp) ::  surf_s  !< Start index of surface elements at (j,i)-gridpoint
 
-       REAL(wp) ::  flag   !< flag to mask topography grid points
        REAL(wp) ::  pden   !<
        REAL(wp) ::  pnom   !<
@@ -183 +186 @@
                        den(10)*sa15*pt2
 !
-!--             Predetermine flag to mask topography
-                flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
-!
 !--             Potential density (without pressure terms)
-                prho(k,j,i) = pnom / pden * flag
+                prho(k,j,i) = pnom / pden 
 
                 pnom = pnom +             nom(8)*p1      + nom(9)*p1*pt2  +    &
@@ -197 +197 @@
 !
 !--             In-situ density
-                rho_ocean(k,j,i) = pnom / pden * flag
+                rho_ocean(k,j,i) = pnom / pden 
 
              ENDDO
@@ -242 +242 @@
            
        USE indices,                                                            &
-           ONLY:  nzb, nzt, wall_flags_0
+           ONLY:  nzb, nzt
 
        USE surface_mod,                                                        &
@@ -257 +257 @@
        INTEGER(iwp) ::  surf_s  !< Start index of surface elements at (j,i)-gridpoint
 
-       REAL(wp) ::  flag   !< flag to mask topography grid points
        REAL(wp) ::  pden   !<
        REAL(wp) ::  pnom   !<
@@ -298 +297 @@
                  den(10)*sa15*pt2
 !
-!--       Predetermine flag to mask topography
-          flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
-!
 !--       Potential density (without pressure terms)
-          prho(k,j,i) = pnom / pden * flag
+          prho(k,j,i) = pnom / pden 
 
           pnom = pnom +             nom(8)*p1      + nom(9)*p1*pt2  +          &
@@ -311 +307 @@
 !
 !--       In-situ density
-          rho_ocean(k,j,i) = pnom / pden * flag
+          rho_ocean(k,j,i) = pnom / pden