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

palm/trunk/SOURCE/virtual_flight_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -311 +314 @@
     SUBROUTINE flight_init
  
-       USE constants,                                                          &
+       USE basic_constants_and_equations_mod,                                  &
            ONLY:  pi
     
@@ -410 +413 @@
     
        USE control_parameters,                                                 &
-          ONLY:  cloud_droplets, cloud_physics, humidity, neutral,             &
-                 passive_scalar
-          
+          ONLY:  cloud_droplets, humidity, neutral, passive_scalar
+
+       USE bulk_cloud_model_mod,                                               &
+           ONLY:  bulk_cloud_model
+
        USE netcdf_interface
     
@@ -441 +446 @@
           id_q       = num_var_fl
        ENDIF
-       IF ( cloud_physics .OR. cloud_droplets )  THEN
+       IF ( bulk_cloud_model .OR. cloud_droplets )  THEN
           num_var_fl = num_var_fl + 1  
           id_ql      = num_var_fl
@@ -533 +538 @@
 
        USE control_parameters,                                                 &
-           ONLY:  cloud_droplets, cloud_physics, dt_3d, humidity, neutral,     &
+           ONLY:  cloud_droplets, dt_3d, humidity, neutral,                    &
                   passive_scalar, simulated_time
                   
@@ -544 +549 @@
        USE indices,                                                            &
            ONLY:  nx, nxl, nxr, ny, nys, nyn
+
+       USE bulk_cloud_model_mod,                                               &
+           ONLY:  bulk_cloud_model
 
        USE pegrid
@@ -712 +720 @@
 !
 !--             Liquid water content
-                IF ( cloud_physics .OR. cloud_droplets )  THEN
+                IF ( bulk_cloud_model .OR. cloud_droplets )  THEN
                    CALL interpolate_xyz( ql, zu, ddzu, 1.0_wp, x, y, var_index, j, i )
                    var_index = var_index + 1