Changeset 3274 for palm/trunk/SOURCE/compute_vpt.f90

Timestamp:

Sep 24, 2018 3:42:55 PM (6 years ago)

Author:

knoop

Message:

Modularization of all bulk cloud physics code components

File:

• palm/trunk/SOURCE/compute_vpt.f90 (modified) (3 diffs)

palm/trunk/SOURCE/compute_vpt.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -67 +70 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  pt, q, ql, vpt
-        
+        ONLY:  pt, q, ql, vpt, d_exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  lv_d_cp
+
+    USE control_parameters,                                                    &
+        ONLY:  cloud_droplets
+
     USE indices,                                                               &
         ONLY:  nzb, nzt
-        
-    USE cloud_parameters,                                                      &
-        ONLY:  l_d_cp, pt_d_t
-        
-    USE control_parameters,                                                    &
-        ONLY:  cloud_droplets, cloud_physics
-        
+
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model
 
     IMPLICIT NONE
@@ -84 +90 @@
     INTEGER(iwp) :: k   !< 
 
-    IF ( .NOT. cloud_physics  .AND.  .NOT. cloud_droplets )  THEN
+    IF ( .NOT. bulk_cloud_model  .AND.  .NOT. cloud_droplets )  THEN
        vpt = pt * ( 1.0_wp + 0.61_wp * q )
-    ELSE IF (cloud_physics)  THEN
+    ELSE IF (bulk_cloud_model)  THEN
        DO  k = nzb, nzt+1
-          vpt(k,:,:) = ( pt(k,:,:) + pt_d_t(k) * l_d_cp * ql(k,:,:) ) *        &
+          vpt(k,:,:) = ( pt(k,:,:) + d_exner(k) * lv_d_cp * ql(k,:,:) ) *      &
                        ( 1.0_wp + 0.61_wp * q(k,:,:) - 1.61_wp * ql(k,:,:) ) 
        ENDDO