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

palm/trunk/SOURCE/data_output_mask.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variable removed
 ! 
@@ -129 +132 @@
     USE arrays_3d,                                                             &
         ONLY:  e, nc, nr, p, pt, q, qc, ql, ql_c, ql_v, qr, rho_ocean, s, sa,  &
-               tend, u, v, vpt, w
+               tend, u, v, vpt, w, d_exner
     
     USE averaging,                                                             &
@@ -135 +138 @@
                qc_av, ql_av, ql_c_av, ql_v_av, ql_vp_av, qv_av, qr_av,         &
                rho_ocean_av, s_av, sa_av, u_av, v_av, vpt_av, w_av 
-    
-    USE cloud_parameters,                                                      &
-        ONLY:  l_d_cp, pt_d_t
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  lv_d_cp
     
     USE control_parameters,                                                    &
-        ONLY:  cloud_physics, domask, domask_no, domask_time_count, mask_i,    &
+        ONLY:  domask, domask_no, domask_time_count, mask_i,                   &
                mask_j, mask_k, mask_size, mask_size_l, mask_start_l,           &
                max_masks, message_string, mid, nz_do3d, simulated_time
@@ -150 +153 @@
         
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model
     
     USE NETCDF
@@ -354 +360 @@
           CASE ( 'pt' )
              IF ( av == 0 )  THEN
-                IF ( .NOT. cloud_physics ) THEN
+                IF ( .NOT. bulk_cloud_model ) THEN
                    to_be_resorted => pt
                 ELSE
@@ -362 +368 @@
                             local_pf(i,j,k) =  &
                                  pt(mask_k(mid,k),mask_j(mid,j),mask_i(mid,i)) &
-                                 + l_d_cp * pt_d_t(mask_k(mid,k)) * &
+                                 + lv_d_cp * d_exner(mask_k(mid,k)) *          &
                                    ql(mask_k(mid,k),mask_j(mid,j),mask_i(mid,i))
                          ENDDO