Changeset 1822 for palm/trunk/SOURCE/calc_liquid_water_content.f90

Timestamp:

Apr 7, 2016 7:49:42 AM (8 years ago)

Author:

hoffmann

Message:

changes in LPM and bulk cloud microphysics

File:

• palm/trunk/SOURCE/calc_liquid_water_content.f90 (modified) (4 diffs)

palm/trunk/SOURCE/calc_liquid_water_content.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! icloud_scheme removed. microphysics_seifert added.
 ! 
 ! Former revisions:
@@ -73 +73 @@
 
     USE control_parameters,                                                    &
-        ONLY:  icloud_scheme, precipitation
+        ONLY:  microphysics_seifert
 
     USE indices,                                                               &
@@ -122 +122 @@
 !
 !--          Compute the liquid water content
-             IF ( icloud_scheme == 0  .AND.  precipitation)  THEN
+             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)
@@ -131 +131 @@
                    ql(k,j,i) = qr(k,j,i)
                 ENDIF
-             ELSEIF ( icloud_scheme == 0  .AND.  .NOT. precipitation )  THEN
+             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)
                 ELSE
-                   qc(k,j,i) = 0.0_wp 
+                   qc(k,j,i) = 0.0_wp
                    ql(k,j,i) = 0.0_wp
-                ENDIF
-             ELSE
-                IF ( ( q(k,j,i) - q_s ) > 0.0_wp ) THEN
-                   ql(k,j,i) = q(k,j,i) - q_s
-                ELSE
-                   ql(k,j,i) = 0.0_wp 
                 ENDIF
              ENDIF