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

Timestamp:

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

Author:

hoffmann

Message:

changes in LPM and bulk cloud microphysics

File:

• palm/trunk/SOURCE/advec_ws.f90 (modified) (6 diffs)

palm/trunk/SOURCE/advec_ws.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! icloud_scheme removed, microphysics_seifert added
 ! 
 ! Former revisions:
@@ -222 +222 @@
 
        USE control_parameters,                                                 &
-           ONLY:  cloud_physics, humidity, icloud_scheme, loop_optimization,   &
-                  monotonic_adjustment, passive_scalar, precipitation, ocean,  &
-                  ws_scheme_mom, ws_scheme_sca
+           ONLY:  cloud_physics, humidity, loop_optimization,                  &
+                  monotonic_adjustment, passive_scalar, microphysics_seifert,  &
+                  ocean, ws_scheme_mom, ws_scheme_sca
 
        USE indices,                                                            &
@@ -274 +274 @@
           ENDIF
 
-          IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.                 &
-               precipitation )  THEN
+          IF ( cloud_physics  .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) )
@@ -331 +330 @@
              ENDIF
 
-             IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.              &
-                  precipitation )  THEN
+             IF ( cloud_physics  .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),           &
@@ -365 +363 @@
     
        USE control_parameters,                                                 &
-           ONLY:  cloud_physics, humidity, icloud_scheme, passive_scalar,      &
-                  precipitation, ocean, ws_scheme_mom, ws_scheme_sca
+           ONLY:  cloud_physics, humidity, passive_scalar, ocean,              &
+                  microphysics_seifert, ws_scheme_mom, ws_scheme_sca
 
        USE kinds
@@ -391 +389 @@
           sums_wspts_ws_l = 0.0_wp
           IF ( humidity  .OR.  passive_scalar )  sums_wsqs_ws_l = 0.0_wp
-          IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.                 &
-               precipitation )  THEN
+          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
              sums_wsqrs_ws_l = 0.0_wp
              sums_wsnrs_ws_l = 0.0_wp