Changeset 1960 for palm/trunk/SOURCE/time_integration.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/time_integration.f90 (modified) (9 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Separate humidity and passive scalar
 ! 
 ! Former revisions:
@@ -225 +225 @@
     USE arrays_3d,                                                             &
         ONLY:  diss, dzu, e, e_p, nr_p, prho, pt, pt_p, pt_init, q_init, q,    &
-               ql, ql_c, ql_v, ql_vp, qr_p, q_p, ref_state, rho, sa_p, tend,   &
-               u, u_p, v, vpt, v_p, w, w_p
+               ql, ql_c, ql_v, ql_vp, qr_p, q_p, ref_state, rho, s, s_p, sa_p, &
+               tend, u, u_p, v, vpt, v_p, w, w_p
 
     USE calc_mean_profile_mod,                                                 &
@@ -532 +532 @@
                    CALL exchange_horiz( sa_p, nbgp )
                    CALL exchange_horiz( rho, nbgp )
-                  CALL exchange_horiz( prho, nbgp )
-                ENDIF
-                IF (humidity  .OR.  passive_scalar)  THEN
+                   CALL exchange_horiz( prho, nbgp )
+                ENDIF
+                IF ( humidity )  THEN
                    CALL exchange_horiz( q_p, nbgp )
                    IF ( cloud_physics .AND. microphysics_seifert )  THEN
@@ -551 +551 @@
                    CALL exchange_horiz( diss, nbgp )
                 ENDIF
+                IF ( passive_scalar )  CALL exchange_horiz( s_p, nbgp )
 
                 IF ( numprocs == 1 )  THEN    ! workaround for single-core GPU runs
@@ -601 +602 @@
                   CALL exchange_horiz( prho, nbgp )
                 ENDIF
-                IF (humidity  .OR.  passive_scalar)  THEN
+                IF ( humidity )  THEN
                    CALL exchange_horiz( q_p, nbgp )
                    IF ( cloud_physics .AND. microphysics_seifert )  THEN
@@ -618 +619 @@
                    CALL exchange_horiz( diss, nbgp )
                 ENDIF
+                IF ( passive_scalar )  CALL exchange_horiz( s_p, nbgp )
 
                 IF ( numprocs == 1 )  THEN    ! workaround for single-core GPU runs
@@ -690 +692 @@
                 CALL exchange_horiz( prho, nbgp )
              ENDIF
-             IF (humidity  .OR.  passive_scalar)  THEN
+             IF ( humidity )  THEN
                 CALL exchange_horiz( q_p, nbgp )
                 IF ( cloud_physics .AND. microphysics_seifert )  THEN
@@ -707 +709 @@
                 CALL exchange_horiz( diss, nbgp )
              ENDIF
+             IF ( passive_scalar )  CALL exchange_horiz( s_p, nbgp )      
 
              IF ( numprocs == 1 )  THEN    ! workaround for single-core GPU runs
@@ -746 +749 @@
                 CALL exchange_horiz( v, nbgp )
                 CALL exchange_horiz( w, nbgp )
-                IF ( .NOT. neutral )  THEN
-                   CALL exchange_horiz( pt, nbgp )
-                ENDIF
-                IF ( humidity  .OR.  passive_scalar )  THEN
-                   CALL exchange_horiz( q, nbgp )
-                ENDIF
-                IF ( .NOT. constant_diffusion )  CALL exchange_horiz( e, nbgp )
+                IF ( .NOT. neutral            )  CALL exchange_horiz( pt, nbgp )
+                IF ( humidity                 )  CALL exchange_horiz( q, nbgp  )
+                IF ( passive_scalar           )  CALL exchange_horiz( s, nbgp  )
+                IF ( .NOT. constant_diffusion )  CALL exchange_horiz( e, nbgp  )
              ENDIF
 !