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

palm/trunk/SOURCE/swap_timelevel.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! icloud_scheme replaced by microphysics_*
 !
 ! Former revisions:
@@ -97 +97 @@
 
     USE control_parameters,                                                    &
-        ONLY:  cloud_physics, constant_diffusion, humidity, icloud_scheme,     &
-               neutral, ocean, passive_scalar, precipitation, timestep_count
+        ONLY:  cloud_physics, constant_diffusion, humidity,                    &
+               microphysics_seifert, neutral, ocean, passive_scalar,           &
+               timestep_count
 
     USE indices,                                                               &
@@ -160 +161 @@
     IF ( humidity  .OR.  passive_scalar )  THEN
        q = q_p             
-       IF ( cloud_physics  .AND.  icloud_scheme == 0 )  THEN
+       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
           qr = qr_p
           nr = nr_p
@@ -193 +194 @@
           IF ( humidity  .OR.  passive_scalar )  THEN
              q => q_1;    q_p => q_2
-             IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.  &
-                  precipitation )  THEN
+             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
                 qr => qr_1;    qr_p => qr_2
                 nr => nr_1;    nr_p => nr_2
@@ -222 +222 @@
           IF ( humidity  .OR.  passive_scalar )  THEN
              q => q_2;    q_p => q_1
-             IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.  &
-                  precipitation)  THEN
+             IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
                 qr => qr_2;    qr_p => qr_1
                 nr => nr_2;    nr_p => nr_1