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

palm/trunk/SOURCE/write_3d_binary.f90

@@ -100 +100 @@
         ONLY:  e, kh, km, ol, p, pt, q, ql, qc, nr, nrs, nrsws, nrswst,        &
                prr, precipitation_amount, qr,                                  &
-               qrs, qrsws, qrswst, qs, qsws, qswst, sa, saswsb, saswst,        &
-               rif_wall, shf, ts, tswst, u, u_m_l, u_m_n, u_m_r, u_m_s, us,    &
-               usws, uswst, v, v_m_l, v_m_n, v_m_r, v_m_s, vpt, vsws, vswst,   &
-               w, w_m_l, w_m_n, w_m_r, w_m_s, z0, z0h, z0q
+               qrs, qrsws, qrswst, qs, qsws, qswst, s, sa, ssws, sswst,        &
+               saswsb, saswst, rif_wall, shf, ss, ts, tswst, u, u_m_l, u_m_n,  &
+               u_m_r, u_m_s, us, usws, uswst, v, v_m_l, v_m_n, v_m_r, v_m_s,   &
+               vpt, vsws, vswst, w, w_m_l, w_m_n, w_m_r, w_m_s, z0, z0h, z0q
         
     USE averaging
@@ -237 +237 @@
        WRITE ( 14 )  'pt_av               ';  WRITE ( 14 )  pt_av
     ENDIF
-    IF ( humidity  .OR. passive_scalar )  THEN
+    IF ( humidity )  THEN
        WRITE ( 14 )  'q                   ';  WRITE ( 14 )  q 
        IF ( ALLOCATED( q_av ) )  THEN
@@ -277 +277 @@
        WRITE ( 14 )  'qswst               ';  WRITE ( 14 ) qswst
     ENDIF
+    IF ( passive_scalar )  THEN
+       WRITE ( 14 )  's                   ';  WRITE ( 14 )  s 
+       IF ( ALLOCATED( s_av ) )  THEN
+          WRITE ( 14 )  's_av                ';  WRITE ( 14 )  s_av
+       ENDIF
+       WRITE ( 14 )  'ss                  ';  WRITE ( 14 )  ss
+       WRITE ( 14 )  'ssws                ';  WRITE ( 14 )  ssws
+       IF ( ALLOCATED( ssws_av ) )  THEN
+          WRITE ( 14 )  'ssws_av             ';  WRITE ( 14 )  ssws_av
+       ENDIF
+       WRITE ( 14 )  'sswst               ';  WRITE ( 14 ) sswst
+    ENDIF    
     IF ( land_surface )  THEN
        IF ( ALLOCATED( qsws_eb_av ) )  THEN