Changeset 3274 for palm

Timestamp:

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

Author:

knoop

Message:

Modularization of all bulk cloud physics code components

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (61 diffs)
• advec_ws.f90 (modified) (18 diffs)
• average_3d_data.f90 (modified) (7 diffs)
• basic_constants_and_equations_mod.f90 (added)
• boundary_conds.f90 (modified) (10 diffs)
• bulk_cloud_model_mod.f90 (added)
• buoyancy.f90 (modified) (4 diffs)
• calc_liquid_water_content.f90 (deleted)
• calc_radiation.f90 (modified) (12 diffs)
• check_parameters.f90 (modified) (26 diffs)
• chem_photolysis_mod.f90 (modified) (5 diffs)
• chemistry_model_mod.f90 (modified) (3 diffs)
• compute_vpt.f90 (modified) (3 diffs)
• data_output_2d.f90 (modified) (12 diffs)
• data_output_3d.f90 (modified) (10 diffs)
• data_output_dvrp.f90 (modified) (7 diffs)
• data_output_mask.f90 (modified) (6 diffs)
• data_output_spectra.f90 (modified) (2 diffs)
• diagnostic_quantities_mod.f90 (deleted)
• flow_statistics.f90 (modified) (15 diffs)
• header.f90 (modified) (9 diffs)
• init_3d_model.f90 (modified) (20 diffs)
• init_cloud_physics.f90 (deleted)
• init_masks.f90 (modified) (11 diffs)
• init_ocean.f90 (modified) (2 diffs)
• init_rankine.f90 (modified) (2 diffs)
• init_slope.f90 (modified) (2 diffs)
• interaction_droplets_ptq.f90 (modified) (7 diffs)
• land_surface_model_mod.f90 (modified) (19 diffs)
• lpm_advec.f90 (modified) (3 diffs)
• lpm_calc_liquid_water_content.f90 (modified) (2 diffs)
• lpm_collision_kernels.f90 (modified) (3 diffs)
• lpm_droplet_collision.f90 (modified) (2 diffs)
• lpm_droplet_condensation.f90 (modified) (4 diffs)
• lpm_init.f90 (modified) (3 diffs)
• lpm_splitting.f90 (modified) (2 diffs)
• microphysics_mod.f90 (deleted)
• model_1d_mod.f90 (modified) (3 diffs)
• modules.f90 (modified) (10 diffs)
• multi_agent_system_mod.f90 (modified) (5 diffs)
• netcdf_interface_mod.f90 (modified) (2 diffs)
• palm.f90 (modified) (5 diffs)
• parin.f90 (modified) (15 diffs)
• plant_canopy_model_mod.f90 (modified) (3 diffs)
• pmc_interface_mod.f90 (modified) (20 diffs)
• prognostic_equations.f90 (modified) (11 diffs)
• radiation_model_mod.f90 (modified) (37 diffs)
• read_restart_data_mod.f90 (modified) (18 diffs)
• sum_up_3d_data.f90 (modified) (14 diffs)
• surface_coupler.f90 (modified) (4 diffs)
• surface_layer_fluxes_mod.f90 (modified) (10 diffs)
• surface_mod.f90 (modified) (21 diffs)
• swap_timelevel.f90 (modified) (7 diffs)
• synthetic_turbulence_generator_mod.f90 (modified) (2 diffs)
• time_integration.f90 (modified) (7 diffs)
• time_integration_spinup.f90 (modified) (2 diffs)
• timestep.f90 (modified) (2 diffs)
• tridia_solver_mod.f90 (modified) (10 diffs)
• turbulence_closure_mod.f90 (modified) (23 diffs)
• urban_surface_mod.f90 (modified) (20 diffs)
• uv_exposure_model_mod.f90 (modified) (4 diffs)
• virtual_flight_mod.f90 (modified) (7 diffs)
• wind_turbine_model_mod.f90 (modified) (2 diffs)
• write_restart_data_mod.f90 (modified) (14 diffs)

palm/trunk/SOURCE/Makefile

@@ -461 +461 @@
         advec_w_up.f90 \
         average_3d_data.f90 \
+        basic_constants_and_equations_mod.f90 \
         boundary_conds.f90 \
         buoyancy.f90 \
-        calc_liquid_water_content.f90 \
         calc_mean_profile.f90 \
         calc_radiation.f90 \
@@ -488 +488 @@
         data_output_tseries.f90 \
         date_and_time_mod.f90 \
-        diagnostic_quantities_mod.f90 \
         diffusion_s.f90 \
         diffusion_u.f90 \
@@ -506 +505 @@
         init_3d_model.f90 \
         init_advec.f90 \
-        init_cloud_physics.f90 \
         init_coupling.f90 \
         init_dvrp.f90 \
@@ -542 +540 @@
         lpm_write_restart_file.f90 \
         message.f90 \
-        microphysics_mod.f90 \
+        bulk_cloud_model_mod.f90 \
         model_1d_mod.f90 \
         mod_kinds.f90 \
@@ -691 +689 @@
         modules.o
 advec_ws.o: \
+        bulk_cloud_model_mod.o \
         mod_kinds.o \
         modules.o
@@ -700 +699 @@
         modules.o
 average_3d_data.o: \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         cpulog_mod.o \
@@ -710 +710 @@
         turbulence_closure_mod.o \
         urban_surface_mod.o
+basic_constants_and_equations_mod.o: \
+        mod_kinds.o
 boundary_conds.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         mod_kinds.o \
@@ -717 +721 @@
         surface_mod.o \
         turbulence_closure_mod.o
+bulk_cloud_model_mod.o: \
+        basic_constants_and_equations_mod.o \
+        cpulog_mod.o \
+        mod_kinds.o \
+        modules.o \
+        surface_mod.o
 buoyancy.o: \
+        basic_constants_and_equations_mod.o \
         mod_kinds.o \
         modules.o
@@ -723 +734 @@
         mod_kinds.o \
         modules.o
-calc_liquid_water_content.o: \
-        diagnostic_quantities_mod.o \
-        mod_kinds.o \
-        modules.o
 calc_radiation.o: \
+        basic_constants_and_equations_mod.o \
         mod_kinds.o \
         modules.o
@@ -741 +749 @@
         posix_calls_from_fortran.o
 check_parameters.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         gust_mod.o \
         land_surface_model_mod.o \
         large_scale_forcing_nudging_mod.o \
-        microphysics_mod.o \
         model_1d_mod.o \
         mod_kinds.o \
@@ -778 +787 @@
         modules.o
 chem_photolysis_mod.o: \
+        basic_constants_and_equations_mod.o \
         chem_gasphase_mod.o \
         chemistry_model_mod.o \
@@ -788 +798 @@
         netcdf_interface_mod.o
 compute_vpt.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         mod_kinds.o \
         modules.o
@@ -803 +815 @@
         modules.o
 data_output_dvrp.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
         modules.o
 data_output_mask.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -824 +840 @@
         netcdf_interface_mod.o
 data_output_spectra.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -841 +858 @@
         virtual_flight_mod.o
 data_output_2d.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         cpulog_mod.o \
         gust_mod.o \
@@ -853 +872 @@
         uv_exposure_model_mod.o
 data_output_3d.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         cpulog_mod.o \
@@ -866 +887 @@
         mod_kinds.o \
         modules.o
-diagnostic_quantities_mod.o: \
-        mod_kinds.o \
-        modules.o
 diffusion_s.o: \
         mod_kinds.o \
@@ -916 +934 @@
         temperton_fft_mod.o
 flow_statistics.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         cpulog_mod.o \
         gust_mod.o \
@@ -932 +952 @@
         modules.o
 header.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         cpulog_mod.o \
         date_and_time_mod.o \
@@ -937 +959 @@
         land_surface_model_mod.o \
         large_scale_forcing_nudging_mod.o \
-        microphysics_mod.o \
         model_1d_mod.o \
         mod_kinds.o \
@@ -956 +977 @@
 init_3d_model.o: \
         advec_ws.o \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         cpulog_mod.o \
@@ -963 +986 @@
         large_scale_forcing_nudging_mod.o \
         lpm_init.o \
-        microphysics_mod.o \
         model_1d_mod.o \
         mod_kinds.o \
@@ -987 +1009 @@
         mod_kinds.o \
         modules.o
-init_cloud_physics.o: \
-        mod_kinds.o \
-        modules.o
 init_coupling.o: \
         mod_kinds.o \
@@ -1007 +1026 @@
         vertical_nesting_mod.o
 init_masks.o: \
+        bulk_cloud_model_mod.o \
         mod_kinds.o \
         modules.o \
         netcdf_interface_mod.o
 init_ocean.o: \
+        basic_constants_and_equations_mod.o \
         eqn_state_seawater.o \
         mod_kinds.o \
@@ -1024 +1045 @@
         modules.o
 init_rankine.o: \
+        basic_constants_and_equations_mod.o \
         mod_kinds.o \
         modules.o
 init_slope.o: \
+        basic_constants_and_equations_mod.o \
         mod_kinds.o \
         modules.o
 interaction_droplets_ptq.o: \
+        basic_constants_and_equations_mod.o \
         mod_kinds.o \
         modules.o
 land_surface_model_mod.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         calc_mean_profile.o \
-        diagnostic_quantities_mod.o \
         mod_kinds.o \
         modules.o \
@@ -1073 +1098 @@
         pmc_particle_interface.o
 lpm_advec.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1085 +1111 @@
         surface_mod.o
 lpm_calc_liquid_water_content.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1090 +1117 @@
         modules.o
 lpm_collision_kernels.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1102 +1130 @@
         netcdf_interface_mod.o
 lpm_droplet_collision.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         lpm_collision_kernels.o \
@@ -1108 +1137 @@
         modules.o
 lpm_droplet_condensation.o: \
-        cpulog_mod.o \
-        diagnostic_quantities_mod.o \
+        basic_constants_and_equations_mod.o \
+        cpulog_mod.o \
         lpm_collision_kernels.o \
         mod_kinds.o \
@@ -1122 +1151 @@
         netcdf_interface_mod.o
 lpm_init.o: \
-        diagnostic_quantities_mod.o \
+        basic_constants_and_equations_mod.o \
         lpm_collision_kernels.o \
         lpm_exchange_horiz.o \
@@ -1160 +1189 @@
         modules.o
 lpm_splitting.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         lpm_exchange_horiz.o \
@@ -1178 +1208 @@
         modules.o \
         pmc_interface_mod.o
-microphysics_mod.o: \
-        cpulog_mod.o \
-        diagnostic_quantities_mod.o \
-        mod_kinds.o \
-        modules.o \
-        surface_mod.o
 model_1d_mod.o: \
+        basic_constants_and_equations_mod.o \
         mod_kinds.o \
         modules.o
@@ -1190 +1215 @@
         mod_kinds.o
 multi_agent_system_mod.o: \
+        basic_constants_and_equations_mod.o \
         chemistry_model_mod.o \
         cpulog_mod.o \
@@ -1206 +1232 @@
         surface_mod.o
 netcdf_interface_mod.o: \
+        basic_constants_and_equations_mod.o \
         chemistry_model_mod.o \
         gust_mod.o \
@@ -1225 +1252 @@
         modules.o
 palm.o: \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         chem_photolysis_mod.o \
@@ -1238 +1266 @@
         write_restart_data_mod.o
 parin.o: \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         chem_modules.o \
@@ -1244 +1273 @@
         gust_mod.o \
         land_surface_model_mod.o \
-        microphysics_mod.o \
         model_1d_mod.o \
         mod_kinds.o \
@@ -1263 +1291 @@
         wind_turbine_model_mod.o
 plant_canopy_model_mod.o: \
+        bulk_cloud_model_mod.o \
         mod_kinds.o \
         modules.o \
@@ -1276 +1305 @@
         pmc_parent_mod.o
 pmc_interface_mod.o: \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         chem_modules.o \
@@ -1344 +1374 @@
         advec_ws.o \
         advec_w_up.o \
+        bulk_cloud_model_mod.o \
         buoyancy.o \
         calc_radiation.o \
@@ -1358 +1389 @@
         eqn_state_seawater.o \
         large_scale_forcing_nudging_mod.o \
-        microphysics_mod.o \
         mod_kinds.o \
         mod_kinds.o \
@@ -1375 +1405 @@
         modules.o
 radiation_model_mod.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         calc_mean_profile.o \
         date_and_time_mod.o \
-        microphysics_mod.o \
         mod_particle_attributes.o \
         modules.o \
@@ -1393 +1424 @@
         modules.o
 read_restart_data_mod.o: \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         cpulog_mod.o \
@@ -1398 +1430 @@
         gust_mod.o \
         land_surface_model_mod.o \
-        microphysics_mod.o \
         modules.o \
         mod_kinds.o \
@@ -1435 +1466 @@
         modules.o
 sum_up_3d_data.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         cpulog_mod.o \
@@ -1447 +1480 @@
         uv_exposure_model_mod.o
 surface_coupler.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1452 +1486 @@
         surface_mod.o
 surface_layer_fluxes_mod.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         chem_modules.o \
         exchange_horiz_2d.o \
@@ -1465 +1501 @@
         modules.o
 swap_timelevel.o: \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         cpulog_mod.o \
@@ -1475 +1512 @@
         urban_surface_mod.o
 synthetic_turbulence_generator_mod.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1484 +1522 @@
 time_integration.o: \
         advec_ws.o \
+        bulk_cloud_model_mod.o \
         buoyancy.o \
         calc_mean_profile.o \
@@ -1496 +1535 @@
         large_scale_forcing_nudging_mod.o \
         lpm.o \
-        microphysics_mod.o \
         mod_kinds.o \
         modules.o \
@@ -1516 +1554 @@
         wind_turbine_model_mod.o
 time_integration_spinup.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         date_and_time_mod.o \
@@ -1528 +1567 @@
         mod_kinds.o
 timestep.o: \
-        cpulog_mod.o \
-        microphysics_mod.o \
+        bulk_cloud_model_mod.o \
+        cpulog_mod.o \
         mod_kinds.o \
         modules.o \
@@ -1542 +1581 @@
         modules.o
 tridia_solver_mod.o: \
+        basic_constants_and_equations_mod.o \
         mod_kinds.o \
         modules.o
@@ -1549 +1589 @@
         advec_s_up.o \
         advec_ws.o \
-        cpulog_mod.o \
-        microphysics_mod.o \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
+        cpulog_mod.o \
         mod_kinds.o \
         mod_particle_attributes.o \
@@ -1560 +1601 @@
         user_actions.o
 urban_surface_mod.o: \
+        basic_constants_and_equations_mod.o \
         date_and_time_mod.o \
         mod_kinds.o \
@@ -1706 +1748 @@
         user_module.o
 uv_exposure_model_mod.o: \
+        basic_constants_and_equations_mod.o \
         date_and_time_mod.o \
         mod_kinds.o \
@@ -1716 +1759 @@
         turbulence_closure_mod.o
 virtual_flight_mod.o: \
+        basic_constants_and_equations_mod.o \
+        bulk_cloud_model_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1723 +1768 @@
         user_init_flight.o
 wind_turbine_model_mod.o: \
+        basic_constants_and_equations_mod.o \
         cpulog_mod.o \
         mod_kinds.o \
@@ -1729 +1775 @@
         mod_kinds.o
 write_restart_data_mod.o: \
+        bulk_cloud_model_mod.o \
         chemistry_model_mod.o \
         date_and_time_mod.o \
         gust_mod.o \
         land_surface_model_mod.o \
-        microphysics_mod.o \
         mod_kinds.o \
         mod_particle_attributes.o \

palm/trunk/SOURCE/advec_ws.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -219 +222 @@
  MODULE advec_ws
 
- 
+    USE kinds
+
+    IMPLICIT NONE
+
+    REAL(wp) ::  adv_mom_1            !< 1/4 - constant used in 5th-order advection scheme for momentum advection (1st-order part)
+    REAL(wp) ::  adv_mom_3            !< 1/24 - constant used in 5th-order advection scheme for momentum advection (3rd-order part)
+    REAL(wp) ::  adv_mom_5            !< 1/120 - constant used in 5th-order advection scheme for momentum advection (5th-order part)
+    REAL(wp) ::  adv_sca_1            !< 1/2 - constant used in 5th-order advection scheme for scalar advection (1st-order part)
+    REAL(wp) ::  adv_sca_3            !< 1/12 - constant used in 5th-order advection scheme for scalar advection (3rd-order part)
+    REAL(wp) ::  adv_sca_5            !< 1/60 - constant used in 5th-order advection scheme for scalar advection (5th-order part)
 
     PRIVATE
@@ -280 +292 @@
                   flux_s_v, flux_s_w
 
-       USE constants,                                                          &
-           ONLY:  adv_mom_1, adv_mom_3, adv_mom_5, adv_sca_1, adv_sca_3,       &
-                  adv_sca_5
-
        USE control_parameters,                                                 &
-           ONLY:  cloud_physics, humidity, loop_optimization,                  &
-                  passive_scalar, microphysics_morrison, microphysics_seifert, &
-                  ocean, rans_tke_e, ws_scheme_mom, ws_scheme_sca
+           ONLY:  humidity, loop_optimization, passive_scalar, ocean,          &
+                  rans_tke_e, ws_scheme_mom, ws_scheme_sca
 
        USE indices,                                                            &
@@ -293 +300 @@
 
        USE kinds
-       
+
+       USE bulk_cloud_model_mod,                                               &
+           ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
+
        USE pegrid
 
