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

Timestamp:

Jun 20, 2017 9:51:42 AM (7 years ago)

Author:

schwenkel

Message:

implementation of new bulk microphysics scheme

File:

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

palm/trunk/SOURCE/calc_liquid_water_content.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Implementation of new microphysic scheme: cloud_scheme = 'morrison' 
+! includes two more prognostic equations for cloud drop concentration (nc)  
+! and cloud water content (qc). 
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -83 +88 @@
 
     USE control_parameters,                                                    &
-        ONLY:  microphysics_seifert
+        ONLY:  microphysics_morrison, microphysics_seifert
 
     USE indices,                                                               &
@@ -132 +137 @@
 !
 !--          Compute the liquid water content
-             IF ( microphysics_seifert )  THEN
-                IF ( ( q(k,j,i) - q_s - qr(k,j,i) ) > 0.0_wp ) THEN
+             IF ( microphysics_seifert  .AND.  .NOT. microphysics_morrison )   &
+             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) )                  &
                                       * MERGE( 1.0_wp, 0.0_wp,                 &
@@ -147 +153 @@
                                                BTEST( wall_flags_0(k,j,i), 0 ) )
                 ENDIF
+             ELSEIF ( microphysics_morrison )  THEN
+                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) - q_s ) > 0.0_wp ) THEN
+                IF ( ( q(k,j,i) - q_s ) > 0.0_wp )  THEN
                    qc(k,j,i) = ( q(k,j,i) - q_s )                              &
                                       * MERGE( 1.0_wp, 0.0_wp,                 &