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

palm/trunk/SOURCE/data_output_dvrp.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Separate humidity and passive scalar
 ! 
 ! Former revisions:
@@ -112 +112 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  p, pt, q, ql, ts, u, us, v, w, zu
+        ONLY:  p, pt, q, ql, s, ts, u, us, v, w, zu
         
     USE cloud_parameters,                                                      &
@@ -336 +336 @@
 
                 CASE ( 'q', 'q_xy', 'q_xz', 'q_yz' )
-                   IF ( humidity  .OR.  passive_scalar )  THEN
+                   IF ( humidity )  THEN
                       DO  i = nxl_dvrp, nxr_dvrp+1
                          DO  j = nys_dvrp, nyn_dvrp+1
@@ -345 +345 @@
                       ENDDO            
                    ELSE                    
-                      message_string = 'if humidity/passive_scalar = '    //   & 
+                      message_string = 'if humidity = '    //                  & 
                             'FALSE output of ' // TRIM( output_variable ) //   &
                             'is not provided' 
@@ -366 +366 @@
                                   'is not provided' 
                       CALL message( 'data_output_dvrp', 'PA0184',&
+                                                                 0, 0, 0, 6, 0 )
+                   ENDIF
+
+                CASE ( 's', 's_xy', 's_xz', 's_yz' )
+                   IF ( passive_scalar )  THEN
+                      DO  i = nxl_dvrp, nxr_dvrp+1
+                         DO  j = nys_dvrp, nyn_dvrp+1
+                            DO  k = nzb, nz_do3d
+                               local_pf(i,j,k) = s(k,j,i)
+                            ENDDO
+                         ENDDO
+                      ENDDO            
+                   ELSE                    
+                      message_string = 'if passive_scalar = '    //            & 
+                            'FALSE output of ' // TRIM( output_variable ) //   &
+                            'is not provided' 
+                      CALL message( 'data_output_dvrp', 'PA0183',&
                                                                  0, 0, 0, 6, 0 )
                    ENDIF