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

palm/trunk/SOURCE/calc_liquid_water_content.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Adjustments to new topography concept
 ! 
 ! Former revisions:
@@ -83 +83 @@
 
     USE indices,                                                               &
-        ONLY:  nxlg, nxrg, nyng, nysg, nzb_s_inner, nzt
+        ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt, wall_flags_0
 
     USE kinds
@@ -103 +103 @@
     DO  i = nxlg, nxrg
        DO  j = nysg, nyng
-          DO  k = nzb_s_inner(j,i)+1, nzt
+          DO  k = nzb+1, nzt
 
 !
@@ -131 +131 @@
              IF ( microphysics_seifert )  THEN
                 IF ( ( q(k,j,i) - q_s - qr(k,j,i) ) > 0.0_wp ) THEN
-                   qc(k,j,i) = q(k,j,i) - q_s - qr(k,j,i)
-                   ql(k,j,i) = qc(k,j,i) + qr(k,j,i)
+                   qc(k,j,i) = ( q(k,j,i) - q_s - qr(k,j,i) )                  &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                   ql(k,j,i) = ( qc(k,j,i) + qr(k,j,i) )                       &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
                 ELSE
                    IF ( q(k,j,i) < qr(k,j,i) )  q(k,j,i) = qr(k,j,i)
                    qc(k,j,i) = 0.0_wp 
-                   ql(k,j,i) = qr(k,j,i)
+                   ql(k,j,i) = qr(k,j,i)                                       &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
                 ENDIF
              ELSE
                 IF ( ( q(k,j,i) - q_s ) > 0.0_wp ) THEN
-                   qc(k,j,i) = q(k,j,i) - q_s
-                   ql(k,j,i) = qc(k,j,i)
+                   qc(k,j,i) = ( q(k,j,i) - q_s )                              &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
+                   ql(k,j,i) = qc(k,j,i)                                       &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
                 ELSE
                    qc(k,j,i) = 0.0_wp