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

palm/trunk/SOURCE/prognostic_equations.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! omp_get_thread_num now declared in omp directive
 ! 
@@ -289 +292 @@
                w, w_p
 
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  call_microphysics_at_all_substeps, bulk_cloud_model,            &
+               bcm_actions, microphysics_sat_adjust,                           &
+               microphysics_morrison, microphysics_seifert
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_integrate, chem_prognostic_equations,                      &
@@ -300 +308 @@
 
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, call_microphysics_at_all_substeps,               &
-               cloud_physics, cloud_top_radiation, constant_diffusion,         &
+        ONLY:  air_chemistry,                                                  &
+               cloud_top_radiation, constant_diffusion,                        &
                dp_external, dp_level_ind_b, dp_smooth_factor, dpdxy, dt_3d,    &
                humidity, intermediate_timestep_count,                          &
                intermediate_timestep_count_max, large_scale_forcing,           &
-               large_scale_subsidence, microphysics_morrison,                  &
-               microphysics_seifert, microphysics_sat_adjust, neutral, nudging,&
+               large_scale_subsidence,                  &
+               neutral, nudging, &
                ocean, passive_scalar, plant_canopy,                            &
                prho_reference, prho_reference,                                 &
@@ -381 +389 @@
     USE lsf_nudging_mod,                                                       &
         ONLY:  ls_advec, nudge
-
-    USE microphysics_mod,                                                      &
-        ONLY:  microphysics_control
 
     USE plant_canopy_model_mod,                                                &
@@ -500 +505 @@
 !
 !-- If required, calculate cloud microphysics
-    IF ( cloud_physics  .AND.  .NOT. microphysics_sat_adjust  .AND.            &
+    IF ( bulk_cloud_model  .AND.  .NOT. microphysics_sat_adjust  .AND.         &
          ( intermediate_timestep_count == 1  .OR.                              &
            call_microphysics_at_all_substeps ) )                               &
@@ -508 +513 @@
        DO  i = nxlg, nxrg
           DO  j = nysg, nyng
-             CALL microphysics_control( i, j )
+             CALL bcm_actions( i, j )
            ENDDO
        ENDDO
@@ -995 +1000 @@
 !--          If required, calculate prognostic equations for cloud water content
 !--          and cloud drop concentration
-             IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+             IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 !
 !--             Calculate prognostic equation for cloud water content
@@ -1111 +1116 @@
 !--          If required, calculate prognostic equations for rain water content
 !--          and rain drop concentration
-             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+             IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 !
 !--             Calculate prognostic equation for rain water content
@@ -1371 +1376 @@
 !
 !-- If required, calculate cloud microphysical impacts
-    IF ( cloud_physics  .AND.  .NOT. microphysics_sat_adjust  .AND.            &
+    IF ( bulk_cloud_model  .AND.  .NOT. microphysics_sat_adjust  .AND.         &
          ( intermediate_timestep_count == 1  .OR.                              &
            call_microphysics_at_all_substeps )                                 &
        )  THEN
        CALL cpu_log( log_point(51), 'microphysics', 'start' )
-       CALL microphysics_control
+       CALL bcm_actions
        CALL cpu_log( log_point(51), 'microphysics', 'stop' )
     ENDIF
@@ -1981 +1986 @@
 !--    If required, calculate prognostic equations for cloud water content
 !--    and cloud drop concentration
-       IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 
           CALL cpu_log( log_point(67), 'qc-equation', 'start' )
@@ -2160 +2165 @@
 !--    If required, calculate prognostic equations for rain water content
 !--    and rain drop concentration
-       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 
           CALL cpu_log( log_point(52), 'qr-equation', 'start' )