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

palm/trunk/SOURCE/data_output_dvrp.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3045 2018-05-28 07:55:41Z Giersch
 ! Code adjusted according to PALM coding standards
 ! 
@@ -131 +134 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  p, pt, q, ql, s, ts, u, us, v, w, zu
-        
-    USE cloud_parameters,                                                      &
-        ONLY:  l_d_cp, pt_d_t
-        
-    USE constants,                                                             &
-        ONLY:  pi
-        
+        ONLY:  p, pt, q, ql, s, ts, u, us, v, w, zu, d_exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  pi, lv_d_cp
+
     USE control_parameters,                                                    &
-        ONLY:  cloud_droplets, cloud_physics, do2d, do3d, humidity, ibc_uv_b,  &
+        ONLY:  cloud_droplets, do2d, do3d, humidity, ibc_uv_b,                 &
                message_string, nz_do3d, passive_scalar, simulated_time,        &
                threshold
@@ -160 +160 @@
         
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model
 
     USE pegrid
@@ -335 +338 @@
 
                 CASE ( 'pt', 'pt_xy', 'pt_xz', 'pt_yz' )
-                   IF ( .NOT. cloud_physics ) THEN
+                   IF ( .NOT. bulk_cloud_model ) THEN
                       DO  i = nxl_dvrp, nxr_dvrp+1
                          DO  j = nys_dvrp, nyn_dvrp+1
@@ -347 +350 @@
                          DO  j = nys_dvrp, nyn_dvrp+1
                             DO  k = nzb, nz_do3d
-                               local_pf(i,j,k) = pt(k,j,i) + l_d_cp *          &
-                                                 pt_d_t(k) * ql(k,j,i)
+                               local_pf(i,j,k) = pt(k,j,i) + lv_d_cp *         &
+                                                 d_exner(k) * ql(k,j,i)
                             ENDDO
                          ENDDO
@@ -372 +375 @@
              
                 CASE ( 'ql', 'ql_xy', 'ql_xz', 'ql_yz' )
-                   IF ( cloud_physics  .OR.  cloud_droplets )  THEN
+                   IF ( bulk_cloud_model  .OR.  cloud_droplets )  THEN
                       DO  i = nxl_dvrp, nxr_dvrp+1
                          DO  j = nys_dvrp, nyn_dvrp+1
@@ -381 +384 @@
                       ENDDO
                    ELSE                     
-                      message_string = 'if cloud_physics = .FALSE. and ' //    & 
+                      message_string = 'if bulk_cloud_model = .FALSE. and ' // &
                                   'cloud_droplets = .FALSE. '
                                   'output of ' // TRIM( output_variable) //    &