Changeset 1822 for palm/trunk/SOURCE/surface_layer_fluxes.f90

Timestamp:

Apr 7, 2016 7:49:42 AM (9 years ago)

Author:

hoffmann

Message:

changes in LPM and bulk cloud microphysics

File:

• palm/trunk/SOURCE/surface_layer_fluxes.f90 (modified) (4 diffs)

palm/trunk/SOURCE/surface_layer_fluxes.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! icloud_scheme replaced by microphysics_*
 ! 
 ! Former revisions:
@@ -134 +134 @@
     USE control_parameters,                                                    &
         ONLY:  cloud_physics, constant_heatflux, constant_waterflux,           &
-               coupling_mode, g, humidity, ibc_e_b, ibc_pt_b, icloud_scheme,   &
+               coupling_mode, g, humidity, ibc_e_b, ibc_pt_b,                  &
                initializing_actions, kappa, intermediate_timestep_count,       &
                intermediate_timestep_count_max, large_scale_forcing, lsf_surf, &
-               message_string, most_method, neutral, passive_scalar,           &
-               precipitation, pt_surface, q_surface, run_coupled,              &
+               message_string, microphysics_seifert, most_method, neutral,     &
+               passive_scalar, pt_surface, q_surface, run_coupled,             &
                surface_pressure, simulated_time, terminate_run, zeta_max,      &
                zeta_min 
@@ -906 +906 @@
 !
 !--    If required compute qr* and nr*
-       IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.  precipitation )   &
+       IF ( cloud_physics  .AND.  microphysics_seifert )   &
        THEN
 
@@ -1040 +1040 @@
 !
 !--    Compute (turbulent) fluxes of rain water content and rain drop conc.
-       IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.                    &
-            precipitation )  THEN
+       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
           !$OMP PARALLEL DO
           !$acc kernels loop independent present( nrs, nrsws, qrs, qrsws, us )