@@ -345 +355 @@
           ENDIF
 
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              ALLOCATE( sums_wsqcs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
              ALLOCATE( sums_wsncs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
@@ -352 +362 @@
           ENDIF
 
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              ALLOCATE( sums_wsqrs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
              ALLOCATE( sums_wsnrs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
@@ -422 +432 @@
              ENDIF
 
-             IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+             IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
                 ALLOCATE( flux_s_qc(nzb+1:nzt,0:threads_per_task-1),           &
                           diss_s_qc(nzb+1:nzt,0:threads_per_task-1),           &
@@ -433 +443 @@
              ENDIF                  
 
-             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+             IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
                 ALLOCATE( flux_s_qr(nzb+1:nzt,0:threads_per_task-1),           &
                           diss_s_qr(nzb+1:nzt,0:threads_per_task-1),           &
@@ -1074 +1084 @@
     
        USE control_parameters,                                                 &
-           ONLY:  cloud_physics, humidity, passive_scalar, ocean,              &
-                  microphysics_morrison, microphysics_seifert, ws_scheme_mom,  & 
-                  ws_scheme_sca
+           ONLY:  humidity, passive_scalar, ocean, ws_scheme_mom, ws_scheme_sca
 
        USE kinds
+
+       USE bulk_cloud_model_mod,                                               &
+           ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
 
        USE statistics,                                                         &
@@ -1104 +1115 @@
           IF ( humidity       )  sums_wsqs_ws_l = 0.0_wp
           IF ( passive_scalar )  sums_wsss_ws_l = 0.0_wp
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              sums_wsqcs_ws_l = 0.0_wp
              sums_wsncs_ws_l = 0.0_wp
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              sums_wsqrs_ws_l = 0.0_wp
              sums_wsnrs_ws_l = 0.0_wp
@@ -1130 +1141 @@
        USE arrays_3d,                                                          &
            ONLY:  ddzw, drho_air, tend, u, v, w, rho_air_zw
-
-       USE constants,                                                          &
-           ONLY:  adv_sca_1, adv_sca_3, adv_sca_5
 
        USE control_parameters,                                                 &
@@ -1704 +1712 @@
                   drho_air, rho_air_zw
 
-       USE constants,                                                         &
-           ONLY:  adv_mom_1, adv_mom_3, adv_mom_5
-
        USE control_parameters,                                                &
            ONLY:  intermediate_timestep_count, u_gtrans, v_gtrans
@@ -2202 +2207 @@
                   drho_air, rho_air_zw
 
-       USE constants,                                                          &
-           ONLY:  adv_mom_1, adv_mom_3, adv_mom_5
-
        USE control_parameters,                                                 &
            ONLY:  intermediate_timestep_count, u_gtrans, v_gtrans
@@ -2707 +2709 @@
                   drho_air_zw, rho_air
 
-       USE constants,                                                         &
-           ONLY:  adv_mom_1, adv_mom_3, adv_mom_5
-
        USE control_parameters,                                                &
            ONLY:  intermediate_timestep_count, u_gtrans, v_gtrans
@@ -3184 +3183 @@
        USE arrays_3d,                                                         &
            ONLY:  ddzw, drho_air, tend, u, v, w, rho_air_zw
-
-       USE constants,                                                         &
-           ONLY:  adv_sca_1, adv_sca_3, adv_sca_5
 
        USE control_parameters,                                                &
@@ -3740 +3736 @@
            ONLY:  ddzw, drho_air, tend, u, v, w, rho_air_zw
 
-       USE constants,                                                          &
-           ONLY:  adv_mom_1, adv_mom_3, adv_mom_5
-
        USE control_parameters,                                                 &
            ONLY:  intermediate_timestep_count, u_gtrans, v_gtrans
@@ -4234 +4227 @@
            ONLY:  ddzw, drho_air, tend, u, v, w, rho_air_zw
 
-       USE constants,                                                          &
-           ONLY:  adv_mom_1, adv_mom_3, adv_mom_5
-
        USE control_parameters,                                                 &
            ONLY:  intermediate_timestep_count, u_gtrans, v_gtrans
@@ -4738 +4728 @@
        USE arrays_3d,                                                          &
            ONLY:  ddzu, drho_air_zw, tend, u, v, w, rho_air
-
-       USE constants,                                                          &
-           ONLY:  adv_mom_1, adv_mom_3, adv_mom_5
 
        USE control_parameters,                                                 &

palm/trunk/SOURCE/average_3d_data.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3004 2018-04-27 12:33:25Z Giersch
 ! Further allocation checks implemented, case z0q* added
 ! 
@@ -138 +141 @@
     USE averaging
 
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_3d_data_averaging
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_3d_data_averaging
@@ -255 +261 @@
              ENDIF
 
-          CASE ( 'nc' )
-             IF ( ALLOCATED( nc_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         nc_av(k,j,i) = nc_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          CASE ( 'nr' )
-             IF ( ALLOCATED( nr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         nr_av(k,j,i) = nr_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
          CASE ( 'ol*' )
              IF ( ALLOCATED( ol_av ) ) THEN
@@ -320 +304 @@
              ENDIF
 
-          CASE ( 'prr' )
-             IF ( ALLOCATED( prr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         prr_av(k,j,i) = prr_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
           CASE ( 'pt' )
              IF ( ALLOCATED( pt_av ) ) THEN
@@ -353 +326 @@
              ENDIF
 
-          CASE ( 'qc' )
-             IF ( ALLOCATED( qc_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         qc_av(k,j,i) = qc_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
           CASE ( 'ql' )
              IF ( ALLOCATED( ql_av ) ) THEN
@@ -404 +366 @@
                          ql_vp_av(k,j,i) = ql_vp_av(k,j,i) /                      &
                                            REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          CASE ( 'qr' )
-             IF ( ALLOCATED( qr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         qr_av(k,j,i) = qr_av(k,j,i) / REAL( average_count_3d, KIND=wp )
                       ENDDO
                    ENDDO
@@ -607 +558 @@
 !--          Turbulence closure module
              CALL tcm_3d_data_averaging( 'average', doav(ii) )
-
+!
+!--          microphysics module quantities
+             IF ( bulk_cloud_model )  THEN
+                CALL bcm_3d_data_averaging( 'average', doav(ii) )
+             ENDIF
 !
 !--          Land surface quantity

palm/trunk/SOURCE/boundary_conds.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -197 +200 @@
                w, w_p, w_m_l, w_m_n, w_m_r, w_m_s
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  kappa
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_boundary_conds 
@@ -204 +210 @@
                bc_dirichlet_s, bc_radiation_l, bc_radiation_n, bc_radiation_r, &
                bc_radiation_s, bc_pt_t_val, bc_q_t_val, bc_s_t_val,            &
-               child_domain, constant_diffusion, cloud_physics, coupling_mode, &
+               child_domain, constant_diffusion, coupling_mode, &
                dt_3d, humidity, ibc_pt_b, ibc_pt_t, ibc_q_b, ibc_q_t, ibc_s_b, &
                ibc_s_t,ibc_sa_t, ibc_uv_b, ibc_uv_t,                           &
-               intermediate_timestep_count, kappa,                             &
-               microphysics_morrison, microphysics_seifert,                    &
+               intermediate_timestep_count,                                    &
                nesting_offline, nudging,                                       &
                ocean, passive_scalar, rans_mode, rans_tke_e, tsc, use_cmax
@@ -220 +225 @@
 
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
 
     USE pegrid
@@ -597 +605 @@
        ENDIF
 
-       IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 !             
 !--       Surface conditions cloud water (Dirichlet)
@@ -618 +626 @@
        ENDIF
 
-       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 !             
 !--       Surface conditions rain water (Dirichlet)
@@ -736 +744 @@
        IF ( humidity )  THEN
           q_p(:,nys-1,:) = q_p(:,nys,:)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,nys-1,:) = qc_p(:,nys,:)
              nc_p(:,nys-1,:) = nc_p(:,nys,:)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,nys-1,:) = qr_p(:,nys,:)
              nr_p(:,nys-1,:) = nr_p(:,nys,:)
@@ -752 +760 @@
        IF ( humidity )  THEN
           q_p(:,nyn+1,:) = q_p(:,nyn,:)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,nyn+1,:) = qc_p(:,nyn,:)
              nc_p(:,nyn+1,:) = nc_p(:,nyn,:)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,nyn+1,:) = qr_p(:,nyn,:)
              nr_p(:,nyn+1,:) = nr_p(:,nyn,:)
@@ -768 +776 @@
        IF ( humidity )  THEN
           q_p(:,:,nxl-1) = q_p(:,:,nxl)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,:,nxl-1) = qc_p(:,:,nxl)
              nc_p(:,:,nxl-1) = nc_p(:,:,nxl)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,:,nxl-1) = qr_p(:,:,nxl)
              nr_p(:,:,nxl-1) = nr_p(:,:,nxl)
@@ -784 +792 @@
        IF ( humidity )  THEN
           q_p(:,:,nxr+1) = q_p(:,:,nxr)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,:,nxr+1) = qc_p(:,:,nxr)
              nc_p(:,:,nxr+1) = nc_p(:,:,nxr)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,:,nxr+1) = qr_p(:,:,nxr)
              nr_p(:,:,nxr+1) = nr_p(:,:,nxr)

palm/trunk/SOURCE/buoyancy.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused Variable removed
 !
@@ -114 +117 @@
 !------------------------------------------------------------------------------!
  MODULE buoyancy_mod
- 
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g
 
     PRIVATE
@@ -138 +143 @@
 
        USE control_parameters,                                                 &
-           ONLY:  atmos_ocean_sign, cos_alpha_surface, g, message_string,      &
+           ONLY:  atmos_ocean_sign, cos_alpha_surface, message_string,         &
                   pt_surface, sin_alpha_surface, sloping_surface
 
@@ -244 +249 @@
 
        USE control_parameters,                                                 &
-           ONLY:  atmos_ocean_sign, cos_alpha_surface, g, message_string,      &
+           ONLY:  atmos_ocean_sign, cos_alpha_surface, message_string,         &
                   pt_surface, sin_alpha_surface, sloping_surface
 

palm/trunk/SOURCE/calc_radiation.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -77 +80 @@
  MODULE calc_radiation_mod
  
+
+    USE arrays_3d,                                                             &
+        ONLY:  dzw, pt, ql, tend, d_exner, exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, lv_d_cp, sigma_sb
+
+    USE control_parameters,                                                    &
+        ONLY:  rho_surface
+
+    USE indices,                                                               &
+        ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
+
     USE kinds
-    
+
+    USE pegrid
+
     PRIVATE
     PUBLIC calc_radiation
-    
+
     LOGICAL, SAVE ::  first_call = .TRUE. !<
-    REAL(wp), SAVE ::  sigma = 5.67E-08_wp   !<
 
     REAL(wp), DIMENSION(:), ALLOCATABLE, SAVE ::  lwp_ground         !<
@@ -103 +120 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE calc_radiation
-
-       USE arrays_3d,                                                          &
-           ONLY:  dzw, pt, ql, tend
-
-       USE cloud_parameters,                                                   &
-           ONLY:  cp, l_d_cp, pt_d_t, t_d_pt
-
-       USE control_parameters,                                                 &
-           ONLY:  rho_surface
-
-       USE indices,                                                            &
-           ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
-
-       USE kinds
-
-       USE pegrid
-
 
        IMPLICIT NONE
@@ -159 +159 @@
              lwp_top(nzt+1)  = rho_surface * ql(nzt+1,j,i) * dzw(nzt+1)
 
-             temperature     = pt(nzb,j,i) * t_d_pt(nzb) + l_d_cp * ql(nzb,j,i)
-             blackbody_emission(nzb) = sigma * temperature**4
+             temperature     = pt(nzb,j,i) * exner(nzb) + lv_d_cp * ql(nzb,j,i)
+             blackbody_emission(nzb) = sigma_sb * temperature**4
 
              DO  k = nzb+1, nzt
@@ -171 +171 @@
                                   rho_surface * ql(k_help,j,i) * dzw(k_help)
 
-                temperature     = pt(k,j,i) * t_d_pt(k) + l_d_cp * ql(k,j,i)
-                blackbody_emission(k) = sigma * temperature**4                 &
+                temperature     = pt(k,j,i) * exner(k) + lv_d_cp * ql(k,j,i)
+                blackbody_emission(k) = sigma_sb * temperature**4              &
                                       * MERGE( 1.0_wp, 0.0_wp,                 &
                                                BTEST( wall_flags_0(k,j,i), 0 ) )
@@ -182 +182 @@
              lwp_top(nzb)      = lwp_top(nzb+1)
 
-             temperature       = pt(nzt+1,j,i) * t_d_pt(nzt+1) + l_d_cp *      &
+             temperature       = pt(nzt+1,j,i) * exner(nzt+1) + lv_d_cp *      &
                                  ql(nzt+1,j,i)
-             blackbody_emission(nzt+1) = sigma * temperature**4
+             blackbody_emission(nzt+1) = sigma_sb * temperature**4
 
 !
@@ -232 +232 @@
 !--                Compute tendency term         
                    tend(k,j,i) = tend(k,j,i) -                                 &
-                                ( pt_d_t(k) / ( rho_surface * cp ) *           &
+                                ( d_exner(k) / ( rho_surface * c_p ) *         &
                                   ( df_p - df_m ) / dzw(k) )                   &
                                       * MERGE( 1.0_wp, 0.0_wp,                 &
@@ -253 +253 @@
     SUBROUTINE calc_radiation_ij( i, j )
 
-       USE arrays_3d,                                                          &
-           ONLY:  dzw, pt, ql, tend
-
-       USE cloud_parameters,                                                   &
-           ONLY:  cp, l_d_cp, pt_d_t, t_d_pt
-
-       USE control_parameters,                                                 &
-           ONLY:  rho_surface
-
-       USE indices,                                                            &
-           ONLY:  nzb, nzt, wall_flags_0
-
-       USE kinds
-
-       USE pegrid
-
-   
        IMPLICIT NONE
 
@@ -305 +288 @@
        lwp_top(nzt+1)  = rho_surface * ql(nzt+1,j,i) * dzw(nzt+1)
 
-       temperature     = pt(nzb,j,i) * t_d_pt(nzb) + l_d_cp * ql(nzb,j,i)
-       blackbody_emission(nzb) = sigma * temperature**4
+       temperature     = pt(nzb,j,i) * exner(nzb) + lv_d_cp * ql(nzb,j,i)
+       blackbody_emission(nzb) = sigma_sb * temperature**4
 
        DO  k = nzb+1, nzt
@@ -315 +298 @@
                             rho_surface * ql(k_help,j,i) * dzw(k_help)
 
-          temperature     = pt(k,j,i) * t_d_pt(k) + l_d_cp * ql(k,j,i)
-          blackbody_emission(k) = sigma * temperature**4                       &
+          temperature     = pt(k,j,i) * exner(k) + lv_d_cp * ql(k,j,i)
+          blackbody_emission(k) = sigma_sb * temperature**4                    &
                                       * MERGE( 1.0_wp, 0.0_wp,                 &
                                                BTEST( wall_flags_0(k,j,i), 0 ) )
@@ -325 +308 @@
        lwp_top(nzb)      = lwp_top(nzb+1)
 
-       temperature       = pt(nzt+1,j,i) * t_d_pt(nzt+1) + l_d_cp *            &
+       temperature       = pt(nzt+1,j,i) * exner(nzt+1) + lv_d_cp *            &
                            ql(nzt+1,j,i)
-       blackbody_emission(nzt+1) = sigma * temperature**4
+       blackbody_emission(nzt+1) = sigma_sb * temperature**4
 
 !
@@ -370 +353 @@
 !
 !--          Compute tendency term         
-             tend(k,j,i) = tend(k,j,i) - ( pt_d_t(k) / ( rho_surface * cp ) *  &
-                                         ( df_p - df_m ) / dzw(k) )            &
+             tend(k,j,i) = tend(k,j,i) - ( d_exner(k) / ( rho_surface * c_p )  &
+                                      *  ( df_p - df_m ) / dzw(k) )            &
                                       * MERGE( 1.0_wp, 0.0_wp,                 &
                                                BTEST( wall_flags_0(k,j,i), 0 ) )

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id: check_parameters.f90 2520 2017-10-05 13:50:26Z gronemeier &
+! Modularization of all bulk cloud physics code components
+! 
+! 2520 2017-10-05 13:50:26Z gronemeier
 ! unused variables removed
 ! 
@@ -298 +301 @@
 !
 ! 1994 2016-08-15 09:52:21Z suehring
-! Add missing check for cloud_physics and cloud_droplets
+! Add missing check for bulk_cloud_model and cloud_droplets
 !
 ! 1992 2016-08-12 15:14:59Z suehring
@@ -665 +668 @@
 
     USE arrays_3d
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_check_parameters, bcm_check_data_output,  &
+               bcm_check_data_output_pr
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_boundary_conds, chem_check_data_output,                    &
-               chem_check_data_output_pr, chem_species                 
+               chem_check_data_output_pr, chem_species
     USE chem_modules
-    USE cloud_parameters
-    USE constants
+    USE basic_constants_and_equations_mod
     USE control_parameters
     USE dvrp_variables
@@ -1058 +1065 @@
           WRITE( action, '(A)' )  'galilei_transformation = .TRUE.'
        ENDIF
-       IF ( cloud_physics )  THEN
-          WRITE( action, '(A)' )  'cloud_physics = .TRUE.'
+       IF ( bulk_cloud_model )  THEN
+          WRITE( action, '(A)' )  'bulk_cloud_model = .TRUE.'
        ENDIF
        IF ( cloud_droplets )  THEN
@@ -1186 +1193 @@
 
     ENDIF
-!
-!-- Check cloud scheme
-    IF ( cloud_scheme == 'saturation_adjust' )  THEN
-       microphysics_sat_adjust = .TRUE.
-       microphysics_seifert    = .FALSE.
-       microphysics_kessler    = .FALSE.
-       precipitation           = .FALSE.
-    ELSEIF ( cloud_scheme == 'seifert_beheng' )  THEN
-       microphysics_sat_adjust = .FALSE.
-       microphysics_seifert    = .TRUE.
-       microphysics_kessler    = .FALSE.
-       microphysics_morrison  = .FALSE.
-       precipitation           = .TRUE.
-    ELSEIF ( cloud_scheme == 'kessler' )  THEN
-       microphysics_sat_adjust = .FALSE.
-       microphysics_seifert    = .FALSE.
-       microphysics_kessler    = .TRUE.
-       microphysics_morrison   = .FALSE.
-       precipitation           = .TRUE.
-    ELSEIF ( cloud_scheme == 'morrison' )  THEN
-       microphysics_sat_adjust = .FALSE.
-       microphysics_seifert    = .TRUE.
-       microphysics_kessler    = .FALSE.
-       microphysics_morrison   = .TRUE.
-       precipitation           = .TRUE.
-    ELSE
-       message_string = 'unknown cloud microphysics scheme cloud_scheme ="' // &
-                        TRIM( cloud_scheme ) // '"'
-       CALL message( 'check_parameters', 'PA0357', 1, 2, 0, 6, 0 )
-    ENDIF
-!
-!-- Check aerosol
-    IF ( aerosol_bulk == 'nacl' )  THEN
-       aerosol_nacl   = .TRUE.
-       aerosol_c3h4o4 = .FALSE.
-       aerosol_nh4no3 = .FALSE.
-    ELSEIF ( aerosol_bulk == 'c3h4o4' )  THEN
-       aerosol_nacl   = .FALSE.
-       aerosol_c3h4o4 = .TRUE.
-       aerosol_nh4no3 = .FALSE.
-    ELSEIF ( aerosol_bulk == 'nh4no3' )  THEN
-       aerosol_nacl   = .FALSE.
-       aerosol_c3h4o4 = .FALSE.
-       aerosol_nh4no3 = .TRUE.
-    ELSE
-       message_string = 'unknown aerosol = "' // TRIM( aerosol_bulk ) // '"'
-       CALL message( 'check_parameters', 'PA0469', 1, 2, 0, 6, 0 )
-    ENDIF
 
 !
@@ -1352 +1311 @@
 !
 !-- Check for proper settings for microphysics
-    IF ( cloud_physics  .AND.  cloud_droplets )  THEN
-       message_string = 'cloud_physics = .TRUE. is not allowed with ' //       &
+    IF ( bulk_cloud_model  .AND.  cloud_droplets )  THEN
+       message_string = 'bulk_cloud_model = .TRUE. is not allowed with ' //    &
                         'cloud_droplets = .TRUE.'
        CALL message( 'check_parameters', 'PA0442', 1, 2, 0, 6, 0 )
@@ -1458 +1417 @@
     ENDIF
 
-    IF ( cloud_physics  .AND.  .NOT.  humidity )  THEN
-       WRITE( message_string, * ) 'cloud_physics = ', cloud_physics, ' is ',   &
-              'not allowed with humidity = ', humidity
+    IF ( bulk_cloud_model  .AND.  .NOT.  humidity )  THEN
+       WRITE( message_string, * ) 'bulk_cloud_model = ', bulk_cloud_model,     &
+              ' is not allowed with humidity = ', humidity
        CALL message( 'check_parameters', 'PA0034', 1, 2, 0, 6, 0 )
     ENDIF
@@ -1483 +1442 @@
 !-- When land surface model is used, perform additional checks
     IF ( land_surface )  CALL lsm_check_parameters
+!
+!-- When microphysics module is used, perform additional checks
+    IF ( bulk_cloud_model )  CALL bcm_check_parameters
 
 !
@@ -2394 +2356 @@
 
 !
-!-- Set the default value for the integration interval of precipitation amount
-    IF ( microphysics_seifert  .OR.  microphysics_kessler )  THEN
-       IF ( precipitation_amount_interval == 9999999.9_wp )  THEN
-          precipitation_amount_interval = dt_do2d_xy
-       ELSE
-          IF ( precipitation_amount_interval > dt_do2d_xy )  THEN
-             WRITE( message_string, * )  'precipitation_amount_interval = ',   &
-                 precipitation_amount_interval, ' must not be larger than ',   &
-                 'dt_do2d_xy = ', dt_do2d_xy
-             CALL message( 'check_parameters', 'PA0090', 1, 2, 0, 6, 0 )
-          ENDIF
-       ENDIF
-    ENDIF
-
-!
 !-- Determine the number of output profiles and check whether they are
 !-- permissible
@@ -2447 +2394 @@
 
           CASE ( 'pt', '#pt' )
-             IF ( .NOT. cloud_physics ) THEN
+             IF ( .NOT. bulk_cloud_model ) THEN
                 dopr_index(i) = 4
                 dopr_unit(i)  = 'K'
@@ -2682 +2629 @@
 
           CASE ( 'qv', '#qv' )
-             IF ( .NOT. cloud_physics ) THEN
+             IF ( .NOT. bulk_cloud_model ) THEN
                 dopr_index(i) = 41
                 dopr_unit(i)  = 'kg/kg'
@@ -2705 +2652 @@
 
           CASE ( 'lpt', '#lpt' )
-             IF ( .NOT. cloud_physics ) THEN
+             IF ( .NOT. bulk_cloud_model ) THEN
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE.'
+                                 'lemented for bulk_cloud_model = .FALSE.'
                 CALL message( 'check_parameters', 'PA0094', 1, 2, 0, 6, 0 )
              ELSE
@@ -2821 +2768 @@
 
           CASE ( 'w"qv"' )
-             IF ( humidity  .AND.  .NOT.  cloud_physics )  THEN
+             IF ( humidity  .AND.  .NOT.  bulk_cloud_model )  THEN
                 dopr_index(i) = 48
                 dopr_unit(i)  = TRIM ( waterflux_output_unit )
                 hom(:,2,48,:) = SPREAD( zw, 2, statistic_regions+1 )
-             ELSEIF ( humidity  .AND.  cloud_physics )  THEN
+             ELSEIF ( humidity  .AND.  bulk_cloud_model )  THEN
                 dopr_index(i) = 51
                 dopr_unit(i)  = TRIM ( waterflux_output_unit )
@@ -2832 +2779 @@
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. an'  // &
-                                 'd humidity = .FALSE.'
+                                 'lemented for bulk_cloud_model = .FALSE. ' // &
+                                 'and humidity = .FALSE.'
                 CALL message( 'check_parameters', 'PA0095', 1, 2, 0, 6, 0 )
              ENDIF
 
           CASE ( 'w*qv*' )
-             IF ( humidity  .AND.  .NOT. cloud_physics )                       &
-             THEN
+             IF ( humidity  .AND.  .NOT. bulk_cloud_model )  THEN
                 dopr_index(i) = 49
                 dopr_unit(i)  = TRIM ( waterflux_output_unit )
                 hom(:,2,49,:) = SPREAD( zw, 2, statistic_regions+1 )
-             ELSEIF( humidity .AND. cloud_physics ) THEN
+             ELSEIF( humidity .AND. bulk_cloud_model ) THEN
                 dopr_index(i) = 52
                 dopr_unit(i)  = TRIM ( waterflux_output_unit )
@@ -2850 +2796 @@
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. an'  // &
-                                 'd humidity = .FALSE.'
+                                 'lemented for bulk_cloud_model = .FALSE. ' // &
+                                 'and humidity = .FALSE.'
                 CALL message( 'check_parameters', 'PA0095', 1, 2, 0, 6, 0 )
              ENDIF
 
           CASE ( 'wqv' )
-             IF ( humidity  .AND.  .NOT.  cloud_physics )  THEN
+             IF ( humidity  .AND.  .NOT.  bulk_cloud_model )  THEN
                 dopr_index(i) = 50
                 dopr_unit(i)  = TRIM ( waterflux_output_unit )
                 hom(:,2,50,:) = SPREAD( zw, 2, statistic_regions+1 )
-             ELSEIF ( humidity  .AND.  cloud_physics )  THEN
+             ELSEIF ( humidity  .AND.  bulk_cloud_model )  THEN
                 dopr_index(i) = 53
                 dopr_unit(i)  = TRIM ( waterflux_output_unit )
@@ -2867 +2813 @@
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. an'  // &
-                                 'd humidity = .FALSE.'
+                                 'lemented for bulk_cloud_model = .FALSE. ' // &
+                                 'and humidity = .FALSE.'
                 CALL message( 'check_parameters', 'PA0095', 1, 2, 0, 6, 0 )
              ENDIF
 
           CASE ( 'ql' )
-             IF (  .NOT.  cloud_physics  .AND.  .NOT.  cloud_droplets )  THEN
+             IF (  .NOT.  bulk_cloud_model  .AND.  .NOT.  cloud_droplets )  THEN
                 message_string = 'data_output_pr = ' //                        &
                                  TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE. and' // &
-                                 'cloud_droplets = .FALSE.'
+                                 'lemented for bulk_cloud_model = .FALSE. ' // &
+                                 'and cloud_droplets = .FALSE.'
                 CALL message( 'check_parameters', 'PA0096', 1, 2, 0, 6, 0 )
              ELSE
@@ -3034 +2980 @@
              hom(:,2,120,:) = SPREAD( zw, 2, statistic_regions+1 )
 
-          CASE ( 'nc' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE.'
-                CALL message( 'check_parameters', 'PA0094', 1, 2, 0, 6, 0 )
-             ELSEIF ( .NOT.  microphysics_morrison )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_scheme /= morrison'
-                CALL message( 'check_parameters', 'PA0358', 1, 2, 0, 6, 0 )
-             ELSE
-                dopr_index(i) = 89
-                dopr_unit(i)  = '1/m3'
-                hom(:,2,89,:)  = SPREAD( zu, 2, statistic_regions+1 )
-             ENDIF
-
-          CASE ( 'nr' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE.'
-                CALL message( 'check_parameters', 'PA0094', 1, 2, 0, 6, 0 )
-             ELSEIF ( .NOT.  microphysics_seifert )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_scheme /= seifert_beheng'
-                CALL message( 'check_parameters', 'PA0358', 1, 2, 0, 6, 0 )
-             ELSE
-                dopr_index(i) = 73
-                dopr_unit(i)  = '1/m3'
-                hom(:,2,73,:)  = SPREAD( zu, 2, statistic_regions+1 )
-             ENDIF
-
-          CASE ( 'qr' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE.'
-                CALL message( 'check_parameters', 'PA0094', 1, 2, 0, 6, 0 )
-             ELSEIF ( .NOT.  microphysics_seifert )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_scheme /= seifert_beheng'
-                CALL message( 'check_parameters', 'PA0358', 1, 2, 0, 6, 0 )
-             ELSE
-                dopr_index(i) = 74
-                dopr_unit(i)  = 'kg/kg'
-                hom(:,2,74,:)  = SPREAD( zu, 2, statistic_regions+1 )
-             ENDIF
-
-          CASE ( 'qc' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE.'
-                CALL message( 'check_parameters', 'PA0094', 1, 2, 0, 6, 0 )
-             ELSE
-                dopr_index(i) = 75
-                dopr_unit(i)  = 'kg/kg'
-                hom(:,2,75,:)  = SPREAD( zu, 2, statistic_regions+1 )
-             ENDIF
-
-          CASE ( 'prr' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not imp' // &
-                                 'lemented for cloud_physics = .FALSE.'
-                CALL message( 'check_parameters', 'PA0094', 1, 2, 0, 6, 0 )
-             ELSEIF ( microphysics_sat_adjust )  THEN
-                message_string = 'data_output_pr = ' //                        &
-                                 TRIM( data_output_pr(i) ) // ' is not ava' // &
-                                 'ilable for cloud_scheme = saturation_adjust'
-                CALL message( 'check_parameters', 'PA0422', 1, 2, 0, 6, 0 )
-             ELSE
-                dopr_index(i) = 76
-                dopr_unit(i)  = 'kg/kg m/s'
-                hom(:,2,76,:)  = SPREAD( zu, 2, statistic_regions+1 )
-             ENDIF
-
           CASE ( 'ug' )
              dopr_index(i) = 78
@@ -3154 +3020 @@
              CALL lsm_check_data_output_pr( data_output_pr(i), i, unit,        &
                                             dopr_unit(i) )
+!
+!--          Block of microphysics module profile outputs
+             IF ( unit == 'illegal'  .AND.  bulk_cloud_model  )  THEN
+                   CALL bcm_check_data_output_pr(data_output_pr(i), i, unit,   &
+                                                 dopr_unit(i) )
+             ENDIF
 
              IF ( unit == 'illegal' )  THEN
@@ -3260 +3132 @@
 
           CASE ( 'lpt' )
-             IF (  .NOT.  cloud_physics )  THEN
+             IF (  .NOT.  bulk_cloud_model )  THEN
                 message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_physics = .TRUE.'
+                         'res bulk_cloud_model = .TRUE.'
                 CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
              ENDIF
              unit = 'K'
-
-          CASE ( 'nc' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_physics = .TRUE.'
-                CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
-             ELSEIF ( .NOT.  microphysics_morrison )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res = morrison '
-                CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 )
-             ENDIF
-             unit = '1/m3'
-
-          CASE ( 'nr' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_physics = .TRUE.'
-                CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
-             ELSEIF ( .NOT.  microphysics_seifert )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_scheme = seifert_beheng'
-                CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 )
-             ENDIF
-             unit = '1/m3'
 
           CASE ( 'pc', 'pr' )
@@ -3301 +3149 @@
              IF ( TRIM( var ) == 'pr' )  unit = 'm'
 
-          CASE ( 'prr' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_physics = .TRUE.'
-                CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
-             ELSEIF ( microphysics_sat_adjust )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" is ' //    &
-                         'not available for cloud_scheme = saturation_adjust'
-                CALL message( 'check_parameters', 'PA0423', 1, 2, 0, 6, 0 )
-             ENDIF
-             unit = 'kg/kg m/s'
-
           CASE ( 'q', 'vpt' )
              IF (  .NOT.  humidity )  THEN
@@ -3322 +3158 @@
              IF ( TRIM( var ) == 'vpt' )  unit = 'K'
 
-          CASE ( 'qc' )
-             IF (  .NOT.  cloud_physics )  THEN
+          CASE ( 'ql' )
+             IF ( .NOT.  ( bulk_cloud_model  .OR.  cloud_droplets ) )  THEN
                 message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_physics = .TRUE.'
-                CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
-             ENDIF
-             unit = 'kg/kg'
-
-          CASE ( 'ql' )
-             IF ( .NOT.  ( cloud_physics  .OR.  cloud_droplets ) )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_physics = .TRUE. or cloud_droplets = .TRUE.'
+                      'res bulk_cloud_model = .TRUE. or cloud_droplets = .TRUE.'
                 CALL message( 'check_parameters', 'PA0106', 1, 2, 0, 6, 0 )
              ENDIF
@@ -3348 +3176 @@
              IF ( TRIM( var ) == 'ql_vp' )  unit = 'none'
 
-          CASE ( 'qr' )
-             IF (  .NOT.  cloud_physics )  THEN
+          CASE ( 'qv' )
+             IF (  .NOT.  bulk_cloud_model )  THEN
                 message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_physics = .TRUE.'
-                CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
-             ELSEIF ( .NOT.  microphysics_seifert ) THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                         'res cloud_scheme = seifert_beheng'
-                CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 )
-             ENDIF
-             unit = 'kg/kg'
-
-          CASE ( 'qv' )
-             IF (  .NOT.  cloud_physics )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                                 'res cloud_physics = .TRUE.'
+                                 'res bulk_cloud_model = .TRUE.'
                 CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
              ENDIF
@@ -3400 +3216 @@
              CONTINUE
 
-          CASE ( 'ghf*', 'lwp*', 'ol*', 'pra*', 'prr*', 'qsws*', 'r_a*',       &
+          CASE ( 'ghf*', 'lwp*', 'ol*', 'qsws*', 'r_a*',                       &
                  'shf*', 'ssws*', 't*', 'tsurf*', 'u*', 'z0*', 'z0h*', 'z0q*' )
              IF ( k == 0  .OR.  data_output(i)(ilen-2:ilen) /= '_xy' )  THEN
@@ -3409 +3225 @@
              ENDIF
 
-             IF ( TRIM( var ) == 'lwp*'  .AND.  .NOT. cloud_physics )  THEN
+             IF ( TRIM( var ) == 'lwp*'  .AND.  .NOT. bulk_cloud_model )  THEN
                 message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                                 'res cloud_physics = .TRUE.'
+                                 'res bulk_cloud_model = .TRUE.'
                 CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
-             ENDIF
-             IF ( TRIM( var ) == 'pra*'  .AND.                                 &
-                  .NOT. ( microphysics_kessler .OR. microphysics_seifert ) )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                                 'res cloud_scheme = kessler or seifert_beheng'
-                CALL message( 'check_parameters', 'PA0112', 1, 2, 0, 6, 0 )
-             ENDIF
-             IF ( TRIM( var ) == 'pra*'  .AND.  j == 1 )  THEN
-                message_string = 'temporal averaging of precipitation ' //     &
-                          'amount "' // TRIM( var ) // '" is not possible'
-                CALL message( 'check_parameters', 'PA0113', 1, 2, 0, 6, 0 )
-             ENDIF
-             IF ( TRIM( var ) == 'prr*'  .AND.                                 &
-                  .NOT. ( microphysics_kessler .OR. microphysics_seifert ) )  THEN
-                message_string = 'output of "' // TRIM( var ) // '" requi' //  &
-                                 'res cloud_scheme = kessler or seifert_beheng'
-                CALL message( 'check_parameters', 'PA0112', 1, 2, 0, 6, 0 )
              ENDIF
              IF ( TRIM( var ) == 'qsws*'  .AND.  .NOT.  humidity )  THEN
@@ -3460 +3259 @@
              IF ( TRIM( var ) == 'lwp*'   )  unit = 'kg/m2'
              IF ( TRIM( var ) == 'ol*'    )  unit = 'm'
-             IF ( TRIM( var ) == 'pra*'   )  unit = 'mm'
-             IF ( TRIM( var ) == 'prr*'   )  unit = 'mm/s'
              IF ( TRIM( var ) == 'qsws*'  )  unit = 'kgm/kgs'
              IF ( TRIM( var ) == 'r_a*'   )  unit = 's/m'     
@@ -3483 +3280 @@
 
              CALL tcm_check_data_output ( var, unit )
+
+!
+!--          Block of microphysics module outputs
+             IF ( unit == 'illegal'  .AND.  bulk_cloud_model  )  THEN
+                CALL bcm_check_data_output ( var, unit )
+             ENDIF
 
              IF ( unit == 'illegal' )  THEN

palm/trunk/SOURCE/chem_photolysis_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables commented
 ! 
@@ -50 +53 @@
         ONLY:  dzw, hyp, pt, q, ql, zu, zw
 
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
 
@@ -68 +71 @@
     USE control_parameters,                                                    &
         ONLY:  initializing_actions           
-!       ONLY:  cloud_droplets, cloud_physics, g, initializing_actions,         &
+!       ONLY:  cloud_droplets, initializing_actions,                           &
 !              large_scale_forcing, lsf_surf, phi, pt_surface, rho_surface,    &
 !              surface_pressure, time_since_reference_point
@@ -271 +274 @@
 !      INTEGER(iwp) :: i, j, k   !< loop indices
        INTEGER(iwp) :: iphot,iav !< loop indix for photolysis reaction
-!      REAL(wp)     :: exn,   &  !< Exner functions at surface
+!      REAL(wp)     :: exn,   &  !< Exner functions at surface (better use palms own exner array in arrays_3d)
 !                      pt1       !< potential temperature at first grid level
 
@@ -304 +307 @@
 !      INTEGER(iwp) :: i, j, k   !< loop indices
        INTEGER(iwp) :: iphot,iav !< loop indix for photolysis reaction
-!      REAL(wp)     :: exn,   &  !< Exner functions at surface
+!      REAL(wp)     :: exn,   &  !< Exner functions at surface (better use palms own exner array in arrays_3d)
 !                      pt1       !< potential temperature at first grid level
        REAL(wp)     :: coszi     !< 1./cosine of zenith angle

palm/trunk/SOURCE/chemistry_model_mod.f90

@@ -27 +27 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -144 +147 @@
                                  intermediate_timestep_count_max,              &
                                  timestep_scheme, use_prescribed_profile_data  
-   USE arrays_3d,          ONLY: hyp, pt, rdf_sc, tend, zu                     
+   USE arrays_3d,          ONLY: hyp, pt, rdf_sc, tend, zu, exner
    USE chem_gasphase_mod,  ONLY: nspec, spc_names, nkppctrl, nmaxfixsteps,     &
                                  t_steps, fill_temp, chem_gasphase_integrate,  &
@@ -939 +942 @@
     IF (chem_gasphase_on) THEN
 
-       tmp_temp(:) = pt(:,j,i) * ( hyp(nzb+1:nzt) / 100000.0_wp )**0.286_wp
+       tmp_temp(:) = pt(:,j,i) * exner(nzb+1:nzt)
 ! ppm to molecules/cm**3
 !      tmp_fact = 1.e-6_wp*6.022e23_wp/(22.414_wp*1000._wp) * 273.15_wp * hyp(nzb+1:nzt)/( 101300.0_wp * tmp_temp )

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

palm/trunk/SOURCE/data_output_2d.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -237 +240 @@
                precipitation_amount, prr, q, qc, ql, ql_c, ql_v, qr,           &
                rho_ocean, s, sa, tend, u, v, vpt, w, zu, zw,                   &
-               waterflux_output_conversion
-        
+               waterflux_output_conversion, hyrho, d_exner
+
     USE averaging
-        
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, hyrho, l_d_cp, l_v, pt_d_t
-               
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, lv_d_cp, l_v
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_data_output_2d
+
     USE control_parameters,                                                    &
-        ONLY:  cloud_physics, data_output_2d_on_each_pe, data_output_xy,       &
+        ONLY:  data_output_2d_on_each_pe, data_output_xy,                      &
                data_output_xz, data_output_yz, do2d,                           &
                do2d_xy_last_time, do2d_xy_time_count,                          &
@@ -254 +260 @@
                psolver, section, simulated_time,                               &
                time_since_reference_point, uv_exposure
-        
+
     USE cpulog,                                                                &
         ONLY:  cpu_log, log_point 
-        
+
     USE gust_mod,                                                              &
         ONLY:  gust_data_output_2d, gust_module_enabled
-        
+
     USE indices,                                                               &
         ONLY:  nbgp, nx, nxl, nxlg, nxr, nxrg, ny, nyn, nyng, nys, nysg,       &
                nzb, nzt, wall_flags_0
-               
+
     USE kinds
-    
+
     USE land_surface_model_mod,                                                &
         ONLY:  lsm_data_output_2d, zs
-    
+
 #if defined( __netcdf )
     USE NETCDF
@@ -579 +585 @@
                 level_z(nzb+1) = zu(nzb+1)
 
-             CASE ( 'nc_xy', 'nc_xz', 'nc_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => nc
-                ELSE
-                   IF ( .NOT. ALLOCATED( nc_av ) ) THEN
-                      ALLOCATE( nc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                      nc_av = REAL( fill_value, KIND = wp )
-                   ENDIF
-                   to_be_resorted => nc_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
-             CASE ( 'nr_xy', 'nr_xz', 'nr_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => nr
-                ELSE
-                   IF ( .NOT. ALLOCATED( nr_av ) ) THEN
-                      ALLOCATE( nr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                      nr_av = REAL( fill_value, KIND = wp )
-                   ENDIF
-                   to_be_resorted => nr_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
              CASE ( 'ghf*_xy' )        ! 2d-array
                 IF ( av == 0 )  THEN
@@ -756 +738 @@
                 ENDIF
 
-             CASE ( 'pra*_xy' )        ! 2d-array / integral quantity => no av
-!                CALL exchange_horiz_2d( precipitation_amount )
-                   DO  i = nxl, nxr
-                      DO  j = nys, nyn
-                      local_pf(i,j,nzb+1) =  precipitation_amount(j,i)
-                   ENDDO
-                ENDDO
-                precipitation_amount = 0.0_wp   ! reset for next integ. interval
-                resorted = .TRUE.
-                two_d = .TRUE.
-                level_z(nzb+1) = zu(nzb+1)
-
-             CASE ( 'prr_xy', 'prr_xz', 'prr_yz' )
-                IF ( av == 0 )  THEN
-!                   CALL exchange_horiz( prr, nbgp )
-                   DO  i = nxl, nxr
-                      DO  j = nys, nyn
-                         DO  k = nzb, nzt+1
-                            local_pf(i,j,k) = prr(k,j,i) * hyrho(nzb+1)
-                         ENDDO
-                      ENDDO
-                   ENDDO
-                ELSE
-                   IF ( .NOT. ALLOCATED( prr_av ) ) THEN
-                      ALLOCATE( prr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                      prr_av = REAL( fill_value, KIND = wp )
-                   ENDIF
-!                   CALL exchange_horiz( prr_av, nbgp )
-                   DO  i = nxl, nxr
-                      DO  j = nys, nyn
-                         DO  k = nzb, nzt+1
-                            local_pf(i,j,k) = prr_av(k,j,i) * hyrho(nzb+1)
-                         ENDDO
-                      ENDDO
-                   ENDDO
-                ENDIF
-                resorted = .TRUE.
-                IF ( mode == 'xy' )  level_z = zu
-
              CASE ( 'pt_xy', 'pt_xz', 'pt_yz' )
                 IF ( av == 0 )  THEN
-                   IF ( .NOT. cloud_physics ) THEN
+                   IF ( .NOT. bulk_cloud_model ) THEN
                       to_be_resorted => pt
                    ELSE
@@ -803 +746 @@
                       DO  j = nys, nyn
                             DO  k = nzb, nzt+1
-                               local_pf(i,j,k) = pt(k,j,i) + l_d_cp *          &
-                                                             pt_d_t(k) *       &
+                               local_pf(i,j,k) = pt(k,j,i) + lv_d_cp *         &
+                                                             d_exner(k) *      &
                                                              ql(k,j,i)
                             ENDDO
@@ -829 +772 @@
                    ENDIF
                    to_be_resorted => q_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
-             CASE ( 'qc_xy', 'qc_xz', 'qc_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => qc
-                ELSE
-                   IF ( .NOT. ALLOCATED( qc_av ) ) THEN
-                      ALLOCATE( qc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                      qc_av = REAL( fill_value, KIND = wp )
-                   ENDIF
-                   to_be_resorted => qc_av
                 ENDIF
                 IF ( mode == 'xy' )  level_z = zu
@@ -921 +852 @@
                 IF ( mode == 'xy' )  level_z = zu
 
-             CASE ( 'qr_xy', 'qr_xz', 'qr_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => qr
-                ELSE
-                   IF ( .NOT. ALLOCATED( qr_av ) ) THEN
-                      ALLOCATE( qr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                      qr_av = REAL( fill_value, KIND = wp )
-                   ENDIF
-                   to_be_resorted => qr_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
              CASE ( 'qsws*_xy' )        ! 2d-array
                 IF ( av == 0 ) THEN
@@ -1071 +990 @@
                       j = surf_lsm_h%j(m)
                       k = surf_lsm_h%k(m)
-                      local_pf(i,j,nzb+1) = surf_lsm_h%shf(m) * cp
+                      local_pf(i,j,nzb+1) = surf_lsm_h%shf(m) * c_p
                    ENDDO
                    DO  m = 1, surf_usm_h%ns
@@ -1077 +996 @@
                       j = surf_usm_h%j(m)
                       k = surf_usm_h%k(m)
-                      local_pf(i,j,nzb+1) = surf_usm_h%shf(m) * cp
+                      local_pf(i,j,nzb+1) = surf_usm_h%shf(m) * c_p
                    ENDDO
                 ELSE
@@ -1387 +1306 @@
 
 !
-!--             Land surface model quantity
-                IF ( land_surface )  THEN
-                   CALL lsm_data_output_2d( av, do2d(av,if), found, grid, mode,&
-                                            local_pf, two_d, nzb_do, nzt_do )
-                ENDIF
-
-!
 !--             Turbulence closure variables
                 IF ( .NOT. found )  THEN
                    CALL tcm_data_output_2d( av, do2d(av,if), found, grid, mode,&
                                              local_pf, nzb_do, nzt_do )
+                ENDIF
+
+!
+!--             Microphysics module quantities
+                IF ( .NOT. found  .AND.  bulk_cloud_model )  THEN
+                   CALL bcm_data_output_2d( av, do2d(av,if), found, grid, mode,&
+                                            local_pf, two_d, nzb_do, nzt_do )
+                ENDIF
+
+!
+!--             Land surface model quantity
+                IF ( .NOT. found  .AND.  land_surface )  THEN
+                   CALL lsm_data_output_2d( av, do2d(av,if), found, grid, mode,&
+                                            local_pf, two_d, nzb_do, nzt_do )
                 ENDIF
 
@@ -1417 +1343 @@
 !
 !--             UV exposure model quantity
-                IF ( uv_exposure )  THEN
+                IF ( .NOT. found  .AND.  uv_exposure )  THEN
                    CALL uvem_data_output_2d( av, do2d(av,if), found, grid,     &
                                              local_pf, two_d, nzb_do, nzt_do )

palm/trunk/SOURCE/data_output_3d.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables and format statements removed
 ! 
@@ -206 +209 @@
     USE arrays_3d,                                                             &
         ONLY:  e, nc, nr, p, pt, prr, q, qc, ql, ql_c, ql_v, qr, rho_ocean, s, &
-               sa, tend, u, v, vpt, w
-        
+               sa, tend, u, v, vpt, w, d_exner
+
     USE averaging
-        
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  lv_d_cp
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_data_output_3d
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_data_output_3d
 
-    USE cloud_parameters,                                                      &
-        ONLY:  l_d_cp, pt_d_t
-        
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, cloud_physics, do3d, do3d_no, do3d_time_count,   &
+        ONLY:  air_chemistry, do3d, do3d_no, do3d_time_count,                  &
                io_blocks, io_group, land_surface, message_string,              &
                ntdim_3d, nz_do3d,  plant_canopy,                               &
                psolver, simulated_time, time_since_reference_point,            &
                urban_surface, varnamelength
-        
+
     USE cpulog,                                                                &
         ONLY:  log_point, cpu_log
@@ -228 +234 @@
     USE gust_mod,                                                              &
         ONLY: gust_data_output_3d, gust_module_enabled
-        
+
     USE indices,                                                               &
         ONLY:  nbgp, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt,     &
                wall_flags_0
-        
+
     USE kinds
-    
+
     USE land_surface_model_mod,                                                &
         ONLY: lsm_data_output_3d, nzb_soil, nzt_soil
@@ -399 +405 @@
                 ENDIF
                 to_be_resorted => lpt_av
-             ENDIF
-
-          CASE ( 'nc' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => nc
-             ELSE
-                IF ( .NOT. ALLOCATED( nc_av ) ) THEN
-                   ALLOCATE( nc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   nc_av = REAL( fill_value, KIND = wp )
-                ENDIF
-                to_be_resorted => nc_av
-             ENDIF
-
-          CASE ( 'nr' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => nr
-             ELSE
-                IF ( .NOT. ALLOCATED( nr_av ) ) THEN
-                   ALLOCATE( nr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   nr_av = REAL( fill_value, KIND = wp )
-                ENDIF
-                to_be_resorted => nr_av
              ENDIF
 
@@ -506 +490 @@
              ENDIF
 
-          CASE ( 'prr' )
-             IF ( av == 0 )  THEN
-                DO  i = nxl, nxr
-                   DO  j = nys, nyn
-                      DO  k = nzb_do, nzt_do
-                         local_pf(i,j,k) = prr(k,j,i)
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ELSE
-                IF ( .NOT. ALLOCATED( prr_av ) ) THEN
-                   ALLOCATE( prr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   prr_av = REAL( fill_value, KIND = wp )
-                ENDIF
-                DO  i = nxl, nxr
-                   DO  j = nys, nyn
-                      DO  k = nzb_do, nzt_do
-                         local_pf(i,j,k) = prr_av(k,j,i)
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-             resorted = .TRUE.
-
           CASE ( 'pt' )
              IF ( av == 0 )  THEN
-                IF ( .NOT. cloud_physics ) THEN
+                IF ( .NOT. bulk_cloud_model ) THEN
                    to_be_resorted => pt
                 ELSE
@@ -538 +498 @@
                       DO  j = nys, nyn
                          DO  k = nzb_do, nzt_do
-                            local_pf(i,j,k) = pt(k,j,i) + l_d_cp *             &
-                                                          pt_d_t(k) *          &
+                            local_pf(i,j,k) = pt(k,j,i) + lv_d_cp *            &
+                                                          d_exner(k) *         &
                                                           ql(k,j,i)
                          ENDDO
@@ -563 +523 @@
                 ENDIF
                 to_be_resorted => q_av
-             ENDIF
-
-          CASE ( 'qc' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => qc
-             ELSE
-                IF ( .NOT. ALLOCATED( qc_av ) ) THEN
-                   ALLOCATE( qc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   qc_av = REAL( fill_value, KIND = wp )
-                ENDIF
-                to_be_resorted => qc_av
              ENDIF
 
@@ -647 +596 @@
              ENDIF
 
-          CASE ( 'qr' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => qr
-             ELSE
-                IF ( .NOT. ALLOCATED( qr_av ) ) THEN
-                   ALLOCATE( qr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   qr_av = REAL( fill_value, KIND = wp )
-                ENDIF
-                to_be_resorted => qr_av
-             ENDIF
-
           CASE ( 'qv' )
              IF ( av == 0 )  THEN
@@ -758 +696 @@
 !--       Block of urban surface model outputs   
           CASE ( 'usm_output' )
-             CALL usm_data_output_3d( av, do3d(av,if), found, local_pf,     &
+             CALL usm_data_output_3d( av, do3d(av,if), found, local_pf,        &
                                          nzb_do, nzt_do )
 
           CASE DEFAULT
 
+             IF ( .NOT. found )  THEN
+                CALL tcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
+                                         nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
+
+!
+!--          Microphysic module quantities
+             IF ( .NOT. found  .AND.  bulk_cloud_model )  THEN
+                CALL bcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
+                                         nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
+
 !
 !--          Land surface quantity
-             IF ( land_surface )  THEN
+             IF ( .NOT. found  .AND.  land_surface )  THEN
 !
 !--             For soil model quantities, it is required to re-allocate local_pf
@@ -788 +740 @@
                 ENDIF
 
-             ENDIF
-
-             IF ( .NOT. found )  THEN
-                CALL tcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
-                                         nzb_do, nzt_do )
-                resorted = .TRUE.
              ENDIF
 

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) //    &

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

palm/trunk/SOURCE/data_output_spectra.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -238 +241 @@
 #if defined( __netcdf )
 
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
 

palm/trunk/SOURCE/flow_statistics.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -283 +286 @@
                momentumflux_output_conversion, nc, nr, p, prho, prr, pt, q,    &
                qc, ql, qr, rho_air, rho_air_zw, rho_ocean, s,                  &
-               sa, u, ug, v, vg, vpt, w, w_subs, waterflux_output_conversion, zw
+               sa, u, ug, v, vg, vpt, w, w_subs, waterflux_output_conversion,  &
+               zw, d_exner
         
-    USE cloud_parameters,                                                      &
-        ONLY:   l_d_cp, pt_d_t
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:   g, lv_d_cp
         
     USE control_parameters,                                                    &
-        ONLY:   average_count_pr, cloud_droplets, cloud_physics, do_sum,       &
-                dt_3d, g, humidity, initializing_actions, land_surface,        &
+        ONLY:   average_count_pr, cloud_droplets, do_sum,                      &
+                dt_3d, humidity, initializing_actions, land_surface,           &
                 large_scale_forcing, large_scale_subsidence, max_pr_user,      &
-                message_string, neutral, microphysics_morrison,                &
-                microphysics_seifert, ocean, passive_scalar, simulated_time,   &
-                simulated_time_at_begin, use_subsidence_tendencies,            & 
+                message_string, neutral, ocean, passive_scalar, simulated_time,&
+                simulated_time_at_begin, use_subsidence_tendencies,            &
                 use_surface_fluxes, use_top_fluxes, ws_scheme_mom,             &
                 ws_scheme_sca
@@ -313 +316 @@
         
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
     
     USE land_surface_model_mod,                                                &
@@ -515 +521 @@
              ENDDO
           ENDDO
-          IF ( cloud_physics )  THEN
+          IF ( bulk_cloud_model )  THEN
              !$OMP DO
              DO  i = nxl, nxr
@@ -525 +531 @@
                                                                * flag
                       sums_l(k,43,tn) = sums_l(k,43,tn) + (                    &
-                                      pt(k,j,i) + l_d_cp*pt_d_t(k) * ql(k,j,i) &
+                                      pt(k,j,i) + lv_d_cp * d_exner(k) * ql(k,j,i) &
                                                           ) * rmask(j,i,sr)    &
                                                             * flag
@@ -563 +569 @@
                 sums_l(:,41,0) = sums_l(:,41,0) + sums_l(:,41,i)
                 sums_l(:,44,0) = sums_l(:,44,0) + sums_l(:,44,i)
-                IF ( cloud_physics )  THEN
+                IF ( bulk_cloud_model )  THEN
                    sums_l(:,42,0) = sums_l(:,42,0) + sums_l(:,42,i)
                    sums_l(:,43,0) = sums_l(:,43,0) + sums_l(:,43,i)
@@ -598 +604 @@
           CALL MPI_ALLREDUCE( sums_l(nzb,41,0), sums(nzb,41), nzt+2-nzb,       &
                               MPI_REAL, MPI_SUM, comm2d, ierr )
-          IF ( cloud_physics ) THEN
+          IF ( bulk_cloud_model ) THEN
              IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
              CALL MPI_ALLREDUCE( sums_l(nzb,42,0), sums(nzb,42), nzt+2-nzb,    &
@@ -621 +627 @@
           sums(:,44) = sums_l(:,44,0)
           sums(:,41) = sums_l(:,41,0)
-          IF ( cloud_physics ) THEN
+          IF ( bulk_cloud_model ) THEN
              sums(:,42) = sums_l(:,42,0)
              sums(:,43) = sums_l(:,43,0)
@@ -654 +660 @@
           hom(:,1,44,sr) = sums(:,44)             ! vpt
           hom(:,1,41,sr) = sums(:,41)             ! qv (q)
-          IF ( cloud_physics ) THEN
+          IF ( bulk_cloud_model ) THEN
              sums(:,42) = sums(:,42) / ngp_2dh_s_inner(:,sr)
              sums(:,43) = sums(:,43) / ngp_2dh_s_inner(:,sr)
@@ -948 +954 @@
                                                * ddzu(k+1) * rmask(j,i,sr) * flag
 
-                   IF ( cloud_physics ) THEN
+                   IF ( bulk_cloud_model ) THEN
                       sums_l(k,51,tn) = sums_l(k,51,tn)                        &
                                          - 0.5_wp * ( kh(k,j,i) + kh(k+1,j,i) )&
@@ -1014 +1020 @@
                                           * heatflux_output_conversion(k+ki)
                             ENDIF
-                            IF ( cloud_physics )  THEN
+                            IF ( bulk_cloud_model )  THEN
 !
 !--                            Formula does not work if ql(k+ki) /= 0.0
@@ -1067 +1073 @@
                                           * heatflux_output_conversion(nzb)
                       ENDIF
-                      IF ( cloud_physics )  THEN
+                      IF ( bulk_cloud_model )  THEN
 !
 !--                      Formula does not work if ql(nzb) /= 0.0
@@ -1118 +1124 @@
                                           * heatflux_output_conversion(nzb)
                       ENDIF
-                      IF ( cloud_physics )  THEN
+                      IF ( bulk_cloud_model )  THEN
 !
 !--                      Formula does not work if ql(nzb) /= 0.0
@@ -1293 +1299 @@
                                            * heatflux_output_conversion(nzt)
                    ENDIF
-                   IF ( cloud_physics )  THEN
+                   IF ( bulk_cloud_model )  THEN
 !
 !--                   Formula does not work if ql(nzb) /= 0.0
@@ -1347 +1353 @@
 !--             content, rain drop concentration and rain water content
                 IF ( humidity )  THEN
-                   IF ( cloud_physics .OR. cloud_droplets )  THEN
+                   IF ( bulk_cloud_model .OR. cloud_droplets )  THEN
                       pts = 0.5_wp * ( vpt(k,j,i)   - hom(k,1,44,sr) +         &
                                     vpt(k+1,j,i) - hom(k+1,1,44,sr) )

palm/trunk/SOURCE/header.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -378 +381 @@
     USE arrays_3d,                                                             &
         ONLY:  pt_init, q_init, s_init, sa_init, ug, vg, w_subs, zu, zw
-        
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g, kappa, l_v, r_d
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_header
+
     USE control_parameters
-        
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, l_v, r_d
 
     USE cpulog,                                                                &
@@ -413 +419 @@
     USE lsf_nudging_mod,                                                       &
         ONLY:  lsf_nudging_header
-
-    USE microphysics_mod,                                                      &
-        ONLY:  cloud_water_sedimentation, collision_turbulence,                &
-               c_sedimentation, limiter_sedimentation, nc_const,               &
-               ventilation_effect
 
     USE model_1d_mod,                                                          &
@@ -742 +743 @@
     IF ( neutral )  WRITE ( io, 131 )  pt_surface
     IF ( humidity )  THEN
-       IF ( .NOT. cloud_physics )  THEN
+       IF ( .NOT. bulk_cloud_model )  THEN
           WRITE ( io, 129 )
        ELSE
@@ -1902 +1903 @@
 
 !
-!-- Cloud physics parameters
-    IF ( cloud_physics )  THEN
-       WRITE ( io, 415 )
-       WRITE ( io, 416 ) surface_pressure, r_d, rho_surface, cp, l_v
-       IF ( microphysics_seifert )  THEN
-          WRITE ( io, 510 ) 1.0E-6_wp * nc_const
-          WRITE ( io, 511 ) c_sedimentation
-       ENDIF
-    ENDIF
+!-- Output of microphysics information
+    IF ( bulk_cloud_model )  CALL bcm_header( io )
 
 !
 !-- Cloud physcis parameters / quantities / numerical methods
     WRITE ( io, 430 )
-    IF ( humidity .AND. .NOT. cloud_physics .AND. .NOT. cloud_droplets)  THEN
+    IF ( humidity .AND. .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets)  THEN
        WRITE ( io, 431 )
-    ELSEIF ( humidity  .AND.  cloud_physics )  THEN
-       WRITE ( io, 432 )
-       IF ( cloud_top_radiation )  WRITE ( io, 132 )
-       IF ( microphysics_kessler )  THEN
-          WRITE ( io, 133 )
-       ELSEIF ( microphysics_seifert )  THEN
-          IF ( cloud_water_sedimentation )  WRITE ( io, 506 )
-          WRITE ( io, 505 )
-          IF ( collision_turbulence )  WRITE ( io, 507 )
-          IF ( ventilation_effect )  WRITE ( io, 508 )
-          IF ( limiter_sedimentation )  WRITE ( io, 509 )
-       ENDIF
-    ELSEIF ( humidity  .AND.  cloud_droplets )  THEN
+    ENDIF
+    IF ( cloud_top_radiation )  WRITE ( io, 132 )
+    IF ( humidity  .AND.  cloud_droplets )  THEN
        WRITE ( io, 433 )
        IF ( curvature_solution_effects )  WRITE ( io, 434 )
@@ -2105 +2089 @@
 132 FORMAT ('     Parameterization of long-wave radiation processes via'/ &
             '     effective emissivity scheme')
-133 FORMAT ('     Precipitation parameterization via Kessler-Scheme')
 134 FORMAT (' --> Additional prognostic equation for a passive scalar')
 135 FORMAT (' --> Solve perturbation pressure via ',A,' method (', &
@@ -2327 +2310 @@
 413 FORMAT ('       Reference density in buoyancy terms: ',F8.3,' kg/m**3')
 414 FORMAT ('       Reference temperature in buoyancy terms: ',F8.4,' K')
-415 FORMAT (/' Cloud physics parameters:'/ &
-             ' ------------------------'/)
-416 FORMAT ('    Surface pressure   :   p_0   = ',F7.2,' hPa'/      &
-            '    Gas constant       :   R     = ',F5.1,' J/(kg K)'/ &
-            '    Density of air     :   rho_0 =',F6.3,' kg/m**3'/  &
-            '    Specific heat cap. :   c_p   = ',F6.1,' J/(kg K)'/ &
-            '    Vapourization heat :   L_v   =',E9.2,' J/kg')
 420 FORMAT (/'    Characteristic levels of the initial temperature profile:'// &
             '       Height:        ',A,'  m'/ &
@@ -2376 +2352 @@
               ' ----------------------------------'/)
 431 FORMAT ('    Humidity is considered, bu no condensation')
-432 FORMAT ('    Bulk scheme with liquid water potential temperature and'/ &
-            '    total water content is used.'/ &
-            '    Condensation is parameterized via 0% - or 100% scheme.')
 433 FORMAT ('    Cloud droplets treated explicitly using the Lagrangian part', &
                  'icle model')
@@ -2473 +2446 @@
 503 FORMAT (' --> Momentum advection via Wicker-Skamarock-Scheme 5th order')
 504 FORMAT (' --> Scalar advection via Wicker-Skamarock-Scheme 5th order')
-505 FORMAT ('    Precipitation parameterization via Seifert-Beheng-Scheme')
-506 FORMAT ('    Cloud water sedimentation parameterization via Stokes law')
-507 FORMAT ('    Turbulence effects on precipitation process')
-508 FORMAT ('    Ventilation effects on evaporation of rain drops')
-509 FORMAT ('    Slope limiter used for sedimentation process')
-510 FORMAT ('    Droplet density    :   N_c   = ',F6.1,' 1/cm**3')
-511 FORMAT ('    Sedimentation Courant number:                  '/&
-            '                               C_s   =',F4.1,'        ')
 512 FORMAT (/' Date:                 ',A8,6X,'Run:       ',A34/      &
             ' Time:                 ',A8,6X,'Run-No.:   ',I2.2/     &

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -255 +258 @@
 ! precipitation_amount, precipitation_rate, prr moved to arrays_3d.
 ! Initialization of nc_1d, nr_1d, pt_1d, qc_1d, qr_1d, q_1d moved to
-! microphysics_init.
+! bcm_init.
 !
 ! 1845 2016-04-08 08:29:13Z raasch
@@ -498 +501 @@
     USE arrays_3d
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, g, l_v, pi, r_d, exner_function, exner_function_invers,    &
+               ideal_gas_law_rho, ideal_gas_law_rho_pt, barometric_formula
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_init, bcm_init_arrays
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_emissions
 
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, l_v, r_d
-
-    USE constants,                                                             &
-        ONLY:  pi
-    
     USE control_parameters
     
@@ -530 +534 @@
     USE lsf_nudging_mod,                                                       &
         ONLY:  lsf_init, ls_forcing_surf, nudge_init
-
-    USE microphysics_mod,                                                      &
-        ONLY:  microphysics_init
 
     USE model_1d_mod,                                                          &
@@ -738 +739 @@
 #endif
 
-       IF ( cloud_physics )  THEN
-!
-!--          Liquid water content
-#if defined( __nopointer )
-          ALLOCATE ( ql(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#else
-          ALLOCATE ( ql_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#endif
-
-!
-!--       3D-cloud water content
-          IF ( .NOT. microphysics_morrison )  THEN
-#if defined( __nopointer )
-             ALLOCATE( qc(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#else
-             ALLOCATE( qc_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#endif
-          ENDIF
-!
-!--       Precipitation amount and rate (only needed if output is switched)
-          ALLOCATE( precipitation_amount(nysg:nyng,nxlg:nxrg) )
-
-!
-!--       3d-precipitation rate
-          ALLOCATE( prr(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-
-          IF ( microphysics_morrison )  THEN
-!
-!--          3D-cloud drop water content, cloud drop concentration arrays
-#if defined( __nopointer )
-             ALLOCATE( nc(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
-                       nc_p(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qc(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
-                       qc_p(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       tnc_m(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                   & 
-                       tqc_m(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#else
-             ALLOCATE( nc_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       nc_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       nc_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qc_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qc_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qc_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#endif
-          ENDIF
-
-          IF ( microphysics_seifert )  THEN
-!
-!--          3D-rain water content, rain drop concentration arrays
-#if defined( __nopointer )
-             ALLOCATE( nr(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
-                       nr_p(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qr(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                      &
-                       qr_p(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       tnr_m(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                   &
-                       tqr_m(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#else
-             ALLOCATE( nr_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       nr_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       nr_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qr_1(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qr_2(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                    &
-                       qr_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-#endif
-          ENDIF
-
-       ENDIF
-
        IF ( cloud_droplets )  THEN
 !
@@ -868 +801 @@
 !
 !-- Density profile calculation for anelastic approximation
-    t_surface = pt_surface * ( surface_pressure / 1000.0_wp )**( r_d / cp )
+    t_surface = pt_surface * ( surface_pressure / 1000.0_wp )**( r_d / c_p )
     IF ( TRIM( approximation ) == 'anelastic' ) THEN
        DO  k = nzb, nzt+1
           p_hydrostatic(k)    = surface_pressure * 100.0_wp *                  &
-                                ( 1 - ( g * zu(k) ) / ( cp * t_surface )       &
-                                )**( cp / r_d )
+                                ( 1 - ( g * zu(k) ) / ( c_p * t_surface )      &
+                                )**( c_p / r_d )
           rho_air(k)          = ( p_hydrostatic(k) *                           &
                                   ( 100000.0_wp / p_hydrostatic(k)             &
-                                  )**( r_d / cp )                              &
+                                  )**( r_d / c_p )                             &
                                 ) / ( r_d * pt_init(k) )
        ENDDO
@@ -887 +820 @@
        DO  k = nzb, nzt+1
           p_hydrostatic(k)    = surface_pressure * 100.0_wp *                  &
-                                ( 1 - ( g * zu(nzb) ) / ( cp * t_surface )       &
-                                )**( cp / r_d )
+                                ( 1 - ( g * zu(nzb) ) / ( c_p * t_surface )    &
+                                )**( c_p / r_d )
           rho_air(k)          = ( p_hydrostatic(k) *                           &
                                   ( 100000.0_wp / p_hydrostatic(k)             &
-                                  )**( r_d / cp )                              &
+                                  )**( r_d / c_p )                             &
                                 ) / ( r_d * pt_init(nzb) )
        ENDDO
@@ -923 +856 @@
             momentumflux_input_conversion(k)  = rho_air_zw(k)
         ELSEIF ( TRIM( flux_input_mode ) == 'dynamic' ) THEN
-            heatflux_input_conversion(k)      = 1.0_wp / cp
+            heatflux_input_conversion(k)      = 1.0_wp / c_p
             waterflux_input_conversion(k)     = 1.0_wp / l_v
             momentumflux_input_conversion(k)  = 1.0_wp
@@ -933 +866 @@
             momentumflux_output_conversion(k) = drho_air_zw(k)
         ELSEIF ( TRIM( flux_output_mode ) == 'dynamic' ) THEN
-            heatflux_output_conversion(k)     = cp
+            heatflux_output_conversion(k)     = c_p
             waterflux_output_conversion(k)    = l_v
             momentumflux_output_conversion(k) = 1.0_wp
@@ -1065 +998 @@
     IF ( humidity )  THEN
        q => q_1;  q_p => q_2;  tq_m => q_3
-       IF ( humidity )  THEN
-          vpt  => vpt_1    
-          IF ( cloud_physics )  THEN
-             ql => ql_1
-             IF ( .NOT. microphysics_morrison )  THEN
-                qc => qc_1
-             ENDIF
-             IF ( microphysics_morrison )  THEN
-                qc => qc_1;  qc_p  => qc_2;  tqc_m  => qc_3
-                nc => nc_1;  nc_p  => nc_2;  tnc_m  => nc_3
-             ENDIF
-             IF ( microphysics_seifert )  THEN
-                qr => qr_1;  qr_p  => qr_2;  tqr_m  => qr_3
-                nr => nr_1;  nr_p  => nr_2;  tnr_m  => nr_3
-             ENDIF
-          ENDIF
-       ENDIF
+       vpt  => vpt_1
        IF ( cloud_droplets )  THEN
           ql   => ql_1
@@ -1102 +1019 @@
 !-- Initialize surface arrays
     CALL init_surface_arrays
+!
+!-- Allocate microphysics module arrays
+    IF ( bulk_cloud_model )  THEN
+       CALL bcm_init_arrays
+    ENDIF
 !
 !-- Allocate land surface model arrays
@@ -1297 +1219 @@
 !--       Set inital w to 0
           w = 0.0_wp
-!
-!--       Initialize the remaining quantities
-          IF ( humidity )  THEN
-             IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      qc(:,j,i) = 0.0_wp
-                      nc(:,j,i) = 0.0_wp
-                   ENDDO
-                ENDDO
-             ENDIF
-
-             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      qr(:,j,i) = 0.0_wp
-                      nr(:,j,i) = 0.0_wp
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          ENDIF
 
           IF ( passive_scalar )  THEN
@@ -1376 +1276 @@
                 ENDDO
              ENDDO
-             IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      qc(:,j,i) = 0.0_wp
-                      nc(:,j,i) = 0.0_wp
-                   ENDDO
-                ENDDO
-             ENDIF
-             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      qr(:,j,i) = 0.0_wp
-                      nr(:,j,i) = 0.0_wp
-                   ENDDO
-                ENDDO
-             ENDIF
           ENDIF
 
@@ -1485 +1369 @@
                 ENDDO
              ENDDO
-             IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      qc(:,j,i) = 0.0_wp
-                      nc(:,j,i) = 0.0_wp
-                   ENDDO
-                ENDDO
-             ENDIF
-
-             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      qr(:,j,i) = 0.0_wp
-                      nr(:,j,i) = 0.0_wp
-                   ENDDO
-                ENDDO
-             ENDIF
-
           ENDIF
           
@@ -1598 +1464 @@
 !--       Store initial profile of mixing ratio and potential
 !--       temperature
-          IF ( cloud_physics  .OR.  cloud_droplets ) THEN
+          IF ( bulk_cloud_model  .OR.  cloud_droplets ) THEN
              hom(:,1,27,:) = SPREAD(  q(:,nys,nxl), 2, statistic_regions+1 )
              hom(:,1,28,:) = SPREAD( pt(:,nys,nxl), 2, statistic_regions+1 )
@@ -1645 +1511 @@
 !--    In case of iterative solvers, p must get an initial value
        IF ( psolver(1:9) == 'multigrid'  .OR.  psolver == 'sor' )  p = 0.0_wp
-
-!
-!--    Treating cloud physics, liquid water content and precipitation amount
-!--    are zero at beginning of the simulation
-       IF ( cloud_physics )  THEN
-          ql = 0.0_wp
-          qc = 0.0_wp
-
-          precipitation_amount = 0.0_wp
-       ENDIF
 !
 !--    Impose vortex with vertical axis on the initial velocity profile
@@ -1693 +1549 @@
           tq_m = 0.0_wp
           q_p = q
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-             tqc_m = 0.0_wp
-             qc_p  = qc
-             tnc_m = 0.0_wp
-             nc_p  = nc
-          ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-             tqr_m = 0.0_wp
-             qr_p  = qr
-             tnr_m = 0.0_wp
-             nr_p  = nr
-          ENDIF
        ENDIF
        
@@ -1963 +1807 @@
        IF ( humidity )  THEN
           q_p = q
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-             qc_p = qc
-             nc_p = nc
-          ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-             qr_p = qr
-             nr_p = nr
-          ENDIF
        ENDIF
        IF ( passive_scalar )  s_p  = s
@@ -1982 +1818 @@
        IF ( humidity )  THEN
           tq_m = 0.0_wp
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-             tqc_m = 0.0_wp
-             tnc_m = 0.0_wp
-          ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-             tqr_m = 0.0_wp
-             tnr_m = 0.0_wp
-          ENDIF
        ENDIF
        IF ( passive_scalar )  ts_m  = 0.0_wp
@@ -2417 +2245 @@
        CALL init_ocean
 
-    ELSE
+    ENDIF
 !
 !--    Initialize quantities for handling cloud physics
 !--    This routine must be called before lpm_init, because
-!--    otherwise, array pt_d_t, needed in data_output_dvrp (called by
+!--    otherwise, array d_exner, needed in data_output_dvrp (called by
 !--    lpm_init) is not defined.
-       CALL init_cloud_physics
-!
-!--    Initialize bulk cloud microphysics
-       CALL microphysics_init
+    IF ( .NOT. ocean )  THEN
+
+       ALLOCATE( hyp(nzb:nzt+1) )
+       ALLOCATE( d_exner(nzb:nzt+1) )
+       ALLOCATE( exner(nzb:nzt+1) )
+       ALLOCATE( hyrho(nzb:nzt+1) )
+!
+!--    Check temperature in case of too large domain height
+       DO  k = nzb, nzt+1
+          IF ( ( pt_surface * exner_function(surface_pressure * 100.0_wp) - g/c_p * zu(k) ) < 0.0_wp )  THEN
+             WRITE( message_string, * )  'absolute temperature < 0.0 at zu(', k, &
+                                         ') = ', zu(k)
+             CALL message( 'init_bulk_cloud_model', 'PA0142', 1, 2, 0, 6, 0 )
+          ENDIF
+       ENDDO
+
+!
+!--    Calculate vertical profile of the hydrostatic pressure (hyp)
+       hyp    = barometric_formula(zu, pt_surface * exner_function(surface_pressure * 100.0_wp), surface_pressure * 100.0_wp)
+       d_exner = exner_function_invers(hyp)
+       exner = 1.0_wp / exner_function_invers(hyp)
+       hyrho  = ideal_gas_law_rho_pt(hyp, pt_init)
+!
+!--    Compute reference density
+       rho_surface = ideal_gas_law_rho(surface_pressure * 100.0_wp, pt_surface * exner_function(surface_pressure * 100.0_wp))
+
+    ENDIF
+!
+!-- If required, initialize quantities needed for the microphysics module
+    IF ( bulk_cloud_model )  THEN
+       CALL bcm_init
     ENDIF
 

palm/trunk/SOURCE/init_masks.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3065 2018-06-12 07:03:02Z Giersch
 ! dz_stretch_level was replaced by dz_stretch_level_start
 ! 
@@ -134 +137 @@
 
     USE control_parameters,                                                    &
-        ONLY:  constant_diffusion, cloud_droplets, cloud_physics,              &
+        ONLY:  constant_diffusion, cloud_droplets,                             &
                data_output_masks, data_output_masks_user,                      &
                doav, doav_n, domask, domask_no, dz, dz_stretch_level_start,    &
@@ -142 +145 @@
                mask_x_loop, mask_xyz_dimension, mask_y, mask_y_loop, mask_z,   &
                mask_z_loop, max_masks,  message_string, mid,                   &
-               microphysics_morrison, microphysics_seifert, passive_scalar,    &
-               ocean, varnamelength
-               
+               passive_scalar, ocean, varnamelength
+
 
     USE grid_variables,                                                        &
@@ -153 +155 @@
 
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
 
     USE netcdf_interface,                                                      &
@@ -309 +314 @@
 
              CASE ( 'lpt' )
-                IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
-                        '" requires cloud_physics = .TRUE.'
+                IF ( .NOT. bulk_cloud_model )  THEN
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
+                        '" requires bulk_cloud_model = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -317 +322 @@
 
              CASE ( 'nc' )
-                IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
-                        '" requires cloud_physics = .TRUE.'
+                IF ( .NOT. bulk_cloud_model )  THEN
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
+                        '" requires bulk_cloud_model = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
                  ELSEIF ( .NOT. microphysics_morrison ) THEN
@@ -329 +334 @@
 
              CASE ( 'nr' )
-                IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
-                        '" requires cloud_physics = .TRUE.'
+                IF ( .NOT. bulk_cloud_model )  THEN
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
+                        '" requires bulk_cloud_model = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
                  ELSEIF ( .NOT. microphysics_seifert ) THEN
@@ -360 +365 @@
 
              CASE ( 'qc' )
-                IF ( .NOT. cloud_physics )  THEN
+                IF ( .NOT. bulk_cloud_model )  THEN
                    message_string = 'output of "' // TRIM( var ) // '"' //     &
-                            'requires cloud_physics = .TRUE.'
+                            'requires bulk_cloud_model = .TRUE.'
                    CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -368 +373 @@
 
              CASE ( 'ql' )
-                IF ( .NOT. ( cloud_physics  .OR.  cloud_droplets ) )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
-                        '" requires cloud_physics = .TRUE. or cloud_droplets', &
-                        ' = .TRUE.'
+                IF ( .NOT. ( bulk_cloud_model  .OR.  cloud_droplets ) )  THEN
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
+                        '" requires bulk_cloud_model = .TRUE. or ',            &
+                        'cloud_droplets = .TRUE.'
                    CALL message( 'init_masks', 'PA0106', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -387 +392 @@
 
              CASE ( 'qv' )
-                IF ( .NOT. cloud_physics )  THEN
-                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
-                        '" requires cloud_physics = .TRUE.'
+                IF ( .NOT. bulk_cloud_model )  THEN
+                   WRITE ( message_string, * ) 'output of "', TRIM( var ),     &
+                        '" requires bulk_cloud_model = .TRUE.'
                    CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 )
                 ENDIF
@@ -395 +400 @@
 
              CASE ( 'qr' )
-                IF ( .NOT. cloud_physics )  THEN
+                IF ( .NOT. bulk_cloud_model )  THEN
                    message_string = 'output of "' // TRIM( var ) // '" ' //    &
-                            'requires cloud_physics = .TRUE.'
+                            'requires bulk_cloud_model = .TRUE.'
                    CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 )
                 ELSEIF ( .NOT. microphysics_seifert ) THEN

palm/trunk/SOURCE/init_ocean.f90

@@ -25 +25 @@
 ! ------------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3270 2018-09-24 06:28:20Z raasch
 ! bugfix for r2502: wrong calculation of hyp(nzt) in second iterative step
 ! 
@@ -90 +93 @@
         ONLY:  dzu, hyp, pt_init, ref_state, sa_init, zu, zw
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g
+
     USE control_parameters,                                                    &
-        ONLY:  g, molecular_viscosity, prho_reference, rho_surface,            &
+        ONLY:  molecular_viscosity, prho_reference, rho_surface,               &
                rho_reference, surface_pressure, use_single_reference_value
 

palm/trunk/SOURCE/init_rankine.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -73 +76 @@
         ONLY:  initializing_actions, n_sor, nsor, nsor_ini   
 
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
 

palm/trunk/SOURCE/init_slope.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -72 +75 @@
         ONLY:  pt, pt_init, pt_slope_ref, zu
         
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
                     

palm/trunk/SOURCE/interaction_droplets_ptq.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3040 2018-05-25 10:22:08Z schwenkel
 ! Changed the name specific humidity to mixing ratio
 ! 
@@ -74 +77 @@
 !
 ! 799 2011-12-21 17:48:03Z franke
-! Bugfix: pt_d_t(k) was missing in calculation of pt_p
+! Bugfix: d_exner(k) was missing in calculation of pt_p
 !
 ! RCS Log replace by Id keyword, revision history cleaned up
@@ -89 +92 @@
  MODULE interaction_droplets_ptq_mod
  
+
+    USE arrays_3d,                                                             &
+        ONLY:  pt_p, ql_c, q_p, d_exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  lv_d_cp
+
+    USE indices,                                                               &
+        ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
+
+    USE kinds
+
+    USE pegrid
 
     PRIVATE
@@ -111 +127 @@
     SUBROUTINE i_droplets_ptq
 
-       USE arrays_3d,                                                          &
-           ONLY:  pt_p, ql_c, q_p
-           
-       USE cloud_parameters,                                                   &
-           ONLY:  l_d_cp, pt_d_t
-           
-       USE indices,                                                            &
-           ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
-           
-       USE kinds
-
-       USE pegrid
-
        IMPLICIT NONE
 
@@ -140 +143 @@
 
                 q_p(k,j,i)  = q_p(k,j,i)  - ql_c(k,j,i) * flag
-                pt_p(k,j,i) = pt_p(k,j,i) + l_d_cp * ql_c(k,j,i) * pt_d_t(k)   &
+                pt_p(k,j,i) = pt_p(k,j,i) + lv_d_cp * ql_c(k,j,i) * d_exner(k) &
                                                         * flag
              ENDDO
@@ -155 +158 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE i_droplets_ptq_ij( i, j )
-
-       USE arrays_3d,                                                          &
-           ONLY:  pt_p, ql_c, q_p
-
-       USE cloud_parameters,                                                   &
-           ONLY:  l_d_cp, pt_d_t
-
-       USE indices,                                                            &
-           ONLY:  nzb, nzt, wall_flags_0
-
-       USE kinds,                                                              &
-           ONLY:  iwp, wp
-
-       USE pegrid
 
        IMPLICIT NONE
@@ -185 +174 @@
 
           q_p(k,j,i)  = q_p(k,j,i)  - ql_c(k,j,i) * flag
-          pt_p(k,j,i) = pt_p(k,j,i) + l_d_cp * ql_c(k,j,i) * pt_d_t(k) * flag
+          pt_p(k,j,i) = pt_p(k,j,i) + lv_d_cp * ql_c(k,j,i) * d_exner(k) * flag
        ENDDO
 

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3271 2018-09-24 08:20:34Z suehring
 ! Several bugfixes:
 ! - Initialization of pt_surface array with soil temperature in the uppermost
@@ -474 +477 @@
  
     USE arrays_3d,                                                             &
-        ONLY:  hyp, pt, prr, q, q_p, ql, vpt, u, v, w
+        ONLY:  hyp, pt, prr, q, q_p, ql, vpt, u, v, w, hyrho, exner, d_exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, g, lv_d_cp, l_v, magnus, rho_l, r_d, r_v
 
     USE calc_mean_profile_mod,                                                 &
         ONLY:  calc_mean_profile
 
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, hyrho, l_d_cp, l_d_r, l_v, pt_d_t, rho_l, r_d, r_v
-
     USE control_parameters,                                                    &
-        ONLY:  cloud_droplets, cloud_physics, coupling_start_time, dt_3d,      &
+        ONLY:  cloud_droplets, coupling_start_time, dt_3d,      &
                end_time, humidity, intermediate_timestep_count,                &
                initializing_actions, intermediate_timestep_count_max,          &
-               land_surface, max_masks, precipitation, pt_surface,             &
+               land_surface, max_masks, pt_surface,             &
                rho_surface, spinup, spinup_pt_mean, spinup_time,               &
                surface_pressure, timestep_scheme, tsc,                         &
@@ -493 +496 @@
     USE indices,                                                               &
         ONLY:  nbgp, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, precipitation
 
     USE netcdf_data_input_mod,                                                 &
@@ -584 +590 @@
                 deep_soil_temperature =  9999999.9_wp,  & !< Deep soil temperature (bottom boundary condition)
                 drho_l_lv,                              & !< (rho_l * l_v)**-1
-                exn,                                    & !< value of the Exner function
                 field_capacity = 9999999.9_wp,          & !< NAMELIST m_fc
                 f_shortwave_incoming = 9999999.9_wp,    & !< NAMELIST f_sw_in
@@ -604 +609 @@
                 rho_cp,                                 & !< rho_surface * cp
                 rho_lv,                                 & !< rho_ocean * l_v
-                rd_d_rv,                                & !< r_d / r_v
                 saturation_moisture = 9999999.9_wp,     & !< NAMELIST m_sat
                 skip_time_do_lsm = 0.0_wp,              & !< LSM is not called before this time
@@ -1734 +1738 @@
  SUBROUTINE lsm_energy_balance( horizontal, l )
 
-    USE diagnostic_quantities_mod,                                             &
-        ONLY:  magnus 
-
     USE pegrid
 
@@ -1816 +1817 @@
     j_off = surf%joff
     i_off = surf%ioff
-    
-!
-!-- Calculate the exner function for the current time step
-    exn = ( surface_pressure / 1000.0_wp )**0.286_wp
 
     DO  m = 1, surf%ns
@@ -1889 +1886 @@
 !--    time step is used here. Note that this formulation is the
 !--    equivalent to the ECMWF formulation using drag coefficients
-!        IF ( cloud_physics )  THEN
-!           pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
+!        IF ( bulk_cloud_model )  THEN
+!           pt1 = pt(k,j,i) + lv_d_cp * d_exner(k) * ql(k,j,i)
 !           qv1 = q(k,j,i) - ql(k,j,i)
 !        ELSEIF ( cloud_droplets ) THEN
-!           pt1 = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
+!           pt1 = pt(k,j,i) + lv_d_cp * d_exner(k) * ql(k,j,i)
 !           qv1 = q(k,j,i) 
 !        ELSE
@@ -2097 +2094 @@
 !--       Denominator of the prognostic equation
           coef_2 = surf%rad_lw_out_change_0(m) + f_qsws * dq_s_dt              &
-                   + lambda_surface + f_shf / exn
+                   + lambda_surface + f_shf / exner(nzb)
        ELSE
 !
@@ -2107 +2104 @@
 !
 !--       Denominator of the prognostic equation
-          coef_2 = surf%rad_lw_out_change_0(m) + lambda_surface + f_shf / exn
+          coef_2 = surf%rad_lw_out_change_0(m) + lambda_surface + f_shf / exner(nzb)
 
        ENDIF
@@ -2160 +2157 @@
 
 
-!        pt(k+k_off,j+j_off,i+i_off) = surf_t_surface_p%var_1d(m) / exn  !is actually no air temperature
-       surf%pt_surface(m)          = surf_t_surface_p%var_1d(m) / exn
+!        pt(k+k_off,j+j_off,i+i_off) = surf_t_surface_p%var_1d(m) / exner(nzb)  !is actually no air temperature
+       surf%pt_surface(m)          = surf_t_surface_p%var_1d(m) / exner(nzb)
 
 !
@@ -2177 +2174 @@
                                              - surf_t_soil%var_2d(nzb_soil,m) )
 
-       surf%shf(m) = - f_shf * ( surf%pt1(m) - surf%pt_surface(m) ) / cp
+       surf%shf(m) = - f_shf * ( surf%pt1(m) - surf%pt_surface(m) ) / c_p
 
        IF ( humidity )  THEN
@@ -2330 +2327 @@
     SUBROUTINE calc_q_surface
 
-       USE diagnostic_quantities_mod
-
        IMPLICIT NONE
 
-       REAL(wp) :: resistance    !< aerodynamic and soil resistance term
+       REAL(wp) ::  e_s           !< saturation water vapor pressure
+       REAL(wp) ::  q_s           !< saturation mixing ratio
+       REAL(wp) ::  resistance    !< aerodynamic and soil resistance term
 
        DO  m = 1, surf%ns
@@ -2353 +2350 @@
 !
 !--       Calculate mixing ratio at surface
-          IF ( cloud_physics )  THEN
+          IF ( bulk_cloud_model )  THEN
              q(k+k_off,j+j_off,i+i_off) = resistance * q_s +                   &
                                         ( 1.0_wp - resistance ) *              &
@@ -2471 +2468 @@
 !------------------------------------------------------------------------------!
     SUBROUTINE lsm_init
-    
+
        USE control_parameters,                                                 &
            ONLY:  message_string
@@ -2501 +2498 @@
        REAL(wp), DIMENSION(:), ALLOCATABLE ::  bound, bound_root_fr  !< temporary arrays for storing index bounds
        REAL(wp), DIMENSION(:), ALLOCATABLE ::  pr_soil_init !< temporary array used for averaging soil profiles
-
-!
-!--    Calculate Exner function
-       exn = ( surface_pressure / 1000.0_wp )**0.286_wp
 !
 !--    If no cloud physics is used, rho_surface has not been calculated before
-       IF (  .NOT.  cloud_physics  .AND.  .NOT.  cloud_droplets )  THEN
+       IF (  .NOT.  bulk_cloud_model  .AND.  .NOT.  cloud_droplets )  THEN
           CALL calc_mean_profile( pt, 4 )
-          rho_surface = surface_pressure * 100.0_wp / ( r_d * hom(topo_min_level+1,1,4,0) * exn )
+          rho_surface = hyp(nzb) / ( r_d * hom(topo_min_level+1,1,4,0) * exner(nzb) )
        ENDIF
 
 !
 !--    Calculate frequently used parameters
-       rho_cp    = cp * rho_surface
-       rd_d_rv   = r_d / r_v
+       rho_cp    = c_p * rho_surface
        rho_lv    = rho_surface * l_v
        drho_l_lv = 1.0_wp / (rho_l * l_v)
@@ -4451 +4443 @@
 !--          uppermost layer
              t_surface_h%var_1d(m)    = t_soil_h%var_2d(nzb_soil,m)
-             surf_lsm_h%pt_surface(m) = t_soil_h%var_2d(nzb_soil,m) / exn
+             surf_lsm_h%pt_surface(m) = t_soil_h%var_2d(nzb_soil,m) / exner(nzb)
              
-             IF ( cloud_physics  .OR. cloud_droplets ) THEN
-                surf_lsm_h%pt1(m) = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
+             IF ( bulk_cloud_model  .OR. cloud_droplets ) THEN
+                surf_lsm_h%pt1(m) = pt(k,j,i) + lv_d_cp * d_exner(k) * ql(k,j,i)
              ELSE
                 surf_lsm_h%pt1(m) = pt(k,j,i)
@@ -4480 +4472 @@
 !--             uppermost layer
                 t_surface_v(l)%var_1d(m)      = t_soil_v(l)%var_2d(nzb_soil,m)
-                surf_lsm_v(l)%pt_surface(m)   = t_soil_v(l)%var_2d(nzb_soil,m) / exn
-
-                IF ( cloud_physics  .OR. cloud_droplets ) THEN
-                   surf_lsm_v(l)%pt1(m) = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
+                surf_lsm_v(l)%pt_surface(m)   = t_soil_v(l)%var_2d(nzb_soil,m) / exner(nzb)
+
+                IF ( bulk_cloud_model  .OR. cloud_droplets ) THEN
+                   surf_lsm_v(l)%pt1(m) = pt(k,j,i) + lv_d_cp * d_exner(k) * ql(k,j,i)
                 ELSE
                    surf_lsm_v(l)%pt1(m) = pt(k,j,i)
@@ -7078 +7070 @@
 
        USE control_parameters,                                                 &
-           ONLY: g, message_string, molecular_viscosity
+           ONLY: message_string, molecular_viscosity
 
        IMPLICIT NONE

palm/trunk/SOURCE/lpm_advec.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -173 +176 @@
         ONLY:  de_dx, de_dy, de_dz, diss, dzw, e, km, u, v, w, zu, zw
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g, kappa
+
     USE cpulog
 
@@ -179 +185 @@
     USE control_parameters,                                                    &
         ONLY:  cloud_droplets, constant_flux_layer, dt_3d, dt_3d_reached_l,    &
-               dz, g, kappa, topography, u_gtrans, v_gtrans
+               dz, topography, u_gtrans, v_gtrans
 
     USE grid_variables,                                                        &

palm/trunk/SOURCE/lpm_calc_liquid_water_content.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -75 +78 @@
         ONLY:  dzw, ql, ql_v, ql_vp
 
-    USE cloud_parameters,                                                      &
-        ONLY:  rho_l
-
-    USE constants,                                                             &
-        ONLY:  pi
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  pi, rho_l
 
     USE control_parameters,                                                    &

palm/trunk/SOURCE/lpm_collision_kernels.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -135 +138 @@
  
 
-    USE constants,                                                             &
-        ONLY:  pi
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g, pi
         
     USE kinds
@@ -404 +407 @@
 
        USE control_parameters,                                                 &
-           ONLY:  g, molecular_viscosity
+           ONLY:  molecular_viscosity
     
        USE particle_attributes,                                                &

palm/trunk/SOURCE/lpm_droplet_collision.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -122 +125 @@
         ONLY:  diss, dzw, ql_v, ql_vp
 
-    USE cloud_parameters,                                                      &
-        ONLY:  rho_l, rho_s
-
-    USE constants,                                                             &
-        ONLY:  pi
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  pi, rho_l, rho_s
 
     USE control_parameters,                                                    &

palm/trunk/SOURCE/lpm_droplet_condensation.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -136 +139 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  dzw, hyp, pt, q, ql_c, ql_v
-
-    USE cloud_parameters,                                                      &
-        ONLY:  l_v, molecular_weight_of_solute,                        &
-               molecular_weight_of_water, rho_l, rho_s, r_v, vanthoff
-
-    USE constants,                                                             &
-        ONLY:  pi
+        ONLY:  dzw, hyp, pt, q, ql_c, ql_v, exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  l_v, molecular_weight_of_solute, molecular_weight_of_water,     &
+               magnus, pi, rho_l, rho_s, r_v, vanthoff
 
     USE control_parameters,                                                    &
@@ -150 +150 @@
     USE cpulog,                                                                &
         ONLY:  cpu_log, log_point_s
-
-    USE diagnostic_quantities_mod,                                             &
-        ONLY:  magnus
 
     USE grid_variables,                                                        &
@@ -220 +217 @@
 !
 !-- Absolute temperature
-    t_int = pt(kp,jp,ip) * ( hyp(kp) / 100000.0_wp )**0.286_wp
+    t_int = pt(kp,jp,ip) * exner(kp)
 !
 !-- Saturation vapor pressure (Eq. 10 in Bolton, 1980)

palm/trunk/SOURCE/lpm_init.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -1051 +1054 @@
 
     USE arrays_3d,                                                             &
-        ONLY: hyp, pt, q
-
-    USE cloud_parameters,                                                      &
-        ONLY: molecular_weight_of_solute, molecular_weight_of_water, rho_l,    &
-              r_v, rho_s, vanthoff
-
-    USE constants,                                                             &
-        ONLY: pi
-
-    USE diagnostic_quantities_mod,                                             &
-        ONLY:  magnus
-
+        ONLY: hyp, pt, q, exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY: molecular_weight_of_solute, molecular_weight_of_water, magnus,   &
+              pi, rho_l, r_v, rho_s, vanthoff
 
     USE kinds
@@ -1199 +1195 @@
 !--          the sometimes lengthy growth toward their equilibrium radius within
 !--          the simulation.
-             t_int  = pt(kp,jp,ip) * ( hyp(kp) / 100000.0_wp )**0.286_wp
+             t_int  = pt(kp,jp,ip) * exner(kp)
 
              e_s = magnus( t_int )

palm/trunk/SOURCE/lpm_splitting.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -61 +64 @@
         ONLY:  ql
 
-    USE cloud_parameters,                                                      &
-        ONLY:  rho_l
-
-    USE constants,                                                             &
-        ONLY:  pi
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  pi, rho_l
 
     USE cpulog,                                                                &

palm/trunk/SOURCE/model_1d_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3135 2018-07-16 14:43:04Z gronemeier
 ! Bugfix: add +1 to c_3 according to Sogachev et al. (2012)
 ! 
@@ -173 +176 @@
         ONLY:  dd2zu, ddzu, ddzw, dzu, dzw, pt_init, q_init, ug, u_init,       &
                vg, v_init, zu
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g, kappa, pi
     
     USE control_parameters,                                                    &
-        ONLY:  constant_diffusion, constant_flux_layer, dissipation_1d, f, g,  &
+        ONLY:  constant_diffusion, constant_flux_layer, dissipation_1d, f,     &
                humidity, ibc_e_b, intermediate_timestep_count,                 &
-               intermediate_timestep_count_max, kappa, km_constant,            &
+               intermediate_timestep_count_max, km_constant,                   &
                message_string, mixing_length_1d, prandtl_number,               &
                roughness_length, run_description_header, simulated_time_chr,   &
@@ -989 +995 @@
 
 
-    USE constants,                                                             &
-        ONLY:  pi
-
     IMPLICIT NONE
 

palm/trunk/SOURCE/modules.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3240 2018-09-12 12:04:40Z Giersch
 ! max_pr_user_tmp has been defined as a control variable because it is not 
 ! local anymore
@@ -985 +988 @@
     REAL(wp), DIMENSION(:), ALLOCATABLE ::  momentumflux_output_conversion  !< conversion factor array for momentumflux output
 
+    REAL(wp), DIMENSION(:), ALLOCATABLE ::  hyrho   !< density of air calculated with hydrostatic pressure
+    REAL(wp), DIMENSION(:), ALLOCATABLE ::  exner   !< ratio of actual and potential temperature
+    REAL(wp), DIMENSION(:), ALLOCATABLE ::  d_exner !< ratio of potential and actual temperature
+
     SAVE
 
@@ -1044 +1051 @@
   
  END MODULE averaging
-
-
-!------------------------------------------------------------------------------!
-! Description:
-! ------------
-!> Definition of variables and constants for cloud physics.
-!------------------------------------------------------------------------------!
- MODULE cloud_parameters
- 
-    USE kinds
-
-    REAL(wp) ::  cp = 1005.0_wp                            !< heat capacity of dry air (J kg-1 K-1)
-    REAL(wp) ::  l_v = 2.5E+06_wp                          !< latent heat of vaporization (J kg-1)
-    REAL(wp) ::  l_d_cp                                    !< l_v / cp
-    REAL(wp) ::  l_d_r                                     !< l_v / r_d
-    REAL(wp) ::  l_d_rv                                    !< l_v / r_v    
-    REAL(wp) ::  molecular_weight_of_solute = 0.05844_wp   !< mol. m. NaCl (kg mol-1)
-    REAL(wp) ::  molecular_weight_of_water = 0.01801528_wp !< mol. m. H2O (kg mol-1)
-    REAL(wp) ::  rho_l = 1.0E3_wp                          !< density of water (kg m-3)
-    REAL(wp) ::  rho_s = 2165.0_wp                         !< density of NaCl (kg m-3)
-    REAL(wp) ::  r_d = 287.0_wp                            !< sp. gas const. dry air (J kg-1 K-1)
-    REAL(wp) ::  r_v = 461.51_wp                           !< sp. gas const. water vapor (J kg-1 K-1)
-    REAL(wp) ::  vanthoff = 2.0_wp                         !< van't Hoff factor for NaCl
-
-
-
-    REAL(wp), DIMENSION(:), ALLOCATABLE ::  hyrho   !< density of air calculated with hydrostatic pressure 
-    REAL(wp), DIMENSION(:), ALLOCATABLE ::  pt_d_t  !< ratio of potential and actual temperature
-    REAL(wp), DIMENSION(:), ALLOCATABLE ::  t_d_pt  !< ratio of actual and potential temperature
-
-    SAVE
-
- END MODULE cloud_parameters
-
-
-!------------------------------------------------------------------------------!
-! Description:
-! ------------
-!> Definition of general constants.
-!------------------------------------------------------------------------------!
- MODULE constants
- 
-    USE kinds
-
-    REAL(wp) ::  pi = 3.141592654_wp  !< PI
-    REAL(wp) ::  adv_mom_1            !< 1/4 - constant used in 5th-order advection scheme for momentum advection (1st-order part)
-    REAL(wp) ::  adv_mom_3            !< 1/24 - constant used in 5th-order advection scheme for momentum advection (3rd-order part)
-    REAL(wp) ::  adv_mom_5            !< 1/120 - constant used in 5th-order advection scheme for momentum advection (5th-order part)
-    REAL(wp) ::  adv_sca_1            !< 1/2 - constant used in 5th-order advection scheme for scalar advection (1st-order part)
-    REAL(wp) ::  adv_sca_3            !< 1/12 - constant used in 5th-order advection scheme for scalar advection (3rd-order part)
-    REAL(wp) ::  adv_sca_5            !< 1/60 - constant used in 5th-order advection scheme for scalar advection (5th-order part)
-    
-    SAVE
-
- END MODULE constants
 
  
@@ -1157 +1109 @@
     CHARACTER (LEN=20)   ::  bc_uv_b = 'dirichlet'                        !< namelist parameter
     CHARACTER (LEN=20)   ::  bc_uv_t = 'dirichlet'                        !< namelist parameter
-    CHARACTER (LEN=20)   ::  aerosol_bulk = 'nacl'                        !< namelist parameter
-    CHARACTER (LEN=20)   ::  cloud_scheme = 'saturation_adjust'           !< namelist parameter
     CHARACTER (LEN=20)   ::  coupling_mode = 'uncoupled'                  !< coupling mode for atmosphere-ocean coupling  
     CHARACTER (LEN=20)   ::  coupling_mode_remote = 'uncoupled'           !< coupling mode of the remote process in case of coupled atmosphere-ocean runs
@@ -1311 +1261 @@
     INTEGER(iwp), DIMENSION(:,:), ALLOCATABLE ::  mask_k_global  !< global grid index of masked output point on z-dimension
 
-    LOGICAL ::  aerosol_nacl =.TRUE.                             !< nacl aerosol for bulk scheme
-    LOGICAL ::  aerosol_c3h4o4 =.FALSE.                          !< malonic acid aerosol for bulk scheme
-    LOGICAL ::  aerosol_nh4no3 =.FALSE.                          !< malonic acid aerosol for bulk scheme
     LOGICAL ::  agent_time_unlimited = .FALSE.                   !< namelist parameter
     LOGICAL ::  air_chemistry = .FALSE.                          !< chemistry model switch
@@ -1331 +1278 @@
     LOGICAL ::  bc_radiation_s = .FALSE.                         !< radiation boundary condition for outflow at south domain boundary
     LOGICAL ::  calc_soil_moisture_during_spinup = .FALSE.       !< namelist parameter
-    LOGICAL ::  call_microphysics_at_all_substeps = .FALSE.      !< namelist parameter
     LOGICAL ::  call_psolver_at_all_substeps = .TRUE.            !< namelist parameter
     LOGICAL ::  child_domain  = .FALSE.                          !< flag indicating that model is nested in a parent domain
     LOGICAL ::  cloud_droplets = .FALSE.                         !< namelist parameter
-    LOGICAL ::  cloud_physics = .FALSE.                          !< namelist parameter
     LOGICAL ::  cloud_top_radiation = .FALSE.                    !< namelist parameter
     LOGICAL ::  complex_terrain = .FALSE.                        !< namelist parameter
@@ -1375 +1320 @@
     LOGICAL ::  lsf_vert = .TRUE.                                !< use atmospheric forcing (large scale forcing)?
     LOGICAL ::  masking_method = .FALSE.                         !< namelist parameter
-    LOGICAL ::  microphysics_sat_adjust = .FALSE.                !< use saturation adjust bulk scheme?
-    LOGICAL ::  microphysics_kessler = .FALSE.                   !< use kessler bulk scheme?
-    LOGICAL ::  microphysics_morrison = .FALSE.                  !< use 2-moment Morrison (add. prog. eq. for nc and qc)
-    LOGICAL ::  microphysics_seifert = .FALSE.                   !< use 2-moment Seifert and Beheng scheme
     LOGICAL ::  mg_switch_to_pe0 = .FALSE.                       !< internal multigrid switch for steering the ghost point exchange in case that data has been collected on PE0
     LOGICAL ::  nesting_offline = .FALSE.                        !< flag controlling offline nesting in COSMO model  
@@ -1386 +1327 @@
     LOGICAL ::  passive_scalar = .FALSE.                         !< namelist parameter
     LOGICAL ::  plant_canopy = .FALSE.                           !< switch for use of plant canopy model
-    LOGICAL ::  precipitation = .FALSE.                          !< namelist parameter
     LOGICAL ::  random_heatflux = .FALSE.                        !< namelist parameter
     LOGICAL ::  rans_mode = .FALSE.                              !< switch between RANS and LES mode
@@ -1492 +1432 @@
     REAL(wp) ::  f = 0.0_wp                                    !< Coriolis parameter
     REAL(wp) ::  fs = 0.0_wp                                   !< Coriolis parameter
-    REAL(wp) ::  g = 9.81_wp                                   !< gravitational acceleration
     REAL(wp) ::  inflow_damping_height = 9999999.9_wp          !< namelist parameter
     REAL(wp) ::  inflow_damping_width = 9999999.9_wp           !< namelist parameter
-    REAL(wp) ::  kappa = 0.4_wp                                !< von Karman constant
     REAL(wp) ::  km_constant = -1.0_wp                         !< namelist parameter
     REAL(wp) ::  latitude = 55.0_wp                            !< namelist parameter
@@ -1512 +1450 @@
     REAL(wp) ::  particle_maximum_age = 9999999.9_wp           !< namelist parameter
     REAL(wp) ::  prandtl_number = 1.0_wp                       !< namelist parameter
-    REAL(wp) ::  precipitation_amount_interval = 9999999.9_wp  !< namelist parameter
     REAL(wp) ::  prho_reference                                !< reference state of potential density
     REAL(wp) ::  pt_damping_factor = 0.0_wp                    !< namelist parameter

palm/trunk/SOURCE/multi_agent_system_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3268 2018-09-21 13:45:37Z sward
 ! Cleaned up agent pointer assignment in output routine
 ! 
@@ -77 +80 @@
     USE, INTRINSIC ::  ISO_C_BINDING
 
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
 
@@ -2689 +2692 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  u, v, pt, hyp
+           ONLY:  u, v, pt, hyp, exner
 
 !       USE chemistry_model_mod,                                                &
@@ -2761 +2764 @@
 !
 !--                Calculate temperature at agent position
-                   agents(nl)%t = pt(kl,jl,il) *                               &
-                                  ( hyp(kl) / 100000.0_wp )**0.286_wp
+                   agents(nl)%t = pt(kl,jl,il) * exner(kl)
 ! !
 ! !--                Get PM10 concentration at agent position, if possible
@@ -4107 +4109 @@
     SUBROUTINE mas_timestep_social_forces ( mode, nl, ip, jp )
 
-!       USE constants,                                                          &
-!           ONLY:  pi
-
        IMPLICIT NONE
 

palm/trunk/SOURCE/netcdf_interface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -552 +555 @@
         ONLY:  chem_define_netcdf_grid 
 
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
 

palm/trunk/SOURCE/palm.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3258 2018-09-18 07:23:31Z Giersch
 ! current revision for user interface has been changed to 3240
 ! 
@@ -245 +248 @@
 
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, cloud_physics, constant_diffusion, child_domain, &
+        ONLY:  air_chemistry, constant_diffusion, child_domain,                &
                coupling_char, coupling_mode, do2d_at_begin, do3d_at_begin,     &
                humidity, initializing_actions, io_blocks, io_group,            &
-               message_string, microphysics_morrison, microphysics_seifert,    &
+               message_string,                                                 &
                neutral, passive_scalar, runnr, simulated_time_chr, spinup,     &
                time_since_reference_point, user_interface_current_revision,    &
@@ -259 +262 @@
         ONLY:  nbgp
 
+    USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
+
     USE multi_agent_system_mod,                                                &
         ONLY:  agents_active, mas_last_actions
@@ -265 +273 @@
         ONLY:  netcdf_data_input_inquire_file, netcdf_data_input_init,         &
                netcdf_data_input_surface_data, netcdf_data_input_topo
-
-    USE kinds
 
     USE particle_attributes,                                                   &
@@ -442 +448 @@
              IF ( humidity )  THEN
                 CALL exchange_horiz( q, nbgp )
-                IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
                   CALL exchange_horiz( qc, nbgp )
                   CALL exchange_horiz( nc, nbgp )
                 ENDIF
-                IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
                    CALL exchange_horiz( qr, nbgp ) 
                    CALL exchange_horiz( nr, nbgp )

palm/trunk/SOURCE/parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -420 +423 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  pt_init, q_init, ref_state, s_init, sa_init,                    &     
+        ONLY:  pt_init, q_init, ref_state, s_init, sa_init,                    &
                ug, u_init, v_init, vg
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bcm_parin
 
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_parin
-        
+
     USE chem_modules
 
@@ -455 +461 @@
     USE land_surface_model_mod,                                                &
         ONLY: lsm_parin
-
-    USE microphysics_mod,                                                      &
-        ONLY:  c_sedimentation, cloud_water_sedimentation,                     &
-               collision_turbulence, curvature_solution_effects_bulk,          &
-               dry_aerosol_radius, limiter_sedimentation, na_init, nc_const,   &
-               sigma_bulk, ventilation_effect
 
     USE model_1d_mod,                                                          &
@@ -525 +525 @@
     INTEGER(iwp) ::  ioerr          !< error flag for open/read/write
 
-    NAMELIST /inipar/  aerosol_bulk, alpha_surface, approximation, bc_e_b,     &
+    NAMELIST /inipar/  alpha_surface, approximation, bc_e_b,     &
                        bc_lr, bc_ns, bc_p_b, bc_p_t, bc_pt_b, bc_pt_t, bc_q_b, &
              bc_q_t,bc_s_b, bc_s_t, bc_sa_t, bc_uv_b, bc_uv_t,                 &
@@ -531 +531 @@
              building_length_y, building_wall_left, building_wall_south,       &
              calc_soil_moisture_during_spinup,                                 &
-             call_psolver_at_all_substeps, call_microphysics_at_all_substeps,  &
+             call_psolver_at_all_substeps,  &
              canyon_height,                                                    &
              canyon_width_x, canyon_width_y, canyon_wall_left,                 &
-             canyon_wall_south, c_sedimentation, cfl_factor, cloud_droplets,   &
-             cloud_physics, cloud_scheme, cloud_top_radiation,                 &
-             cloud_water_sedimentation,                                        &
-             collective_wait, collision_turbulence, complex_terrain,           &
+             canyon_wall_south, cfl_factor, cloud_droplets,   &
+             cloud_top_radiation,                 &
+             collective_wait, complex_terrain,           &
              conserve_volume_flow,                                             &
              conserve_volume_flow_mode, constant_flux_layer,                   &
-             coupling_start_time, curvature_solution_effects_bulk,             &
+             coupling_start_time,             &
              cycle_mg, damp_level_1d,                                          &
              data_output_during_spinup,                                        &
              day_of_year_init,                                                 &
              dissipation_1d,                                                   &
-             dp_external, dp_level_b, dp_smooth, dpdxy, dry_aerosol_radius,    &
+             dp_external, dp_level_b, dp_smooth, dpdxy,    &
              dt, dt_pr_1d, dt_run_control_1d, dt_spinup, dx, dy, dz, dz_max,   &
              dz_stretch_factor, dz_stretch_level, dz_stretch_level_start,      &
@@ -555 +554 @@
              initializing_actions, km_constant,                                &
              large_scale_forcing, large_scale_subsidence, latitude,            &
-             limiter_sedimentation, longitude,                                 &
+             longitude,                                 &
              loop_optimization, lsf_exception, masking_method, mg_cycles,      &
              mg_switch_to_pe0_level, mixing_length_1d, momentum_advec,         &
-             most_method, na_init, nc_const, nesting_offline,                  &
+             most_method, nesting_offline,                  &
              netcdf_precision, neutral, ngsrb,                                 &
              nsor, nsor_ini, nudging, nx, ny, nz, ocean, omega, omega_sor,     &
              outflow_source_plane, passive_scalar,                             &
-             prandtl_number, precipitation, psolver, pt_damping_factor,        &
+             prandtl_number, psolver, pt_damping_factor,        &
              pt_damping_width, pt_reference, pt_surface,                       &
              pt_surface_initial_change, pt_vertical_gradient,                  &
@@ -574 +573 @@
              roughness_length, sa_surface,                                     &
              sa_vertical_gradient, sa_vertical_gradient_level, scalar_advec,   &
-             scalar_rayleigh_damping, sigma_bulk,                              &
+             scalar_rayleigh_damping,                              &
              spinup_time, spinup_pt_amplitude, spinup_pt_mean,                 &
              statistic_regions, subs_vertical_gradient,                        &
@@ -592 +591 @@
              use_top_fluxes, use_ug_for_galilei_tr, use_upstream_for_tke,      &
              uv_heights, u_bulk, u_profile, vg_surface, vg_vertical_gradient,  &
-             vg_vertical_gradient_level, v_bulk, v_profile, ventilation_effect,&
+             vg_vertical_gradient_level, v_bulk, v_profile,&
              wall_adjustment, wall_heatflux, wall_humidityflux,                &
              wall_salinityflux, wall_scalarflux, y_shift, zeta_max, zeta_min,  &
              z0h_factor
 
-    NAMELIST /initialization_parameters/  aerosol_bulk, alpha_surface,         &
+    NAMELIST /initialization_parameters/  alpha_surface,         &
              approximation, bc_e_b,                                            &
              bc_lr, bc_ns, bc_p_b, bc_p_t, bc_pt_b, bc_pt_t, bc_q_b,           &
@@ -604 +603 @@
              building_length_y, building_wall_left, building_wall_south,       &
              calc_soil_moisture_during_spinup,                                 &
-             call_psolver_at_all_substeps, call_microphysics_at_all_substeps,  &
+             call_psolver_at_all_substeps,  &
              canyon_height,                                                    &
              canyon_width_x, canyon_width_y, canyon_wall_left,                 &
-             canyon_wall_south, c_sedimentation, cfl_factor, cloud_droplets,   &
-             cloud_physics, cloud_scheme, cloud_top_radiation,                 &
-             cloud_water_sedimentation,                                        &
-             collective_wait, collision_turbulence, complex_terrain,           &
+             canyon_wall_south, cfl_factor, cloud_droplets,   &
+             cloud_top_radiation,                 &
+             collective_wait, complex_terrain,           &
              conserve_volume_flow,                                             &
              conserve_volume_flow_mode, constant_flux_layer,                   &
-             coupling_start_time, curvature_solution_effects_bulk,             &
+             coupling_start_time,             &
              cycle_mg, damp_level_1d,                                          &
              data_output_during_spinup,                                        &
              day_of_year_init,                                                 &
              dissipation_1d,                                                   &
-             dp_external, dp_level_b, dp_smooth, dpdxy, dry_aerosol_radius,    &
+             dp_external, dp_level_b, dp_smooth, dpdxy,    &
              dt, dt_pr_1d, dt_run_control_1d, dt_spinup, dx, dy, dz, dz_max,   &
              dz_stretch_factor, dz_stretch_level, dz_stretch_level_start,      &
@@ -628 +626 @@
              initializing_actions, km_constant,                                &
              large_scale_forcing, large_scale_subsidence, latitude,            &
-             limiter_sedimentation, longitude,                                 &
+             longitude,                                 &
              loop_optimization, lsf_exception, masking_method, mg_cycles,      &
              mg_switch_to_pe0_level, mixing_length_1d, momentum_advec,         &
-             most_method, na_init, nc_const, nesting_offline,                  &
+             most_method, nesting_offline,                  &
              netcdf_precision, neutral, ngsrb,                                 &
              nsor, nsor_ini, nudging, nx, ny, nz, ocean, omega, omega_sor,     &
              outflow_source_plane, passive_scalar,                             &
-             prandtl_number, precipitation, psolver, pt_damping_factor,        &
+             prandtl_number, psolver, pt_damping_factor,        &
              pt_damping_width, pt_reference, pt_surface,                       &
              pt_surface_initial_change, pt_vertical_gradient,                  &
@@ -647 +645 @@
              roughness_length, sa_surface,                                     &
              sa_vertical_gradient, sa_vertical_gradient_level, scalar_advec,   &
-             scalar_rayleigh_damping, sigma_bulk,                              &
+             scalar_rayleigh_damping,                              &
              spinup_time, spinup_pt_amplitude, spinup_pt_mean,                 &
              statistic_regions, subs_vertical_gradient,                        &
@@ -665 +663 @@
              use_free_convection_scaling,                                      &
              uv_heights, u_bulk, u_profile, vg_surface, vg_vertical_gradient,  &
-             vg_vertical_gradient_level, v_bulk, v_profile, ventilation_effect,&
+             vg_vertical_gradient_level, v_bulk, v_profile,&
              wall_adjustment, wall_heatflux, wall_humidityflux,                &
              wall_salinityflux, wall_scalarflux, y_shift, zeta_max, zeta_min,  &
@@ -684 +682 @@
              mask_y_loop, mask_z_loop, netcdf_data_format, netcdf_deflate,     &
              normalizing_region, npex, npey, nz_do3d,                          &
-             precipitation_amount_interval, profile_columns, profile_rows,     &
+             profile_columns, profile_rows,     &
              restart_time, section_xy, section_xz, section_yz,                 &
              skip_time_data_output, skip_time_data_output_av, skip_time_dopr,  &
@@ -705 +703 @@
              mask_y_loop, mask_z_loop, netcdf_data_format, netcdf_deflate,     &
              normalizing_region, npex, npey, nz_do3d,                          &
-             precipitation_amount_interval, profile_columns, profile_rows,     &
+             profile_columns, profile_rows,     &
              restart_time, section_xy, section_xz, section_yz,                 &
              skip_time_data_output, skip_time_data_output_av, skip_time_dopr,  &
@@ -864 +862 @@
 
 !
+!--       Check if gust module is used and read &gust_par if required
+          CALL bcm_parin
+
+!
 !--       Check if urban surface model is used and read &urban_surface_par if required
           CALL usm_parin

palm/trunk/SOURCE/plant_canopy_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -365 +368 @@
 
        USE control_parameters,                                                 &
-           ONLY: cloud_physics, coupling_char, message_string,                 &
-                 microphysics_seifert
+           ONLY: coupling_char, message_string
+
+       USE bulk_cloud_model_mod,                                               &
+           ONLY: bulk_cloud_model, microphysics_seifert
 
        USE netcdf_data_input_mod,                                              &
@@ -407 +412 @@
        ENDIF 
 
-       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
           message_string = 'plant_canopy = .TRUE. requires cloud_scheme /=' // &
                           ' seifert_beheng'

palm/trunk/SOURCE/pmc_interface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -326 +329 @@
     USE control_parameters,                                                    &
         ONLY:  air_chemistry, bc_dirichlet_l, bc_dirichlet_n, bc_dirichlet_r,  &
-               bc_dirichlet_s, cloud_physics, child_domain,                    &
+               bc_dirichlet_s, child_domain,                                   &
                constant_diffusion, constant_flux_layer,                        &
                coupling_char, dt_3d, dz, humidity, message_string,             &
-               microphysics_morrison, microphysics_seifert,                    &
                neutral, passive_scalar, rans_mode, rans_tke_e,                 &
                roughness_length, simulated_time, topography, volume_flow
@@ -348 +350 @@
         ONLY:  nbgp, nx, nxl, nxlg, nxlu, nxr, nxrg, ny, nyn, nyng, nys, nysg, &
                nysv, nz, nzb, nzt, wall_flags_0
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
 
     USE particle_attributes,                                                   &
@@ -1269 +1274 @@
           CALL pmc_set_dataarray_name( 'coarse', 'q'  ,'fine', 'q',  ierr )
 
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
             CALL pmc_set_dataarray_name( 'coarse', 'qc'  ,'fine', 'qc',  ierr )  
             CALL pmc_set_dataarray_name( 'coarse', 'nc'  ,'fine', 'nc',  ierr ) 
           ENDIF
 
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              CALL pmc_set_dataarray_name( 'coarse', 'qr'  ,'fine', 'qr',  ierr )
              CALL pmc_set_dataarray_name( 'coarse', 'nr'  ,'fine', 'nr',  ierr ) 
@@ -3842 +3847 @@
                                       r2yo, r1zo, r2zo, 's' )
 
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              CALL pmci_interp_tril_all ( qc, qcc, ico, jco, kco, r1xo, r2xo,   &
                                           r1yo, r2yo, r1zo, r2zo, 's' ) 
@@ -3849 +3854 @@
           ENDIF
 
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              CALL pmci_interp_tril_all ( qr, qrc, ico, jco, kco, r1xo, r2xo,   &
                                          r1yo, r2yo, r1zo, r2zo, 's' )
@@ -4575 +4580 @@
                                           nzt_topo_nestbc_l, 'l', 's' )
 
-                IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
                    CALL pmci_interp_tril_lr( qc, qcc, ico, jco, kco, r1xo,     &
                                              r2xo, r1yo, r2yo, r1zo, r2zo,     &
@@ -4589 +4594 @@
                 ENDIF
 
-                IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
                    CALL pmci_interp_tril_lr( qr, qrc, ico, jco, kco, r1xo,     &
                                              r2xo, r1yo, r2yo, r1zo, r2zo,     &
@@ -4683 +4688 @@
                                           nzt_topo_nestbc_r, 'r', 's' )
 
-                IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 
                    CALL pmci_interp_tril_lr( qc, qcc, ico, jco, kco, r1xo,     &
@@ -4700 +4705 @@
                 ENDIF
 
-                IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 
      
@@ -4796 +4801 @@
                                           nzt_topo_nestbc_s, 's', 's' )
 
-                IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 
                    CALL pmci_interp_tril_sn( qc, qcc, ico, jco, kco, r1xo,     &
@@ -4812 +4817 @@
                 ENDIF
 
-                IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 
                    CALL pmci_interp_tril_sn( qr, qrc, ico, jco, kco, r1xo,     &
@@ -4907 +4912 @@
                                           nzt_topo_nestbc_n, 'n', 's' )
 
-                IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 
                    CALL pmci_interp_tril_sn( qc, qcc, ico, jco, kco, r1xo,     &
@@ -4923 +4928 @@
                 ENDIF
 
-                IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+                IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 
                    CALL pmci_interp_tril_sn( qr, qrc, ico, jco, kco, r1xo,     &
@@ -4994 +4999 @@
                                    r2yo, r1zo, r2zo, 's' )
 
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 
              CALL pmci_interp_tril_t( qc, qcc, ico, jco, kco, r1xo, r2xo, r1yo,&
@@ -5004 +5009 @@
           ENDIF
 
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 
 
@@ -5078 +5083 @@
                                   kfuo, ijkfc_s, 'q' )
 
-         IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+         IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 
             CALL pmci_anterp_tophat( qc, qcc, kctu, iflo, ifuo, jflo, jfuo,    &
@@ -5088 +5093 @@
          ENDIF
 
-         IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+         IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 
             CALL pmci_anterp_tophat( qr, qrc, kctu, iflo, ifuo, jflo, jfuo,    &
@@ -5902 +5907 @@
           ENDDO  
        ENDIF
-       IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
           DO  m = 1, bc_h(0)%ns
              i = bc_h(0)%i(m)            
@@ -5920 +5925 @@
        ENDIF
 
-       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
           DO  m = 1, bc_h(0)%ns
              i = bc_h(0)%i(m)            

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' )

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3272 2018-09-24 10:16:32Z suehring
 ! - split direct and diffusion shortwave radiation using RRTMG rather than using
 !   calc_diffusion_radiation, in case of RRTMG
@@ -103 +106 @@
 ! 
 ! 3117 2018-07-11 09:59:11Z maronga
-! Bugfix: water vapor was not transfered to RRTMG when cloud_physics = .F.
+! Bugfix: water vapor was not transfered to RRTMG when bulk_cloud_model = .F.
 ! Bugfix: changed the calculation of RRTMG boundary conditions (Mohamed Salim)
 ! Bugfix: dry residual atmosphere is replaced by standard RRTMG atmosphere
@@ -437 +440 @@
  
     USE arrays_3d,                                                             &
-        ONLY:  dzw, hyp, nc, pt, q, ql, zu, zw
+        ONLY:  dzw, hyp, nc, pt, q, ql, zu, zw, exner, d_exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, g, lv_d_cp, l_v, pi, r_d, rho_l, solar_constant,           &
+               barometric_formula
 
     USE calc_mean_profile_mod,                                                 &
         ONLY:  calc_mean_profile
 
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, l_d_cp, l_v, r_d, rho_l
-
-    USE constants,                                                             &
-        ONLY:  pi
-
     USE control_parameters,                                                    &
-        ONLY:  cloud_droplets, cloud_physics, coupling_char, dz, g,            &
+        ONLY:  cloud_droplets, coupling_char, dz,                              &
                humidity,                                                       &
                initializing_actions, io_blocks, io_group,                      &
                latitude, longitude, large_scale_forcing, lsf_surf,             &
-               message_string, microphysics_morrison, plant_canopy, pt_surface,&
+               message_string, plant_canopy, pt_surface,&
                rho_surface, surface_pressure, time_since_reference_point,      &
                urban_surface, land_surface, end_time, spinup_time, dt_spinup
@@ -475 +476 @@
     USE kinds
 
-    USE microphysics_mod,                                                      &
-        ONLY:  na_init, nc_const, sigma_gc
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, microphysics_morrison, na_init, nc_const, sigma_gc
 
 #if defined ( __netcdf )
@@ -561 +562 @@
                                                          /)
 
+    REAL(wp), PARAMETER :: sigma_sb       = 5.67037321E-8_wp !< Stefan-Boltzmann constant
+
     INTEGER(iwp) :: albedo_type  = 9999999, & !< Albedo surface type
                     dots_rad     = 0          !< starting index for timeseries output 
@@ -578 +581 @@
                                                         !< will be considered. However fewer SVFs are expected.
                 radiation_interactions_on = .TRUE.      !< namelist flag to force RTM activiation regardless to vertical urban/land surface and trees
-
-
-    REAL(wp), PARAMETER :: sigma_sb       = 5.67037321E-8_wp,       & !< Stefan-Boltzmann constant
-                           solar_constant = 1368.0_wp                 !< solar constant at top of atmosphere
 
     REAL(wp) :: albedo = 9999999.9_wp,           & !< NAMELIST alpha
@@ -2274 +2273 @@
 !
 !--       Initialize RRTMG
-          IF ( lw_radiation )  CALL rrtmg_lw_ini ( cp )
-          IF ( sw_radiation )  CALL rrtmg_sw_ini ( cp )
+          IF ( lw_radiation )  CALL rrtmg_lw_ini ( c_p )
+          IF ( sw_radiation )  CALL rrtmg_sw_ini ( c_p )
 
 !
@@ -2335 +2334 @@
 
        INTEGER(iwp) ::  l         !< running index for surface orientation
-
-       REAL(wp)     ::  exn       !< Exner functions at surface
-       REAL(wp)     ::  exn1      !< Exner functions at first grid level or at urban layer top 
        REAL(wp)     ::  pt1       !< potential temperature at first grid level or mean value at urban layer top 
        REAL(wp)     ::  pt1_l     !< potential temperature at first grid level or mean value at urban layer top at local subdomain 
@@ -2355 +2351 @@
 !
 !--    Calculate value of the Exner function at model surface
-       exn = (surface_pressure / 1000.0_wp )**0.286_wp
 !
 !--    In case averaged radiation is used, calculate mean temperature and 
@@ -2361 +2356 @@
        IF ( average_radiation ) THEN   
           pt1   = 0.0_wp
-          IF ( cloud_physics  .OR.  cloud_droplets )  ql1   = 0.0_wp
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )  ql1   = 0.0_wp
 
           pt1_l = SUM( pt(nzut,nys:nyn,nxl:nxr) )
-          IF ( cloud_physics  .OR.  cloud_droplets  )  ql1_l = SUM( ql(nzut,nys:nyn,nxl:nxr) )
+          IF ( bulk_cloud_model  .OR.  cloud_droplets  )  ql1_l = SUM( ql(nzut,nys:nyn,nxl:nxr) )
 
 #if defined( __parallel )      
           IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
           CALL MPI_ALLREDUCE( pt1_l, pt1, 1, MPI_REAL, MPI_SUM, comm2d, ierr )
-          IF ( cloud_physics  .OR.  cloud_droplets )                            &
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )                            &
              CALL MPI_ALLREDUCE( ql1_l, ql1, 1, MPI_REAL, MPI_SUM, comm2d, ierr )
 #else
           pt1 = pt1_l 
-          IF ( cloud_physics  .OR.  cloud_droplets )  ql1 = ql1_l
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )  ql1 = ql1_l
 #endif
- 
-          exn1 = ( hyp(nzut) / 100000.0_wp )**0.286_wp
-          IF ( cloud_physics  .OR.  cloud_droplets  )  pt1 = pt1 + l_d_cp / exn1 * ql1
+
+          IF ( bulk_cloud_model  .OR.  cloud_droplets  )  pt1 = pt1 + lv_d_cp / exner(nzut) * ql1
 !
 !--       Finally, divide by number of grid points
@@ -2418 +2412 @@
                 k = nzut
 
-                exn1 = ( hyp(k+1) / 100000.0_wp )**0.286_wp
-
                 surf%rad_sw_in  = solar_constant * sky_trans * zenith(0)
                 surf%rad_sw_out = albedo_urb * surf%rad_sw_in
                 
-                surf%rad_lw_in  = 0.8_wp * sigma_sb * (pt1 * exn1)**4
+                surf%rad_lw_in  = 0.8_wp * sigma_sb * (pt1 * exner(k+1))**4
 
                 surf%rad_lw_out = emissivity_urb * sigma_sb * (t_rad_urb)**4   &
@@ -2443 +2435 @@
                    j = surf%j(m)
                    k = surf%k(m)
-
-                   exn1 = (hyp(k) / 100000.0_wp )**0.286_wp
 
                    surf%rad_sw_in(m) = solar_constant * sky_trans * zenith(0)
@@ -2469 +2459 @@
                                         )                                      &
                                         * sigma_sb                             &
-                                        * ( surf%pt_surface(m) * exn )**4
+                                        * ( surf%pt_surface(m) * exner(nzb) )**4
 
                    surf%rad_lw_out_change_0(m) =                               &
@@ -2479 +2469 @@
                                         surf%emissivity(ind_wat_win,m)         &
                                       ) * 3.0_wp * sigma_sb                    &
-                                      * ( surf%pt_surface(m) * exn )** 3
-
-
-                   IF ( cloud_physics  .OR.  cloud_droplets  )  THEN
-                      pt1 = pt(k,j,i) + l_d_cp / exn1 * ql(k,j,i)
-                      surf%rad_lw_in(m)  = 0.8_wp * sigma_sb * (pt1 * exn1)**4
+                                      * ( surf%pt_surface(m) * exner(nzb) )** 3
+
+
+                   IF ( bulk_cloud_model  .OR.  cloud_droplets  )  THEN
+                      pt1 = pt(k,j,i) + lv_d_cp / exner(k) * ql(k,j,i)
+                      surf%rad_lw_in(m)  = 0.8_wp * sigma_sb * (pt1 * exner(k))**4
                    ELSE
-                      surf%rad_lw_in(m)  = 0.8_wp * sigma_sb * (pt(k,j,i) * exn1)**4
+                      surf%rad_lw_in(m)  = 0.8_wp * sigma_sb * (pt(k,j,i) * exner(k))**4
                    ENDIF
 
@@ -2524 +2514 @@
        INTEGER(iwp) ::  l         !< running index for surface orientation
 
-       REAL(wp)     ::  exn       !< Exner functions at surface
-       REAL(wp)     ::  exn1      !< Exner functions at first grid level
        REAL(wp)     ::  pt1       !< potential temperature at first grid level or mean value at urban layer top 
        REAL(wp)     ::  pt1_l     !< potential temperature at first grid level or mean value at urban layer top at local subdomain 
@@ -2531 +2519 @@
        REAL(wp)     ::  ql1_l     !< liquid water mixing ratio at first grid level or mean value at urban layer top at local subdomain 
 
-       TYPE(surf_type), POINTER ::  surf !< pointer on respective surface type, used to generalize routine   
-
-!
-!--    Calculate value of the Exner function
-       exn = (surface_pressure / 1000.0_wp )**0.286_wp
+       TYPE(surf_type), POINTER ::  surf !< pointer on respective surface type, used to generalize routine
+
 !
 !--    In case averaged radiation is used, calculate mean temperature and 
@@ -2541 +2526 @@
        IF ( average_radiation ) THEN   
           pt1   = 0.0_wp
-          IF ( cloud_physics  .OR.  cloud_droplets )  ql1   = 0.0_wp
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )  ql1   = 0.0_wp
 
           pt1_l = SUM( pt(nzut,nys:nyn,nxl:nxr) )
-          IF ( cloud_physics  .OR.  cloud_droplets )  ql1_l = SUM( ql(nzut,nys:nyn,nxl:nxr) )
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )  ql1_l = SUM( ql(nzut,nys:nyn,nxl:nxr) )
 
 #if defined( __parallel )      
           IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
           CALL MPI_ALLREDUCE( pt1_l, pt1, 1, MPI_REAL, MPI_SUM, comm2d, ierr )
-          IF ( cloud_physics  .OR.  cloud_droplets )                             &
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )                             &
              CALL MPI_ALLREDUCE( ql1_l, ql1, 1, MPI_REAL, MPI_SUM, comm2d, ierr )
 #else
           pt1 = pt1_l
-          IF ( cloud_physics  .OR.  cloud_droplets )  ql1 = ql1_l
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )  ql1 = ql1_l
 #endif
-          IF ( cloud_physics  .OR.  cloud_droplets )  pt1 = pt1 + l_d_cp / exn1 * ql1
+          IF ( bulk_cloud_model  .OR.  cloud_droplets )  pt1 = pt1 + lv_d_cp / exner(nzut+1) * ql1
 !
 !--       Finally, divide by number of grid points
@@ -2595 +2580 @@
              IF ( average_radiation ) THEN
 
-                ! set height above canopy
-                k = nzut
-
                 surf%rad_net = net_radiation
-! MS: Wyh k + 1 ?
-                exn1 = (hyp(k+1) / 100000.0_wp )**0.286_wp
-
-                surf%rad_lw_in  = 0.8_wp * sigma_sb * (pt1 * exn1)**4
+
+                surf%rad_lw_in  = 0.8_wp * sigma_sb * (pt1 * exner(nzut+1))**4
 
                 surf%rad_lw_out = emissivity_urb * sigma_sb * (t_rad_urb)**4   &
@@ -2636 +2616 @@
                    surf%rad_net(m) = net_radiation
 
-                   exn1 = (hyp(k) / 100000.0_wp )**0.286_wp
-
-                   IF ( cloud_physics  .OR.  cloud_droplets )  THEN
-                      pt1 = pt(k,j,i) + l_d_cp / exn1 * ql(k,j,i)
-                      surf%rad_lw_in(m)  = 0.8_wp * sigma_sb * (pt1 * exn1)**4
+                   IF ( bulk_cloud_model  .OR.  cloud_droplets )  THEN
+                      pt1 = pt(k,j,i) + lv_d_cp / exner(k) * ql(k,j,i)
+                      surf%rad_lw_in(m)  = 0.8_wp * sigma_sb * (pt1 * exner(k))**4
                    ELSE
                       surf%rad_lw_in(m)  = 0.8_wp * sigma_sb *                 &
-                                             ( pt(k,j,i) * exn1 )**4
+                                             ( pt(k,j,i) * exner(k) )**4
                    ENDIF
 
@@ -2656 +2634 @@
                                         )                                      &
                                       * sigma_sb                               &
-                                      * ( surf%pt_surface(m) * exn )**4
+                                      * ( surf%pt_surface(m) * exner(nzb) )**4
 
                    surf%rad_sw_in(m) = ( surf%rad_net(m) - surf%rad_lw_in(m)   &
@@ -2954 +2932 @@
           rrtm_tlev(0,nzb+1) = t_rad_urb
 
-          IF ( cloud_physics )  THEN
+          IF ( bulk_cloud_model )  THEN
 
              CALL calc_mean_profile( ql, 54 )
@@ -2962 +2940 @@
              DO k = nzb+1, nzt+1
                 rrtm_tlay(0,k) = pt_av(k) * ( (hyp(k) ) / 100000._wp       &
-                                 )**.286_wp + l_d_cp * ql_av(k)
+                                 )**.286_wp + lv_d_cp * ql_av(k)
                 rrtm_h2ovmr(0,k) = mol_mass_air_d_wv * (q_av(k) - ql_av(k))
              ENDDO
@@ -3013 +2991 @@
           rrtm_icld   = 0
 
-          IF ( cloud_physics )  THEN
+          IF ( bulk_cloud_model )  THEN
              DO k = nzb+1, nzt+1
                 rrtm_cliqwp(0,k) =  ql_av(k) * 1000._wp *                   &
@@ -3133 +3111 @@
 !--             Prepare profiles of temperature and H2O volume mixing ratio
                 DO  m = surf_lsm_h%start_index(j,i), surf_lsm_h%end_index(j,i)
-                   rrtm_tlev(0,nzb+1) = surf_lsm_h%pt_surface(m) * &
-                                    ( surface_pressure / 1000.0_wp )**0.286_wp
+                   rrtm_tlev(0,nzb+1) = surf_lsm_h%pt_surface(m) * exner(nzb)
                 ENDDO
                 DO  m = surf_usm_h%start_index(j,i), surf_usm_h%end_index(j,i)
-                   rrtm_tlev(0,nzb+1) = surf_usm_h%pt_surface(m) * &
-                                    ( surface_pressure / 1000.0_wp )**0.286_wp
+                   rrtm_tlev(0,nzb+1) = surf_usm_h%pt_surface(m) * exner(nzb)
                 ENDDO
 
 
-                IF ( cloud_physics )  THEN
+                IF ( bulk_cloud_model )  THEN
                    DO k = nzb+1, nzt+1
-                      rrtm_tlay(0,k) = pt(k,j,i) * ( (hyp(k) ) / 100000.0_wp   &
-                                       )**0.286_wp + l_d_cp * ql(k,j,i)
+                      rrtm_tlay(0,k) = pt(k,j,i) * exner(k)                    &
+                                        + lv_d_cp * ql(k,j,i)
                       rrtm_h2ovmr(0,k) = mol_mass_air_d_wv * (q(k,j,i) - ql(k,j,i))
                    ENDDO
                 ELSEIF ( cloud_droplets )  THEN
                    DO k = nzb+1, nzt+1
-                      rrtm_tlay(0,k) = pt(k,j,i) * ( (hyp(k) ) / 100000.0_wp   &
-                                       )**0.286_wp + l_d_cp * ql(k,j,i)
+                      rrtm_tlay(0,k) = pt(k,j,i) * exner(k)                     &
+                                        + lv_d_cp * ql(k,j,i)
                       rrtm_h2ovmr(0,k) = mol_mass_air_d_wv * q(k,j,i) 
                    ENDDO
                 ELSE
                    DO k = nzb+1, nzt+1
-                      rrtm_tlay(0,k) = pt(k,j,i) * ( (hyp(k) ) / 100000.0_wp   &
-                                       )**0.286_wp
+                      rrtm_tlay(0,k) = pt(k,j,i) * exner(k)
                    ENDDO
 
@@ -3202 +3177 @@
                 rrtm_icld   = 0
 
-                IF ( cloud_physics  .OR.  cloud_droplets )  THEN
+                IF ( bulk_cloud_model  .OR.  cloud_droplets )  THEN
                    DO k = nzb+1, nzt+1
                       rrtm_cliqwp(0,k) =  ql(k,j,i) * 1000.0_wp *              &
@@ -3214 +3189 @@
 !
 !--                      Calculate cloud droplet effective radius
-                         IF ( cloud_physics )  THEN
+                         IF ( bulk_cloud_model )  THEN
 !
 !--                         Calculete effective droplet radius. In case of using 
@@ -3285 +3260 @@
                                surf_lsm_h%frac(ind_wat_win,m)   *              &
                                surf_lsm_h%emissivity(ind_wat_win,m)
-                   rrtm_tsfc = surf_lsm_h%pt_surface(m) *                      &
-                                       (surface_pressure / 1000.0_wp )**0.286_wp
+                   rrtm_tsfc = surf_lsm_h%pt_surface(m) * exner(nzb)
                 ENDDO             
                 DO  m = surf_usm_h%start_index(j,i), surf_usm_h%end_index(j,i)
@@ -3295 +3269 @@
                                surf_usm_h%frac(ind_wat_win,m)   *              &
                                surf_usm_h%emissivity(ind_wat_win,m)
-                   rrtm_tsfc = surf_usm_h%pt_surface(m) *                      &
-                                       (surface_pressure / 1000.0_wp )**0.286_wp
+                   rrtm_tsfc = surf_usm_h%pt_surface(m) * exner(nzb)
                 ENDDO
 !
@@ -3985 +3958 @@
        ALLOCATE ( rrtm_plev(0:0,nzb+1:nzt_rad+2)   )
 
-       t_surface = pt_surface * ( surface_pressure / 1000.0_wp )**0.286_wp
+       t_surface = pt_surface * exner(nzb)
        DO k = nzb+1, nzt+1
           rrtm_play(0,k) = hyp(k) * 0.01_wp
-          rrtm_plev(0,k) = surface_pressure * ( (t_surface - g/cp * zw(k-1)) / &
-                         t_surface )**(1.0_wp/0.286_wp)
+          rrtm_plev(0,k) = barometric_formula(zw(k-1),                         &
+                              pt_surface * exner(nzb), &
+                              surface_pressure )
        ENDDO
 
@@ -4406 +4380 @@
  SUBROUTINE radiation_tendency_ij ( i, j, tend )
 
-    USE cloud_parameters,                                                      &
-        ONLY:  pt_d_t
-
     IMPLICIT NONE
 
@@ -4421 +4392 @@
        DO k = nzb+1, nzt+1
           tend(k,j,i) = tend(k,j,i) + (rad_lw_hr(k,j,i) + rad_sw_hr(k,j,i))    &
-                                         * pt_d_t(k) * d_seconds_hour
+                                         * d_exner(k) * d_seconds_hour
        ENDDO
 #endif
@@ -4437 +4408 @@
  SUBROUTINE radiation_tendency ( tend )
 
-    USE cloud_parameters,                                                      &
-        ONLY:  pt_d_t
-
     USE indices,                                                               &
         ONLY:  nxl, nxr, nyn, nys
@@ -4457 +4425 @@
              DO k = nzb+1, nzt+1
                 tend(k,j,i) = tend(k,j,i) + ( rad_lw_hr(k,j,i)                 &
-                                          +  rad_sw_hr(k,j,i) ) * pt_d_t(k)    &
+                                          +  rad_sw_hr(k,j,i) ) * d_exner(k)   &
                                           * d_seconds_hour
              ENDDO
@@ -4525 +4493 @@
 #if ! defined( __nopointer )
      IF ( plant_canopy )  THEN
-         pchf_prep(:) = r_d * (hyp(nzub:nzut) / 100000.0_wp)**0.286_wp &
-                     / (cp * hyp(nzub:nzut) * dx*dy*dz(1)) !< equals to 1 / (rho * c_p * Vbox * T)
-         pctf_prep(:) = r_d * (hyp(nzub:nzut) / 100000.0_wp)**0.286_wp &
+         pchf_prep(:) = r_d * exner(nzub:nzut)                                 &
+                     / (c_p * hyp(nzub:nzut) * dx*dy*dz(1)) !< equals to 1 / (rho * c_p * Vbox * T)
+         pctf_prep(:) = r_d * exner(nzub:nzut)                                 &
                      / (l_v * hyp(nzub:nzut) * dx*dy*dz(1))
      ENDIF
@@ -5032 +5000 @@
 !         k                = surf_lsm_h%k(m)
 !         pt_surf_urb_l    = pt_surf_urb_l + surf_lsm_h%pt_surface(m)            &
-!                            * ( hyp(k) / 100000.0_wp )**0.286_wp
+!                            * exner(k)
 !         count_surfaces_l = count_surfaces_l + 1.0_wp
 !      ENDDO
@@ -5038 +5006 @@
 !         k                = surf_usm_h%k(m)
 !         pt_surf_urb_l    = pt_surf_urb_l + surf_usm_h%pt_surface(m)            &
-!                            * ( hyp(k) / 100000.0_wp )**0.286_wp
+!                            * exner(k)
 !         count_surfaces_l = count_surfaces_l + 1.0_wp
 !      ENDDO
@@ -5045 +5013 @@
 !            k                = surf_lsm_v(l)%k(m)
 !            pt_surf_urb_l    = pt_surf_urb_l + surf_lsm_v(l)%pt_surface(m)      &
-!                            * ( hyp(k) / 100000.0_wp )**0.286_wp
+!                            * exner(k)
 !            count_surfaces_l = count_surfaces_l + 1.0_wp
 !         ENDDO
 !         DO  m = 1, surf_usm_v(l)%ns
 !            k                = surf_usm_v(l)%k(m)
-!            pt_surf_urb_l    = pt_surf_urb_l + surf_usm_v(l)%pt_surface(m)      &
-!                            * ( hyp(k) / 100000.0_wp )**0.286_wp
+!            pt_surf_urb_l    = pt_surf_urb_l + surf_usm_v(l)%pt_surface(m) * exner(k)
 !            count_surfaces_l = count_surfaces_l + 1.0_wp
 !         ENDDO

palm/trunk/SOURCE/read_restart_data_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -111 +114 @@
                   q_init, ref_state, s_init, sa_init, u_init, ug, v_init, vg
 
+       USE bulk_cloud_model_mod,                                               &
+           ONLY:  bcm_rrd_global
+
        USE date_and_time_mod,                                                  &
            ONLY:  day_of_year_init, time_utc_init
@@ -125 +131 @@
        USE indices,                                                            &
            ONLY:  nz, nx, nx_on_file, ny, ny_on_file
-
-       USE microphysics_mod,                                                   &
-           ONLY:  c_sedimentation, collision_turbulence,                       &
-                  cloud_water_sedimentation, limiter_sedimentation,            &
-                  nc_const, ventilation_effect
 
        USE model_1d_mod,                                                       &
@@ -332 +333 @@
              CASE ( 'building_wall_south' )
                 READ ( 13 )  building_wall_south
-             CASE ( 'c_sedimentation' )
-                READ ( 13 )  c_sedimentation
              CASE ( 'call_psolver_at_all_substeps' )
                 READ ( 13 )  call_psolver_at_all_substeps
@@ -350 +349 @@
              CASE ( 'cloud_droplets' )
                 READ ( 13 )  cloud_droplets
-             CASE ( 'cloud_physics' )
-                READ ( 13 )  cloud_physics
-             CASE ( 'cloud_scheme' )
-                READ ( 13 )  cloud_scheme
              CASE ( 'cloud_top_radiation' )
                 READ ( 13 )  cloud_top_radiation
-             CASE ( 'cloud_water_sedimentation' )
-                READ ( 13 )  cloud_water_sedimentation
              CASE ( 'collective_wait' )
                 READ ( 13 )  collective_wait
-             CASE ( 'collision_turbulence' )
-                READ ( 13 )  collision_turbulence
              CASE ( 'conserve_volume_flow' )
                 READ ( 13 )  conserve_volume_flow
@@ -461 +452 @@
              CASE ( 'latitude' )
                 READ ( 13 )  latitude
-             CASE ( 'limiter_sedimentation' )
-                READ ( 13 )  limiter_sedimentation
              CASE ( 'longitude' )
                 READ ( 13 )  longitude
@@ -484 +473 @@
              CASE ( 'most_method' )
                 READ ( 13 )  most_method
-             CASE ( 'nc_const' )
-                READ ( 13 )  nc_const
              CASE ( 'netcdf_precision' )
                 READ ( 13 )  netcdf_precision
@@ -520 +507 @@
              CASE ( 'prandtl_number' )
                 READ ( 13 )  prandtl_number
-             CASE ( 'precipitation' )
-                READ ( 13 ) precipitation
              CASE ( 'psolver' )
                 READ ( 13 )  psolver
@@ -732 +717 @@
              CASE ( 'v_max_ijk' )
                 READ ( 13 )  v_max_ijk
-             CASE ( 'ventilation_effect' )
-                READ ( 13 )  ventilation_effect
              CASE ( 'vg' )
                 READ ( 13 )  vg
@@ -786 +769 @@
              CASE DEFAULT
 
+                IF ( .NOT. found ) CALL bcm_rrd_global( found )
+
                 IF ( .NOT. found ) CALL wtm_rrd_global( found )
 
@@ -1061 +1046 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  e, kh, km, p, pt, q, ql, qc, nc, nr, prr, precipitation_amount, &
-               qr, s, sa, u, u_m_l, u_m_n, u_m_r, u_m_s, v, v_m_l, v_m_n,      &
+        ONLY:  e, kh, km, p, pt, q, ql, &
+               s, sa, u, u_m_l, u_m_n, u_m_r, u_m_s, v, v_m_l, v_m_n,      &
                v_m_r, v_m_s, vpt, w, w_m_l, w_m_n, w_m_r, w_m_s
 
@@ -1073 +1058 @@
         ONLY:  cpu_log, log_point_s
 
-    USE gust_mod,                                                           &
+    USE gust_mod,                                                              &
         ONLY :  gust_rrd_local
 
@@ -1084 +1069 @@
     USE land_surface_model_mod,                                                &
         ONLY:  lsm_rrd_local
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY :  bcm_rrd_local
 
     USE particle_attributes,                                                   &
@@ -1469 +1457 @@
                       tmp_2d(nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
 
-                CASE ( 'nc' )
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   nc(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =             &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'nc_av' )
-                   IF ( .NOT. ALLOCATED( nc_av ) )  THEN
-                      ALLOCATE( nc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   ENDIF
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   nc_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =          &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-
-                CASE ( 'nr' )
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   nr(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =             &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'nr_av' )
-                   IF ( .NOT. ALLOCATED( nr_av ) )  THEN
-                      ALLOCATE( nr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   ENDIF
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   nr_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =          &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
                 CASE ( 'p' )
                    IF ( k == 1 )  READ ( 13 )  tmp_3d
@@ -1525 +1486 @@
                       tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
 
-                CASE ( 'prr' )
-                   IF ( .NOT. ALLOCATED( prr ) )  THEN
-                      ALLOCATE( prr(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   ENDIF
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   prr(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =            &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'prr_av' )
-                   IF ( .NOT. ALLOCATED( prr_av ) )  THEN
-                      ALLOCATE( prr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   ENDIF
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   prr_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =         &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'precipitation_amount' )
-                   IF ( k == 1 )  READ ( 13 )  tmp_2d
-                   precipitation_amount(nysc-nbgp:nync+nbgp,                   &
-                                        nxlc-nbgp:nxrc+nbgp)  =                &
-                         tmp_2d(nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
                 CASE ( 'pt' )
                    IF ( k == 1 )  READ ( 13 )  tmp_3d
@@ -1573 +1512 @@
                       tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
 
-                CASE ( 'qc' )
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   qc(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =             &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'qc_av' )
-                   IF ( .NOT. ALLOCATED( qc_av ) )  THEN
-                      ALLOCATE( qc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   ENDIF
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   qc_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =          &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
                 CASE ( 'ql' )
                    IF ( k == 1 )  READ ( 13 )  tmp_3d
@@ -1597 +1523 @@
                    IF ( k == 1 )  READ ( 13 )  tmp_3d
                    ql_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =          &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'qr' )
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   qr(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =             &
-                      tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
-
-                CASE ( 'qr_av' )
-                   IF ( .NOT. ALLOCATED( qr_av ) )  THEN
-                      ALLOCATE( qr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   ENDIF
-                   IF ( k == 1 )  READ ( 13 )  tmp_3d
-                   qr_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) =          &
                       tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp)
 
@@ -1968 +1881 @@
 
 !
+!--                Read microphysics module restart data
+                   IF ( .NOT. found ) CALL bcm_rrd_local( i, k, nxlf,          &
+                                           nxlc, nxl_on_file, nxrf, nxrc,      &
+                                           nxr_on_file, nynf, nync,            &
+                                           nyn_on_file, nysf, nysc,            &
+                                           nys_on_file, tmp_2d, tmp_3d, found )
+
+!
 !--                Read surface related variables
                    IF ( .NOT. found ) CALL surface_rrd_local( i, k, nxlf,      &

palm/trunk/SOURCE/sum_up_3d_data.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -204 +207 @@
         ONLY:  dzw, e, heatflux_output_conversion, nc, nr, p, prr, pt,         &
                q, qc, ql, ql_c, ql_v, qr, rho_ocean, s, sa, u, v, vpt, w,      &
-               waterflux_output_conversion
+               waterflux_output_conversion, d_exner
 
     USE averaging,                                                             &
-        ONLY:  e_av, ghf_av, lpt_av, lwp_av, nc_av,     &
-               nr_av,                                                          &
-               ol_av, p_av, pc_av, pr_av, prr_av, pt_av, q_av, qc_av, ql_av,   &
-               ql_c_av, ql_v_av, ql_vp_av, qr_av, qsws_av, qv_av, r_a_av,      &
+        ONLY:  e_av, ghf_av, lpt_av, lwp_av,                                   &
+               ol_av, p_av, pc_av, pr_av, pt_av, q_av, ql_av,                  &
+               ql_c_av, ql_v_av, ql_vp_av, qsws_av, qv_av, r_a_av,             &
                rho_ocean_av, s_av, sa_av, shf_av, ssws_av, ts_av, tsurf_av,    &
                u_av, us_av, v_av, vpt_av, w_av, z0_av, z0h_av, z0q_av
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, lv_d_cp, l_v
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_3d_data_averaging
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_3d_data_averaging
 
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, l_d_cp, l_v, pt_d_t
-
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, average_count_3d, cloud_physics, doav, doav_n,   &
+        ONLY:  air_chemistry, average_count_3d, doav, doav_n,                  &
                land_surface, rho_surface, urban_surface, uv_exposure,          &
                varnamelength
@@ -323 +328 @@
                 lwp_av = 0.0_wp
 
-             CASE ( 'nc' )
-                IF ( .NOT. ALLOCATED( nc_av ) )  THEN
-                   ALLOCATE( nc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                ENDIF
-                nc_av = 0.0_wp
-
-             CASE ( 'nr' )
-                IF ( .NOT. ALLOCATED( nr_av ) )  THEN
-                   ALLOCATE( nr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                ENDIF
-                nr_av = 0.0_wp
-
              CASE ( 'ol*' )
                 IF ( .NOT. ALLOCATED( ol_av ) )  THEN
@@ -359 +352 @@
                 pr_av = 0.0_wp
 
-             CASE ( 'prr' )
-                IF ( .NOT. ALLOCATED( prr_av ) )  THEN
-                   ALLOCATE( prr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                ENDIF
-                prr_av = 0.0_wp
-
              CASE ( 'pt' )
                 IF ( .NOT. ALLOCATED( pt_av ) )  THEN
@@ -377 +364 @@
                 q_av = 0.0_wp
 
-             CASE ( 'qc' )
-                IF ( .NOT. ALLOCATED( qc_av ) )  THEN
-                   ALLOCATE( qc_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                ENDIF
-                qc_av = 0.0_wp
-
              CASE ( 'ql' )
                 IF ( .NOT. ALLOCATED( ql_av ) )  THEN
@@ -406 +387 @@
                 ENDIF
                 ql_vp_av = 0.0_wp
-
-             CASE ( 'qr' )
-                IF ( .NOT. ALLOCATED( qr_av ) )  THEN
-                   ALLOCATE( qr_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                ENDIF
-                qr_av = 0.0_wp
 
              CASE ( 'qsws*' )
@@ -532 +507 @@
 !--             Turbulence closure module
                 CALL tcm_3d_data_averaging( 'allocate', doav(ii) )
+
+!
+!--             Microphysics module quantities
+                IF ( bulk_cloud_model )  THEN
+                   CALL bcm_3d_data_averaging( 'allocate', doav(ii) )
+                ENDIF
 
 !
@@ -654 +635 @@
              ENDIF
 
-          CASE ( 'nc' )
-             IF ( ALLOCATED( nc_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         nc_av(k,j,i) = nc_av(k,j,i) + nc(k,j,i)
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          CASE ( 'nr' )
-             IF ( ALLOCATED( nr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         nr_av(k,j,i) = nr_av(k,j,i) + nr(k,j,i)
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
           CASE ( 'ol*' )
              IF ( ALLOCATED( ol_av ) ) THEN
@@ -758 +717 @@
              ENDIF
 
-          CASE ( 'prr' )
-             IF ( ALLOCATED( prr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         prr_av(k,j,i) = prr_av(k,j,i) + prr(k,j,i)
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
           CASE ( 'pt' )
              IF ( ALLOCATED( pt_av ) ) THEN
-                IF ( .NOT. cloud_physics ) THEN
+                IF ( .NOT. bulk_cloud_model ) THEN
                 DO  i = nxlg, nxrg
                    DO  j = nysg, nyng
@@ -783 +731 @@
                    DO  j = nysg, nyng
                       DO  k = nzb, nzt+1
-                            pt_av(k,j,i) = pt_av(k,j,i) + pt(k,j,i) + l_d_cp * &
-                                                          pt_d_t(k) * ql(k,j,i)
+                            pt_av(k,j,i) = pt_av(k,j,i) + pt(k,j,i) + lv_d_cp * &
+                                                          d_exner(k) * ql(k,j,i)
                          ENDDO
                       ENDDO
@@ -797 +745 @@
                       DO  k = nzb, nzt+1
                          q_av(k,j,i) = q_av(k,j,i) + q(k,j,i)
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          CASE ( 'qc' )
-             IF ( ALLOCATED( qc_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         qc_av(k,j,i) = qc_av(k,j,i) + qc(k,j,i)
                       ENDDO
                    ENDDO
@@ -862 +799 @@
                             ENDIF
                          ENDDO
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          CASE ( 'qr' )
-             IF ( ALLOCATED( qr_av ) ) THEN 
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         qr_av(k,j,i) = qr_av(k,j,i) + qr(k,j,i)
                       ENDDO
                    ENDDO
@@ -1001 +927 @@
                          m = surf_lsm_h%end_index(j,i)
                          shf_av(j,i) = shf_av(j,i) +                           &
-                                         surf_lsm_h%shf(m) * cp
+                                         surf_lsm_h%shf(m) * c_p
                       ELSEIF ( match_usm )  THEN
                          m = surf_usm_h%end_index(j,i)
                          shf_av(j,i) = shf_av(j,i) +                           &
-                                         surf_usm_h%shf(m) * cp
+                                         surf_usm_h%shf(m) * c_p
                       ENDIF
                    ENDDO
@@ -1265 +1191 @@
 
 !
+!--          Microphysics module quantities
+             IF ( bulk_cloud_model )  THEN
+                CALL bcm_3d_data_averaging( 'sum', doav(ii) )
+             ENDIF
+
+!
 !--          Land surface quantity
              IF ( land_surface )  THEN

palm/trunk/SOURCE/surface_coupler.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3049 2018-05-29 13:52:36Z Giersch
 ! Error messages revised
 ! 
@@ -101 +104 @@
         ONLY:  pt, rho_ocean, sa, total_2d_a, total_2d_o, u, v
 
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, l_v
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, l_v
 
     USE control_parameters,                                                    &
@@ -477 +480 @@
              
              surf_def_h(2)%shf(m) = surf_def_h(2)%shf(m) +                     &
-                                    surf_def_h(2)%qsws(m) * l_v / cp
+                                    surf_def_h(2)%qsws(m) * l_v / c_p
 !
 !--          ...and convert it to a salinity flux at the sea surface (top)
@@ -498 +501 @@
           j = surf_def_h(2)%j(m)
           surf_def_h(2)%shf(m) = surf_def_h(2)%shf(m) / rho_ocean(nzt,j,i) *   &
-                                 cp / cpw
+                                 c_p / cpw
 
           surf_def_h(2)%usws(m) = surf_def_h(2)%usws(m) / rho_ocean(nzt,j,i)

palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3271 2018-09-24 08:20:34Z suehring
 ! Comment revised
 ! 
@@ -231 +234 @@
     USE arrays_3d,                                                             &
         ONLY:  e, kh, nc, nr, pt, q, ql, qc, qr, s, u, v, vpt, w, zu, zw,      &
-               drho_air_zw, rho_air_zw
+               drho_air_zw, rho_air_zw, d_exner
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g, kappa, lv_d_cp, pi
 
     USE chem_modules,                                                          &
         ONLY:  constant_csflux, nvar
 
-    USE cloud_parameters,                                                      &
-        ONLY:  l_d_cp, pt_d_t
-
-    USE constants,                                                             &
-        ONLY:  pi
-
     USE cpulog
 
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, cloud_droplets, cloud_physics,                   &
-               constant_heatflux, constant_scalarflux,                         &     
-               constant_waterflux, coupling_mode, g, humidity, ibc_e_b,        &
-               ibc_pt_b, initializing_actions, kappa,                          &
+        ONLY:  air_chemistry, cloud_droplets,                                  &
+               constant_heatflux, constant_scalarflux,                         &
+               constant_waterflux, coupling_mode, humidity, ibc_e_b,           &
+               ibc_pt_b, initializing_actions,                                 &
                intermediate_timestep_count, intermediate_timestep_count_max,   &
-               land_surface, large_scale_forcing, lsf_surf,                    &
-               message_string, microphysics_morrison, microphysics_seifert,    &
+               land_surface, large_scale_forcing, lsf_surf, message_string,    &
                most_method, neutral, passive_scalar, pt_surface, q_surface,    &
                run_coupled, surface_pressure, simulated_time, terminate_run,   &
@@ -264 +263 @@
 
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
 
     USE pegrid
@@ -1467 +1469 @@
 
              ENDDO
-          ELSEIF ( cloud_physics  .OR.  cloud_droplets )  THEN
+          ELSEIF ( bulk_cloud_model  .OR.  cloud_droplets )  THEN
              !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo )
              DO  m = 1, surf%ns
@@ -1596 +1598 @@
           k   = surf%k(m)
 
-          IF ( cloud_physics ) THEN
-             surf%pt1(m) = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
+          IF ( bulk_cloud_model ) THEN
+             surf%pt1(m) = pt(k,j,i) + lv_d_cp * d_exner(k) * ql(k,j,i)
              surf%qv1(m) = q(k,j,i) - ql(k,j,i)
           ELSEIF( cloud_droplets ) THEN
-             surf%pt1(m) = pt(k,j,i) + l_d_cp * pt_d_t(k) * ql(k,j,i)
+             surf%pt1(m) = pt(k,j,i) + lv_d_cp * d_exner(k) * ql(k,j,i)
              surf%qv1(m) = q(k,j,i) 
           ELSE
@@ -1820 +1822 @@
              ENDIF
 
-             IF ( cloud_physics  .OR.  cloud_droplets )  THEN
+             IF ( bulk_cloud_model  .OR.  cloud_droplets )  THEN
                !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo )
                 DO  m = 1, surf%ns   
@@ -1927 +1929 @@
 !
 !--    If required compute qc* and nc*
-       IF ( cloud_physics  .AND.  microphysics_morrison  .AND.                 &
+       IF ( bulk_cloud_model  .AND.  microphysics_morrison  .AND.              &
             .NOT. surf_vertical )  THEN
           !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo )
@@ -1953 +1955 @@
 !
 !--    If required compute qr* and nr*
-       IF ( cloud_physics  .AND.  microphysics_seifert  .AND.                  &
+       IF ( bulk_cloud_model  .AND.  microphysics_seifert  .AND.               &
             .NOT. surf_vertical )  THEN
           !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo )
@@ -2145 +2147 @@
 !
 !--       Compute (turbulent) fluxes of cloud water content and cloud drop conc.
-          IF ( cloud_physics  .AND.  microphysics_morrison  .AND.              &
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison  .AND.           &
                .NOT. downward)  THEN
              !$OMP PARALLEL DO PRIVATE( i, j )
@@ -2159 +2161 @@
 !
 !--       Compute (turbulent) fluxes of rain water content and rain drop conc.
-          IF ( cloud_physics  .AND.  microphysics_seifert  .AND.               &
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert  .AND.            &
                .NOT. downward)  THEN
              !$OMP PARALLEL DO PRIVATE( i, j )

palm/trunk/SOURCE/surface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3254 2018-09-17 10:53:57Z suehring
 ! Remove redundant subroutine argument
 ! 
@@ -207 +210 @@
     USE chem_modules
 
-    USE control_parameters               
+    USE control_parameters
 
     USE indices,                                                               &
@@ -505 +508 @@
                                                     !< in the domain (required to activiate RTM)
 
+    LOGICAL ::  surf_bulk_cloud_model = .FALSE.                          !< use cloud microphysics
+    LOGICAL ::  surf_microphysics_morrison = .FALSE.                  !< use 2-moment Morrison (add. prog. eq. for nc and qc)
+    LOGICAL ::  surf_microphysics_seifert = .FALSE.                   !< use 2-moment Seifert and Beheng scheme
+
 
     SAVE
@@ -543 +550 @@
     PUBLIC bc_h, ind_pav_green, ind_veg_wall, ind_wat_win, ns_h_on_file,       &
            ns_v_on_file, surf_def_h, surf_def_v, surf_lsm_h, surf_lsm_v,       &
-           surf_usm_h, surf_usm_v, surf_type, vertical_surfaces_exist
+           surf_usm_h, surf_usm_v, surf_type, vertical_surfaces_exist,         &
+           surf_bulk_cloud_model, surf_microphysics_morrison, surf_microphysics_seifert
 !
 !-- Public subroutines and functions
@@ -1090 +1098 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_morrison)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_morrison)  THEN
           DEALLOCATE ( surfaces%qcs )
           DEALLOCATE ( surfaces%ncs )
@@ -1098 +1106 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           DEALLOCATE ( surfaces%qrs )
           DEALLOCATE ( surfaces%nrs )
@@ -1217 +1225 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_morrison)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_morrison)  THEN
           ALLOCATE ( surfaces%qcs(1:surfaces%ns)   )
           ALLOCATE ( surfaces%ncs(1:surfaces%ns)   )
@@ -1225 +1233 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           ALLOCATE ( surfaces%qrs(1:surfaces%ns)   )
           ALLOCATE ( surfaces%nrs(1:surfaces%ns)   )
@@ -1286 +1294 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_morrison)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_morrison)  THEN
           DEALLOCATE ( surfaces%qcsws )
           DEALLOCATE ( surfaces%ncsws )
@@ -1292 +1300 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           DEALLOCATE ( surfaces%qrsws )
           DEALLOCATE ( surfaces%nrsws )
@@ -1358 +1366 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_morrison)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_morrison)  THEN
           ALLOCATE ( surfaces%qcsws(1:surfaces%ns) )
           ALLOCATE ( surfaces%ncsws(1:surfaces%ns) )
@@ -1364 +1372 @@
 !
 !--       
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           ALLOCATE ( surfaces%qrsws(1:surfaces%ns) )
           ALLOCATE ( surfaces%nrsws(1:surfaces%ns) )
@@ -1473 +1481 @@
        DEALLOCATE ( surfaces%vpt1 )
 
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           DEALLOCATE ( surfaces%qcs )
           DEALLOCATE ( surfaces%ncs )
@@ -1480 +1488 @@
        ENDIF
 
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           DEALLOCATE ( surfaces%qrs )
           DEALLOCATE ( surfaces%nrs )
@@ -1598 +1606 @@
        ALLOCATE ( surfaces%vpt1(1:surfaces%ns) )
 
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           ALLOCATE ( surfaces%qcs(1:surfaces%ns)   )
           ALLOCATE ( surfaces%ncs(1:surfaces%ns)   )
@@ -1605 +1613 @@
        ENDIF
 
-       IF ( cloud_physics .AND. microphysics_seifert)  THEN
+       IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
           ALLOCATE ( surfaces%qrs(1:surfaces%ns)   )
           ALLOCATE ( surfaces%nrs(1:surfaces%ns)   )
@@ -2133 +2141 @@
              IF ( humidity )  THEN
                 surf%qs(num_h)   = 0.0_wp
-                IF ( cloud_physics .AND. microphysics_morrison)  THEN
+                IF ( surf_bulk_cloud_model .AND. surf_microphysics_morrison)  THEN
                    surf%qcs(num_h) = 0.0_wp
                    surf%ncs(num_h) = 0.0_wp
@@ -2141 +2149 @@
 
                 ENDIF
-                IF ( cloud_physics .AND. microphysics_seifert)  THEN
+                IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
                    surf%qrs(num_h) = 0.0_wp
                    surf%nrs(num_h) = 0.0_wp
@@ -2314 +2322 @@
              IF ( humidity )  THEN
                 surf%qsws(num_h) = 0.0_wp
-                IF ( cloud_physics  .AND.  microphysics_morrison ) THEN
+                IF ( surf_bulk_cloud_model  .AND.  surf_microphysics_morrison ) THEN
                    surf%ncsws(num_h) = 0.0_wp
                    surf%qcsws(num_h) = 0.0_wp
                 ENDIF
-                IF ( cloud_physics  .AND.  microphysics_seifert ) THEN
+                IF ( surf_bulk_cloud_model  .AND.  surf_microphysics_seifert ) THEN
                    surf%nrsws(num_h) = 0.0_wp
                    surf%qrsws(num_h) = 0.0_wp
@@ -2449 +2457 @@
 !
 !--             Following wall fluxes are assumed to be zero 
-                IF ( cloud_physics .AND. microphysics_morrison)  THEN
+                IF ( surf_bulk_cloud_model .AND. surf_microphysics_morrison)  THEN
                    surf%qcs(num_v) = 0.0_wp
                    surf%ncs(num_v) = 0.0_wp
@@ -2456 +2464 @@
                    surf%ncsws(num_v) = 0.0_wp
                 ENDIF
-                IF ( cloud_physics .AND. microphysics_seifert)  THEN
+                IF ( surf_bulk_cloud_model .AND. surf_microphysics_seifert)  THEN
                    surf%qrs(num_v) = 0.0_wp
                    surf%nrs(num_v) = 0.0_wp

palm/trunk/SOURCE/swap_timelevel.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -138 +141 @@
 #endif
 
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_swap_timelevel
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_swap_timelevel 
@@ -148 +154 @@
 
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, cloud_physics, humidity, land_surface,           &
-               microphysics_morrison, microphysics_seifert, neutral, ocean,    &
-               passive_scalar, timestep_count, urban_surface
+        ONLY:  air_chemistry, humidity, land_surface,                          &
+               neutral, ocean, passive_scalar, timestep_count, urban_surface
 
     USE gust_mod,                                                              &
@@ -205 +210 @@
     IF ( humidity )  THEN
        q = q_p
-       IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-          qc = qc_p
-          nc = nc_p
-       ENDIF             
-       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-          qr = qr_p
-          nr = nr_p
-       ENDIF
     ENDIF
 
     IF ( passive_scalar )  s = s_p             
+
+    IF ( humidity  .AND.  bulk_cloud_model )  THEN
+       CALL bcm_swap_timelevel ( 0 )
+    ENDIF
 
     IF ( land_surface )  THEN
@@ -249 +250 @@
           IF ( humidity )  THEN
              q => q_1;    q_p => q_2
-             IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-                qc => qc_1;    qc_p => qc_2
-                nc => nc_1;    nc_p => nc_2
-             ENDIF
-             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-                qr => qr_1;    qr_p => qr_2
-                nr => nr_1;    nr_p => nr_2
-             ENDIF
           ENDIF
           IF ( passive_scalar )  THEN
@@ -279 +272 @@
           IF ( humidity )  THEN
              q => q_2;    q_p => q_1
-             IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
-                qc => qc_2;    qc_p => qc_1
-                nc => nc_2;    nc_p => nc_1
-             ENDIF
-             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
-                qr => qr_2;    qr_p => qr_1
-                nr => nr_2;    nr_p => nr_1
-             ENDIF
           ENDIF
           IF ( passive_scalar )  THEN
@@ -300 +285 @@
     CALL tcm_swap_timelevel ( MOD( timestep_count, 2) )
 
+    IF ( humidity  .AND.  bulk_cloud_model )  THEN
+       CALL bcm_swap_timelevel ( MOD( timestep_count, 2) )
+    ENDIF
+
     IF ( land_surface )  THEN
        CALL lsm_swap_timelevel ( MOD( timestep_count, 2) )

palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -145 +148 @@
         ONLY:  mean_inflow_profiles, u, v, w
 
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
 

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -381 +384 @@
                bc_lr_cyc, bc_ns_cyc, bc_pt_t_val, bc_q_t_val,                  &
                call_psolver_at_all_substeps,  child_domain, cloud_droplets,    &
-               cloud_physics, constant_flux_layer, constant_heatflux,          &
+               constant_flux_layer, constant_heatflux,                         &
                create_disturbances, dopr_n, constant_diffusion, coupling_mode, &
                coupling_start_time, current_timestep_number,                   &
@@ -393 +396 @@
                intermediate_timestep_count_max,                                &
                land_surface, large_scale_forcing,                              &
-               loop_optimization, lsf_surf, lsf_vert, masks,                   &
-               microphysics_morrison, microphysics_seifert, mid,               &
+               loop_optimization, lsf_surf, lsf_vert, masks, mid,              &
                multi_agent_system_end, multi_agent_system_start,               &
                nesting_offline, neutral, nr_timesteps_this_run, nudging,       &
@@ -441 +443 @@
                lsf_nesting_offline, lsf_nesting_offline_mass_conservation
 
-    USE microphysics_mod,                                                      &
-        ONLY: collision_turbulence
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, calc_liquid_water_content,                     &
+              collision_turbulence, microphysics_morrison, microphysics_seifert
 
     USE netcdf_data_input_mod,                                                 &
@@ -757 +760 @@
           IF ( humidity )  THEN
              CALL exchange_horiz( q_p, nbgp )
-             IF ( cloud_physics .AND. microphysics_morrison )  THEN
+             IF ( bulk_cloud_model .AND. microphysics_morrison )  THEN
                 CALL exchange_horiz( qc_p, nbgp )
                 CALL exchange_horiz( nc_p, nbgp )
              ENDIF
-             IF ( cloud_physics .AND. microphysics_seifert )  THEN
+             IF ( bulk_cloud_model .AND. microphysics_seifert )  THEN
                 CALL exchange_horiz( qr_p, nbgp )
                 CALL exchange_horiz( nr_p, nbgp )
@@ -822 +825 @@
                    CALL exchange_horiz( q, nbgp )
 
-                   IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+                   IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
                        CALL exchange_horiz( qc, nbgp )
                        CALL exchange_horiz( nc, nbgp )
                    ENDIF
-                   IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+                   IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
                        CALL exchange_horiz( qr, nbgp )
                        CALL exchange_horiz( nr, nbgp )
@@ -960 +963 @@
 !
 !--       If required, compute liquid water content
-          IF ( cloud_physics )  THEN
+          IF ( bulk_cloud_model )  THEN
              CALL calc_liquid_water_content
           ENDIF

palm/trunk/SOURCE/time_integration_spinup.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -577 +580 @@
     FUNCTION solar_angle( local_time ) 
 
-       USE constants,                                                          &
+       USE basic_constants_and_equations_mod,                                  &
        ONLY:  pi
       

palm/trunk/SOURCE/timestep.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -154 +157 @@
     USE kinds
 
-    USE microphysics_mod,                                                      &
+    USE bulk_cloud_model_mod,                                                  &
         ONLY:  dt_precipitation
 

palm/trunk/SOURCE/tridia_solver_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -109 +112 @@
  
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  pi
+
     USE indices,                                                               &
         ONLY:  nx, ny, nz
@@ -145 +151 @@
        USE arrays_3d,                                                          &
            ONLY:  ddzu_pres, ddzw, rho_air_zw
-
-       USE kinds
 
        IMPLICIT NONE
@@ -186 +190 @@
               ONLY:  tric, rho_air
 
-          USE constants,                                                       &
-              ONLY:  pi
-
           USE control_parameters,                                              &
               ONLY:  ibc_p_b, ibc_p_t
@@ -195 +196 @@
               ONLY:  dx, dy
 
-
-          USE kinds
 
           IMPLICIT NONE
@@ -282 +281 @@
               ONLY:  ibc_p_b, ibc_p_t
 
-          USE kinds
-
           IMPLICIT NONE
 
@@ -358 +355 @@
               ONLY:  ibc_p_b, ibc_p_t
 
-          USE kinds
-
           IMPLICIT NONE
 
@@ -431 +426 @@
           USE arrays_3d,                                                       & 
               ONLY:  tri, tric
-
-          USE kinds
 
           IMPLICIT NONE
@@ -482 +475 @@
            ONLY:  ibc_p_b, ibc_p_t
 
-       USE kinds
-
        IMPLICIT NONE
 
@@ -533 +524 @@
 !------------------------------------------------------------------------------!
        SUBROUTINE maketri_1dd( j )
-
-          USE constants,                                                       &
-              ONLY:  pi
-
-          USE kinds
 
           IMPLICIT NONE

palm/trunk/SOURCE/turbulence_closure_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3245 2018-09-13 14:08:16Z knoop
 ! unused variables removed, shortest_distance has wp now
 ! 
@@ -154 +157 @@
 #endif
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  g, kappa, lv_d_cp, lv_d_rd
+
     USE control_parameters,                                                    &
         ONLY:  constant_diffusion, dt_3d, e_init, humidity,                    &
                initializing_actions, intermediate_timestep_count,              &
-               intermediate_timestep_count_max, kappa, km_constant,            &
+               intermediate_timestep_count_max, km_constant,                   &
                les_dynamic, les_mw, ocean, plant_canopy, prandtl_number,       &
                prho_reference, pt_reference, rans_mode, rans_tke_e, rans_tke_l,&
@@ -950 +956 @@
  SUBROUTINE tcm_init_arrays
 
-    USE microphysics_mod,                                                      &
+    USE bulk_cloud_model_mod,                                                  &
         ONLY:  collision_turbulence
 
@@ -2598 +2604 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  ddzw, dd2zu, drho_air_zw, q, ql
-
-    USE cloud_parameters,                                                      &
-        ONLY:  l_d_cp, l_d_r, pt_d_t, t_d_pt
+        ONLY:  ddzw, dd2zu, drho_air_zw, q, ql, d_exner, exner
 
     USE control_parameters,                                                    &
-        ONLY:  cloud_droplets, cloud_physics, constant_flux_layer, g, neutral, &
+        ONLY:  cloud_droplets, constant_flux_layer, neutral,                   &
                rho_reference, use_single_reference_value, use_surface_fluxes,  &
                use_top_fluxes
@@ -2610 +2613 @@
     USE grid_variables,                                                        &
         ONLY:  ddx, dx, ddy, dy
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model
 
     USE surface_mod,                                                           &
@@ -3067 +3073 @@
 !--                Flag 9 is used to mask top fluxes, flag 30 to mask
 !--                surface fluxes
-                   IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                   IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                       k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                       k2 = 0.61_wp * pt(k,j,i)
@@ -3083 +3089 @@
                                           BTEST( wall_flags_0(k,j,i), 9 )      &
                                         )
-                   ELSE IF ( cloud_physics )  THEN
+                   ELSE IF ( bulk_cloud_model )  THEN
                       IF ( ql(k,j,i) == 0.0_wp )  THEN
                          k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                          k2 = 0.61_wp * pt(k,j,i)
                       ELSE
-                         theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                         temp  = theta * t_d_pt(k)
+                         theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                         temp  = theta * exner(k)
                          k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *                  &
                                        ( q(k,j,i) - ql(k,j,i) ) *              &
-                              ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /         &
-                              ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *           &
+                              ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /       &
+                              ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *        &
                               ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                         k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                         k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                       ENDIF
                       tend(k,j,i) = tend(k,j,i) - kh(k,j,i) *                  &
@@ -3144 +3150 @@
                          k = surf_def_h(l)%k(m)
 
-                         IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                         IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                             k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                             k2 = 0.61_wp * pt(k,j,i)
-                         ELSE IF ( cloud_physics )  THEN
+                         ELSE IF ( bulk_cloud_model )  THEN
                             IF ( ql(k,j,i) == 0.0_wp )  THEN
                                k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                                k2 = 0.61_wp * pt(k,j,i)
                             ELSE
-                               theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                               temp  = theta * t_d_pt(k)
+                               theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                               temp  = theta * exner(k)
                                k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *            &
                                           ( q(k,j,i) - ql(k,j,i) ) *           &
-                                 ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /      &
-                                 ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *        &
+                                 ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /    &
+                                 ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *     &
                                  ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                               k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                               k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                             ENDIF
                          ELSE IF ( cloud_droplets )  THEN
@@ -3181 +3187 @@
                       k = surf_lsm_h%k(m)
 
-                      IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                      IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                          k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                          k2 = 0.61_wp * pt(k,j,i)
-                      ELSE IF ( cloud_physics )  THEN
+                      ELSE IF ( bulk_cloud_model )  THEN
                          IF ( ql(k,j,i) == 0.0_wp )  THEN
                             k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                             k2 = 0.61_wp * pt(k,j,i)
                          ELSE
-                            theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                            temp  = theta * t_d_pt(k)
+                            theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                            temp  = theta * exner(k)
                             k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *               &
                                           ( q(k,j,i) - ql(k,j,i) ) *           &
-                                 ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /      &
-                                 ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *        &
+                                 ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /    &
+                                 ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *     &
                                  ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                            k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                            k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                          ENDIF
                       ELSE IF ( cloud_droplets )  THEN
@@ -3217 +3223 @@
                       k = surf_usm_h%k(m)
 
-                      IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                      IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                          k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                          k2 = 0.61_wp * pt(k,j,i)
-                      ELSE IF ( cloud_physics )  THEN
+                      ELSE IF ( bulk_cloud_model )  THEN
                          IF ( ql(k,j,i) == 0.0_wp )  THEN
                             k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                             k2 = 0.61_wp * pt(k,j,i)
                          ELSE
-                            theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                            temp  = theta * t_d_pt(k)
+                            theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                            temp  = theta * exner(k)
                             k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *               &
                                           ( q(k,j,i) - ql(k,j,i) ) *           &
-                                 ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /      &
-                                 ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *        &
+                                 ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /    &
+                                 ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *     &
                                  ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                            k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                            k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                          ENDIF
                       ELSE IF ( cloud_droplets )  THEN
@@ -3260 +3266 @@
                       k = surf_def_h(2)%k(m)
 
-                      IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                      IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                          k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                          k2 = 0.61_wp * pt(k,j,i)
-                      ELSE IF ( cloud_physics )  THEN
+                      ELSE IF ( bulk_cloud_model )  THEN
                          IF ( ql(k,j,i) == 0.0_wp )  THEN
                             k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                             k2 = 0.61_wp * pt(k,j,i)
                          ELSE
-                            theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                            temp  = theta * t_d_pt(k)
+                            theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                            temp  = theta * exner(k)
                             k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *               &
                                        ( q(k,j,i) - ql(k,j,i) ) *              &
-                              ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /         &
-                              ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *           &
+                              ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /       &
+                              ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *        &
                               ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                            k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                            k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                          ENDIF
                       ELSE IF ( cloud_droplets )  THEN
@@ -3316 +3322 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  ddzw, dd2zu, drho_air_zw, q, ql
-
-    USE cloud_parameters,                                                      &
-        ONLY:  l_d_cp, l_d_r, pt_d_t, t_d_pt
+        ONLY:  ddzw, dd2zu, drho_air_zw, q, ql, d_exner, exner
 
     USE control_parameters,                                                    &
-        ONLY:  cloud_droplets, cloud_physics, constant_flux_layer, g, neutral, &
+        ONLY:  cloud_droplets, constant_flux_layer, neutral,                &
                rho_reference, use_single_reference_value, use_surface_fluxes,  &
                use_top_fluxes
@@ -3328 +3331 @@
     USE grid_variables,                                                        &
         ONLY:  ddx, dx, ddy, dy
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model
 
     USE surface_mod,                                                           &
@@ -3864 +3870 @@
 !
 !--          Flag 9 is used to mask top fluxes, flag 30 to mask surface fluxes
-             IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets )  THEN
+             IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets )  THEN
                 k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                 k2 = 0.61_wp * pt(k,j,i)
@@ -3880 +3886 @@
                                         )
 
-             ELSE IF ( cloud_physics )  THEN
+             ELSE IF ( bulk_cloud_model )  THEN
                 IF ( ql(k,j,i) == 0.0_wp )  THEN
                    k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                    k2 = 0.61_wp * pt(k,j,i)
                 ELSE
-                   theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                   temp  = theta * t_d_pt(k)
+                   theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                   temp  = theta * exner(k)
                    k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *                        &
                                  ( q(k,j,i) - ql(k,j,i) ) *                    &
-                        ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /               &
-                        ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *                 &
+                        ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /             &
+                        ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *              &
                         ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                   k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                   k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                 ENDIF
                 tend(k,j,i) = tend(k,j,i) - kh(k,j,i) * g /                    &
@@ -3934 +3940 @@
                    k = surf_def_h(l)%k(m)
 
-                   IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                   IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                       k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                       k2 = 0.61_wp * pt(k,j,i)
-                   ELSE IF ( cloud_physics )  THEN
+                   ELSE IF ( bulk_cloud_model )  THEN
                       IF ( ql(k,j,i) == 0.0_wp )  THEN
                          k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                          k2 = 0.61_wp * pt(k,j,i)
                       ELSE
-                        theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                        temp  = theta * t_d_pt(k)
+                        theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                        temp  = theta * exner(k)
                         k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *                   &
                                    ( q(k,j,i) - ql(k,j,i) ) *                  &
-                          ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /             &
-                          ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *               & 
+                          ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /           &
+                          ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *            &
                           ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                        k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                        k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                       ENDIF
                    ELSE IF ( cloud_droplets )  THEN
@@ -3971 +3977 @@
                 k = surf_lsm_h%k(m)
 
-                IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                     k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                     k2 = 0.61_wp * pt(k,j,i)
-                ELSE IF ( cloud_physics )  THEN
+                ELSE IF ( bulk_cloud_model )  THEN
                     IF ( ql(k,j,i) == 0.0_wp )  THEN
                        k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                        k2 = 0.61_wp * pt(k,j,i)
                     ELSE
-                       theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                       temp  = theta * t_d_pt(k)
+                       theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                       temp  = theta * exner(k)
                        k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *                    &
                                      ( q(k,j,i) - ql(k,j,i) ) *                &
-                            ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /           &
-                            ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *             &
+                            ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /         &
+                            ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *          &
                             ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                       k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                       k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                    ENDIF
                 ELSE IF ( cloud_droplets )  THEN
@@ -4007 +4013 @@
                 k = surf_usm_h%k(m)
 
-                IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets ) THEN
+                IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN
                     k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                     k2 = 0.61_wp * pt(k,j,i)
-                ELSE IF ( cloud_physics )  THEN
+                ELSE IF ( bulk_cloud_model )  THEN
                     IF ( ql(k,j,i) == 0.0_wp )  THEN
                        k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                        k2 = 0.61_wp * pt(k,j,i)
                     ELSE
-                       theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                       temp  = theta * t_d_pt(k)
+                       theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                       temp  = theta * exner(k)
                        k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *                    &
                                      ( q(k,j,i) - ql(k,j,i) ) *                &
-                            ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /           &
-                            ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *             &
+                            ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /         &
+                            ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *          &
                             ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                       k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                       k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                    ENDIF
                 ELSE IF ( cloud_droplets )  THEN
@@ -4047 +4053 @@
 
 
-                IF ( .NOT. cloud_physics .AND. .NOT. cloud_droplets )  THEN
+                IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets )  THEN
                    k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                    k2 = 0.61_wp * pt(k,j,i)
-                ELSE IF ( cloud_physics )  THEN
+                ELSE IF ( bulk_cloud_model )  THEN
                    IF ( ql(k,j,i) == 0.0_wp )  THEN
                       k1 = 1.0_wp + 0.61_wp * q(k,j,i)
                       k2 = 0.61_wp * pt(k,j,i)
                    ELSE
-                      theta = pt(k,j,i) + pt_d_t(k) * l_d_cp * ql(k,j,i)
-                      temp  = theta * t_d_pt(k)
+                      theta = pt(k,j,i) + d_exner(k) * lv_d_cp * ql(k,j,i)
+                      temp  = theta * exner(k)
                       k1 = ( 1.0_wp - q(k,j,i) + 1.61_wp *                     &
                                  ( q(k,j,i) - ql(k,j,i) ) *                    &
-                        ( 1.0_wp + 0.622_wp * l_d_r / temp ) ) /               &
-                        ( 1.0_wp + 0.622_wp * l_d_r * l_d_cp *                 &
+                        ( 1.0_wp + 0.622_wp * lv_d_rd / temp ) ) /             &
+                        ( 1.0_wp + 0.622_wp * lv_d_rd * lv_d_cp *              &
                         ( q(k,j,i) - ql(k,j,i) ) / ( temp * temp ) )
-                      k2 = theta * ( l_d_cp / temp * k1 - 1.0_wp )
+                      k2 = theta * ( lv_d_cp / temp * k1 - 1.0_wp )
                    ENDIF
                 ELSE IF ( cloud_droplets )  THEN
@@ -4100 +4106 @@
         ONLY:  ddx2, ddy2
 
-    USE microphysics_mod,                                                      &
+    USE bulk_cloud_model_mod,                                                  &
         ONLY:  collision_turbulence
 
@@ -4237 +4243 @@
         ONLY:  ddx2, ddy2
         
-    USE microphysics_mod,                                                      &
+    USE bulk_cloud_model_mod,                                                  &
         ONLY:  collision_turbulence
 
@@ -4476 +4482 @@
 
     USE control_parameters,                                                    &
-        ONLY:  atmos_ocean_sign, g, use_single_reference_value,                &
+        ONLY:  atmos_ocean_sign, use_single_reference_value,                   &
                wall_adjustment, wall_adjustment_factor
 
@@ -4533 +4539 @@
 
     USE control_parameters,                                                    &
-        ONLY:  atmos_ocean_sign, g, use_single_reference_value
+        ONLY:  atmos_ocean_sign, use_single_reference_value
 
     IMPLICIT NONE

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -331 +334 @@
 #if ! defined( __nopointer )
     USE arrays_3d,                                                             &
-        ONLY:  dzu, hyp, zu, pt, pt_1, pt_2, p, u, v, w, hyp, tend
+        ONLY:  dzu, hyp, zu, pt, pt_1, pt_2, p, u, v, w, hyp, tend, exner
 #endif
 
-    USE cloud_parameters,                                                      &
-        ONLY:  cp, r_d
-
-    USE constants,                                                             &
-        ONLY:  pi
-    
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  c_p, g, kappa, pi, r_d
+
     USE control_parameters,                                                    &
         ONLY:  coupling_start_time, topography, dt_3d, humidity,               &
@@ -346 +346 @@
                timestep_scheme, tsc, coupling_char, io_blocks, io_group,       &
                message_string, time_since_reference_point, surface_pressure,   &
-               g, pt_surface, large_scale_forcing, lsf_surf, spinup,           &
+               pt_surface, large_scale_forcing, lsf_surf, spinup,              &
                spinup_pt_mean, spinup_time, time_do3d, dt_do3d,                &
-               average_count_3d, varnamelength, urban_surface, kappa,          &
+               average_count_3d, varnamelength, urban_surface,                 &
                plant_canopy
 
@@ -376 +376 @@
         ONLY:  albedo_type, radiation_interaction, calc_zenith, zenith,        &
                radiation, rad_sw_in, rad_lw_in, rad_sw_out, rad_lw_out,        &
-               sigma_sb, solar_constant, sun_direction, sun_dir_lat,           &
-               sun_dir_lon,                                                    &
+               sigma_sb, sun_direction, sun_dir_lat, sun_dir_lon,              &
                force_radiation_call, surfinsw, surfinlw, surfinswdir,          &
                surfinswdif, surfoutsw, surfoutlw, surfins,nsvfl, svf, svfsurf, &
@@ -3603 +3602 @@
         REAL(wp)     ::  ground_floor_level_l         !< local height of ground floor level
         REAL(wp)     ::  z_agl                        !< height above ground
-        REAL(wp), DIMENSION(nzb:nzt)   ::  exn        !< value of the Exner function in layers
 
 !
@@ -4690 +4688 @@
         IF ( TRIM( initializing_actions ) /= 'read_restart_data'  .AND.        &
              TRIM( initializing_actions ) /= 'cyclic_fill' )  THEN
-       
-!--         Calculate initial surface temperature from pt of adjacent gridbox
-#if ! defined( __nopointer )
-            exn(nzb:nzt) = (hyp(nzb:nzt) / 100000.0_wp )**0.286_wp          !< Exner function
-#endif
 
 !
@@ -4705 +4698 @@
                k = surf_usm_h%k(m)
 
-               t_surf_h(m) = pt(k,j,i) * exn(k)
-               t_surf_window_h(m) = pt(k,j,i) * exn(k)
-               t_surf_green_h(m) = pt(k,j,i) * exn(k)
-               surf_usm_h%pt_surface(m) = pt(k,j,i) * exn(k)
+               t_surf_h(m) = pt(k,j,i) * exner(k)
+               t_surf_window_h(m) = pt(k,j,i) * exner(k)
+               t_surf_green_h(m) = pt(k,j,i) * exner(k)
+               surf_usm_h%pt_surface(m) = pt(k,j,i) * exner(k)
             ENDDO
 !
@@ -4718 +4711 @@
                   k = surf_usm_v(l)%k(m)
 
-                  t_surf_v(l)%t(m) = pt(k,j,i) * exn(k)
-                  t_surf_window_v(l)%t(m) = pt(k,j,i) * exn(k)
-                  t_surf_green_v(l)%t(m) = pt(k,j,i) * exn(k)
-                  surf_usm_v(l)%pt_surface(m) = pt(k,j,i) * exn(k)
+                  t_surf_v(l)%t(m) = pt(k,j,i) * exner(k)
+                  t_surf_window_v(l)%t(m) = pt(k,j,i) * exner(k)
+                  t_surf_green_v(l)%t(m) = pt(k,j,i) * exner(k)
+                  surf_usm_v(l)%pt_surface(m) = pt(k,j,i) * exner(k)
                ENDDO
             ENDDO
@@ -7338 +7331 @@
         REAL(wp)                              :: lambda_surface_window !< current value of lambda_surface (heat conductivity between air and window)
         REAL(wp)                              :: lambda_surface_green  !< current value of lambda_surface (heat conductivity between air and greeb wall)
-        REAL(wp), DIMENSION(nzb:nzt)          :: exn                !< value of the Exner function in layers
         
         REAL(wp)                              :: dtime              !< simulated time of day (in UTC)
@@ -7345 +7337 @@
 
 
-#if ! defined( __nopointer )
-        exn(nzb:nzt) = (hyp(nzb:nzt) / 100000.0_wp )**0.286_wp          !< Exner function
-#endif
 !        
 !--     First, treat horizontal surface elements
@@ -7371 +7360 @@
 #if ! defined( __nopointer )
 !
-!--        calculate rho * cp coefficient at surface layer
-           rho_cp  = cp * hyp(k) / ( r_d * surf_usm_h%pt1(m) * exn(k) )
+!--        calculate rho * c_p coefficient at surface layer
+           rho_cp  = c_p * hyp(k) / ( r_d * surf_usm_h%pt1(m) * exner(k) )
 #endif
 !
@@ -7387 +7376 @@
            surf_usm_h%r_a_green(m)  = surf_usm_h%r_a(m)
 
-!            r_a = ( surf_usm_h%pt1(m) - t_surf_h(m) / exn(k) ) /                              &
+!            r_a = ( surf_usm_h%pt1(m) - t_surf_h(m) / exner(k) ) /                              &
 !                  ( surf_usm_h%ts(m) * surf_usm_h%us(m) + 1.0E-20_wp )
-!            r_a_window = ( surf_usm_h%pt1(m) - t_surf_window_h(m) / exn(k) ) /                &
+!            r_a_window = ( surf_usm_h%pt1(m) - t_surf_window_h(m) / exner(k) ) /                &
 !                  ( surf_usm_h%ts(m) * surf_usm_h%us(m) + 1.0E-20_wp )
-!            r_a_green = ( surf_usm_h%pt1(m) - t_surf_green_h(m) / exn(k) ) /                  &
+!            r_a_green = ( surf_usm_h%pt1(m) - t_surf_green_h(m) / exner(k) ) /                  &
 !                  ( surf_usm_h%ts(m) * surf_usm_h%us(m) + 1.0E-20_wp )
                 
@@ -7446 +7435 @@
            coef_2 = 4.0_wp * surf_usm_h%emissivity(ind_veg_wall,m) *           &
                              sigma_sb * t_surf_h(m) ** 3                       &
-                           + lambda_surface + f_shf / exn(k)
+                           + lambda_surface + f_shf / exner(k)
            coef_window_2 = 4.0_wp * surf_usm_h%emissivity(ind_wat_win,m) *     &
                              sigma_sb * t_surf_window_h(m) ** 3                &
-                           + lambda_surface_window + f_shf_window / exn(k)
+                           + lambda_surface_window + f_shf_window / exner(k)
            coef_green_2 = 4.0_wp * surf_usm_h%emissivity(ind_pav_green,m) *    &
                              sigma_sb * t_surf_green_h(m) ** 3                 &
-                           + lambda_surface_green + f_shf_green / exn(k)
+                           + lambda_surface_green + f_shf_green / exner(k)
 
 !--        implicit solution when the surface layer has no heat capacity,
@@ -7480 +7469 @@
                                + surf_usm_h%frac(ind_wat_win,m) * t_surf_window_h_p(m)   &
                                + surf_usm_h%frac(ind_pav_green,m) * t_surf_green_h_p(m) )  &
-                               / exn(k)
+                               / exner(k)
                                
            IF ( humidity )  surf_usm_h%vpt_surface(m) =                        &
@@ -7540 +7529 @@
 !
 !--        ground/wall/roof surface heat flux
-           surf_usm_h%wshf_eb(m)   = - f_shf  * ( surf_usm_h%pt1(m) - t_surf_h_p(m) / exn(k) ) *               &
+           surf_usm_h%wshf_eb(m)   = - f_shf  * ( surf_usm_h%pt1(m) - t_surf_h_p(m) / exner(k) ) *               &
                                        surf_usm_h%frac(ind_veg_wall,m)         &
-                                     - f_shf_window  * ( surf_usm_h%pt1(m) - t_surf_window_h_p(m) / exn(k) ) * &
+                                     - f_shf_window  * ( surf_usm_h%pt1(m) - t_surf_window_h_p(m) / exner(k) ) * &
                                        surf_usm_h%frac(ind_wat_win,m)          &
-                                     - f_shf_green  * ( surf_usm_h%pt1(m) - t_surf_green_h_p(m) / exn(k) ) *   &
+                                     - f_shf_green  * ( surf_usm_h%pt1(m) - t_surf_green_h_p(m) / exner(k) ) *   &
                                        surf_usm_h%frac(ind_pav_green,m)
 !           
 !--        store kinematic surface heat fluxes for utilization in other processes
 !--        diffusion_s, surface_layer_fluxes,...
-           surf_usm_h%shf(m) = surf_usm_h%wshf_eb(m) / cp
+           surf_usm_h%shf(m) = surf_usm_h%wshf_eb(m) / c_p
 
        ENDDO
@@ -7573 +7562 @@
 #if ! defined( __nopointer )          
 !
-!--          calculate rho * cp coefficient at surface layer
-             rho_cp  = cp * hyp(k) / ( r_d * surf_usm_v(l)%pt1(m) * exn(k) )
+!--          calculate rho * c_p coefficient at surface layer
+             rho_cp  = c_p * hyp(k) / ( r_d * surf_usm_v(l)%pt1(m) * exner(k) )
 #endif
 
@@ -7647 +7636 @@
               coef_2 = 4.0_wp * surf_usm_v(l)%emissivity(ind_veg_wall,m) *     &
                                 sigma_sb * t_surf_v(l)%t(m) ** 3               &
-                              + lambda_surface + f_shf / exn(k)
+                              + lambda_surface + f_shf / exner(k)
               coef_window_2 = 4.0_wp * surf_usm_v(l)%emissivity(ind_wat_win,m) *&
                                 sigma_sb * t_surf_window_v(l)%t(m) ** 3        &
-                              + lambda_surface_window + f_shf / exn(k)
+                              + lambda_surface_window + f_shf / exner(k)
               coef_green_2 = 4.0_wp * surf_usm_v(l)%emissivity(ind_pav_green,m) *&
                                 sigma_sb * t_surf_green_v(l)%t(m) ** 3         &
-                              + lambda_surface_green + f_shf / exn(k)
+                              + lambda_surface_green + f_shf / exner(k)
 
 !--           implicit solution when the surface layer has no heat capacity,
@@ -7684 +7673 @@
                                       + surf_usm_v(l)%frac(ind_wat_win,m) * t_surf_window_v_p(l)%t(m)  &
                                       + surf_usm_v(l)%frac(ind_pav_green,m) * t_surf_green_v_p(l)%t(m) ) &
-                                      / exn(k) 
+                                      / exner(k)
                                       
               IF ( humidity )  surf_usm_v(l)%vpt_surface(m) =                  &
@@ -7751 +7740 @@
               surf_usm_v(l)%wshf_eb(m)   =                                     &
                  - f_shf  * ( surf_usm_v(l)%pt1(m) -                           &
-                 t_surf_v_p(l)%t(m) / exn(k) ) * surf_usm_v(l)%frac(ind_veg_wall,m)       &
+                 t_surf_v_p(l)%t(m) / exner(k) ) * surf_usm_v(l)%frac(ind_veg_wall,m)       &
                  - f_shf_window  * ( surf_usm_v(l)%pt1(m) -                    &
-                 t_surf_window_v_p(l)%t(m) / exn(k) ) * surf_usm_v(l)%frac(ind_wat_win,m)&
+                 t_surf_window_v_p(l)%t(m) / exner(k) ) * surf_usm_v(l)%frac(ind_wat_win,m)&
                  - f_shf_green  * ( surf_usm_v(l)%pt1(m) -                     &
-                 t_surf_green_v_p(l)%t(m) / exn(k) ) * surf_usm_v(l)%frac(ind_pav_green,m)
+                 t_surf_green_v_p(l)%t(m) / exner(k) ) * surf_usm_v(l)%frac(ind_pav_green,m)
 
 !           
 !--           store kinematic surface heat fluxes for utilization in other processes
 !--           diffusion_s, surface_layer_fluxes,...
-              surf_usm_v(l)%shf(m) = surf_usm_v(l)%wshf_eb(m) / cp
+              surf_usm_v(l)%shf(m) = surf_usm_v(l)%wshf_eb(m) / c_p
 
            ENDDO
@@ -7790 +7779 @@
                          (dtime/3600.0_wp-REAL(dhour,wp))*aheatprof(k,dhour+1)
                  IF ( aheat(k,j,i) > 0.0_wp )  THEN
-                    pt(k,j,i) = pt(k,j,i) + aheat(k,j,i)*acoef*dt_3d/(exn(k)*rho_cp*dzu(k))
+                    pt(k,j,i) = pt(k,j,i) + aheat(k,j,i)*acoef*dt_3d/(exner(k)*rho_cp*dzu(k))
                  ENDIF
               ENDIF

palm/trunk/SOURCE/uv_exposure_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -77 +80 @@
 !------------------------------------------------------------------------------!
  MODULE uv_exposure_model_mod
- 
+
+
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  pi
 
     USE kinds
@@ -640 +646 @@
 !> Module-specific routine for new module
 !------------------------------------------------------------------------------!
- SUBROUTINE uvem_solar_position 
-
-    USE constants,                                                             &
-       ONLY:  pi
+ SUBROUTINE uvem_solar_position
     
     USE date_and_time_mod,                                                     &
@@ -713 +716 @@
 !------------------------------------------------------------------------------!
  SUBROUTINE uvem_calc_exposure
-    
-    USE constants,                                                             &
-        ONLY:  pi
 
     USE indices,                                                               &

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

palm/trunk/SOURCE/wind_turbine_model_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -175 +178 @@
         ONLY:  tend, u, v, w, zu, zw
 
-    USE constants,                                                             &
+    USE basic_constants_and_equations_mod,                                     &
         ONLY:  pi
 

palm/trunk/SOURCE/write_restart_data_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3065 2018-06-12 07:03:02Z Giersch
 ! New parameters concerning vertical grid stretching have been added
 ! 
@@ -109 +112 @@
            ONLY:  nx, ny, nz
 
-       USE microphysics_mod,                                                   &
-           ONLY:  c_sedimentation, cloud_water_sedimentation,                  &
-                  collision_turbulence, limiter_sedimentation, nc_const,       &
-                  ventilation_effect
+       USE bulk_cloud_model_mod,                                               &
+           ONLY:  bulk_cloud_model, bcm_wrd_global
 
        USE model_1d_mod,                                                       &
@@ -264 +265 @@
        WRITE ( 14 )  building_wall_south
 
-       CALL wrd_write_string( 'c_sedimentation' ) 
-       WRITE ( 14 )  c_sedimentation
-
        CALL wrd_write_string( 'call_psolver_at_all_substeps' ) 
        WRITE ( 14 )  call_psolver_at_all_substeps
@@ -291 +289 @@
        WRITE ( 14 )  cloud_droplets
 
-       CALL wrd_write_string( 'cloud_physics' ) 
-       WRITE ( 14 )  cloud_physics
-
-       CALL wrd_write_string( 'cloud_scheme' ) 
-       WRITE ( 14 )  cloud_scheme
-
        CALL wrd_write_string( 'cloud_top_radiation' ) 
        WRITE ( 14 )  cloud_top_radiation
 
-       CALL wrd_write_string( 'cloud_water_sedimentation' ) 
-       WRITE ( 14 )  cloud_water_sedimentation
-
        CALL wrd_write_string( 'collective_wait' ) 
        WRITE ( 14 )  collective_wait
-
-       CALL wrd_write_string( 'collision_turbulence' ) 
-       WRITE ( 14 )  collision_turbulence
 
        CALL wrd_write_string( 'conserve_volume_flow' ) 
@@ -455 +441 @@
        WRITE ( 14 )  latitude
 
-       CALL wrd_write_string( 'limiter_sedimentation' ) 
-       WRITE ( 14 )  limiter_sedimentation
-
        CALL wrd_write_string( 'longitude' )
        WRITE ( 14 )  longitude 
@@ -487 +470 @@
        WRITE ( 14 )  most_method
 
-       CALL wrd_write_string( 'nc_const' ) 
-       WRITE ( 14 )  nc_const
-
        CALL wrd_write_string( 'netcdf_precision' ) 
        WRITE ( 14 )  netcdf_precision
@@ -537 +517 @@
        CALL wrd_write_string( 'prandtl_number' ) 
        WRITE ( 14 )  prandtl_number
-
-       CALL wrd_write_string( 'precipitation' ) 
-       WRITE ( 14 )  precipitation
 
        CALL wrd_write_string( 'psolver' )
@@ -848 +825 @@
        WRITE ( 14 )  v_max_ijk
 
-       CALL wrd_write_string( 'ventilation_effect' ) 
-       WRITE ( 14 )  ventilation_effect
-
        CALL wrd_write_string( 'vg' ) 
        WRITE ( 14 )  vg
@@ -927 +901 @@
 !-- The order of the calls can be different as in read_restart_data_mod where
 !-- the restart data will be read 
+
+!
+!-- If required, write restart data for gust module.
+       IF ( bulk_cloud_model )  CALL bcm_wrd_global
 !
 !-- If required, write restart data for wind turbine model.
@@ -962 +940 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  e, kh, km, p, pt, q, ql, qc, nc, nr, prr,                    &
-                  precipitation_amount, qr, s, sa, u, u_m_l, u_m_n, u_m_r,     &
+           ONLY:  e, kh, km, p, pt, q, ql, s, sa, u, u_m_l, u_m_n, u_m_r,      &
                   u_m_s, v, v_m_l, v_m_n, v_m_r, v_m_s, vpt, w, w_m_l, w_m_n,  &
                   w_m_r, w_m_s
         
        USE averaging
+
+       USE bulk_cloud_model_mod,                                               &
+           ONLY:  bulk_cloud_model, bcm_wrd_local
 
        USE chemistry_model_mod,                                                &
@@ -980 +960 @@
        USE land_surface_model_mod,                                             &
            ONLY:  lsm_wrd_local
-        
+
        USE particle_attributes,                                                &
            ONLY:  iran_part
@@ -1078 +1058 @@
        ENDIF
 
-       IF ( ALLOCATED( prr ) )  THEN
-          CALL wrd_write_string( 'prr' ) 
-          WRITE ( 14 )  prr
-       ENDIF
-
-       IF ( ALLOCATED( prr_av ) )  THEN
-          CALL wrd_write_string( 'prr_av' ) 
-          WRITE ( 14 )  prr_av
-       ENDIF
-
-       IF ( ALLOCATED( precipitation_amount ) )  THEN
-          CALL wrd_write_string( 'precipitation_amount' ) 
-          WRITE ( 14 )  precipitation_amount
-       ENDIF
-
        CALL wrd_write_string( 'pt' ) 
        WRITE ( 14 )  pt
@@ -1111 +1076 @@
           ENDIF
 
-          IF ( cloud_physics  .OR.  cloud_droplets )  THEN
-
-             CALL wrd_write_string( 'ql' ) 
+          IF ( cloud_droplets )  THEN
+
+             CALL wrd_write_string( 'ql' )
              WRITE ( 14 )  ql
 
              IF ( ALLOCATED( ql_av ) )  THEN
-                CALL wrd_write_string( 'ql_av' ) 
+                CALL wrd_write_string( 'ql_av' )
                 WRITE ( 14 )  ql_av
              ENDIF
 
-             IF ( .NOT. cloud_droplets )  THEN
-
-                CALL wrd_write_string( 'qc' ) 
-                WRITE ( 14 )  qc
-
-                IF ( ALLOCATED( qc_av ) )  THEN
-                   CALL wrd_write_string( 'qc_av' ) 
-                   WRITE ( 14 )  qc_av
-                ENDIF
-
-                IF ( microphysics_morrison )  THEN
-
-                   CALL wrd_write_string( 'nc' ) 
-                   WRITE ( 14 )  nc
-
-                   IF ( ALLOCATED( nc_av ) )  THEN
-                      CALL wrd_write_string( 'nc_av' ) 
-                      WRITE ( 14 )  nc_av
-                   ENDIF
-
-                ENDIF
-
-                IF ( microphysics_seifert )  THEN
-
-                   CALL wrd_write_string( 'nr' ) 
-                   WRITE ( 14 )  nr
-
-                   IF ( ALLOCATED( nr_av ) )  THEN
-                      CALL wrd_write_string( 'nr_av' ) 
-                      WRITE ( 14 )  nr_av
-                   ENDIF
-
-                   CALL wrd_write_string( 'qr' ) 
-                   WRITE ( 14 )  qr
-
-                   IF ( ALLOCATED( qr_av ) )  THEN
-                      CALL wrd_write_string( 'qr_av' ) 
-                      WRITE ( 14 )  qr_av
-                   ENDIF
-
-                ENDIF
-             ENDIF
           ENDIF
 
@@ -1387 +1310 @@
 
 !
+!-- If required, write restart data for microphysics module.
+       IF ( bulk_cloud_model )  THEN
+          CALL bcm_wrd_local
+       ENDIF
+
+!
 !-- Write surface-related restart data.
        CALL surface_wrd_local