Changeset 1960 for palm/trunk/SOURCE/swap_timelevel.f90

Timestamp:

Jul 12, 2016 4:34:24 PM (8 years ago)

Author:

suehring

Message:

Separate balance equations for humidity and passive_scalar

File:

• palm/trunk/SOURCE/swap_timelevel.f90 (modified) (8 diffs)

palm/trunk/SOURCE/swap_timelevel.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! Separate humidity and passive scalar
 !
 ! Former revisions:
@@ -83 +83 @@
 #if defined( __nopointer )
     USE arrays_3d,                                                             &
-        ONLY:  e, e_p, nr, nr_p, pt, pt_p, q, q_p, qr, qr_p, sa, sa_p, u, u_p, &
-               v, v_p, w, w_p
+        ONLY:  e, e_p, nr, nr_p, pt, pt_p, q, q_p, qr, qr_p, s, s_p, sa, sa_p, &
+               u, u_p, v, v_p, w, w_p
 #else
     USE arrays_3d,                                                             &
         ONLY:  e, e_1, e_2, e_p, nr, nr_1, nr_2, nr_p, pt, pt_1, pt_2, pt_p, q,&
-               q_1, q_2, q_p, qr, qr_1, qr_2, qr_p, sa, sa_1, sa_2, sa_p, u,   &
-               u_1, u_2, u_p, v, v_1, v_2, v_p, w, w_1, w_2, w_p
+               q_1, q_2, q_p, qr, qr_1, qr_2, qr_p, s, s_1, s_2, s_p, sa, sa_1,&
+               sa_2, sa_p, u, u_1, u_2, u_p, v, v_1, v_2, v_p, w, w_1, w_2, w_p
 
 #endif
@@ -162 +162 @@
        sa = sa_p
     ENDIF
-    IF ( humidity  .OR.  passive_scalar )  THEN
+    IF ( humidity )  THEN
        q = q_p             
        IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
@@ -169 +169 @@
        ENDIF
     ENDIF
+    IF ( passive_scalar )  s = s_p             
 
     IF ( land_surface )  THEN
@@ -195 +196 @@
              sa => sa_1;  sa_p => sa_2
           ENDIF
-          IF ( humidity  .OR.  passive_scalar )  THEN
+          IF ( humidity )  THEN
              q => q_1;    q_p => q_2
              IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
@@ -202 +203 @@
              ENDIF
           ENDIF
+          IF ( passive_scalar )  THEN
+             s => s_1;    s_p => s_2
+          ENDIF
 
           IF ( land_surface )  THEN
@@ -223 +227 @@
              sa => sa_2;  sa_p => sa_1
           ENDIF
-          IF ( humidity  .OR.  passive_scalar )  THEN
+          IF ( humidity )  THEN
              q => q_2;    q_p => q_1
              IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
@@ -230 +234 @@
              ENDIF
           ENDIF
+          IF ( passive_scalar )  THEN
+             s => s_2;    s_p => s_1
+          ENDIF
 
           IF ( land_surface )  THEN