Changeset 1438 for palm/trunk/SOURCE/data_output_mask.f90

Timestamp:

Jul 22, 2014 2:14:06 PM (11 years ago)

Author:

heinze

Message:

+nr, qc, qr for mask output

File:

• palm/trunk/SOURCE/data_output_mask.f90 (modified) (6 diffs)

palm/trunk/SOURCE/data_output_mask.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! +nr, qc, qr
 ! 
 ! Former revisions:
@@ -70 +70 @@
 #if defined( __netcdf )
     USE arrays_3d,                                                             &
-        ONLY:  e, p, pt, q, ql, ql_c, ql_v, rho, sa, tend, u, v, vpt, w
+        ONLY:  e, nr, p, pt, q, qc, ql, ql_c, ql_v, qr, rho, sa, tend, u,      &
+               v, vpt, w
     
     USE averaging,                                                             &
-        ONLY:  e_av, lpt_av, p_av, pc_av, pr_av, pt_av, q_av, ql_av, ql_c_av,  &
-               ql_v_av, ql_vp_av, qv_av, rho_av, s_av, sa_av, u_av, v_av,      &
-               vpt_av, w_av 
+        ONLY:  e_av, lpt_av, nr_av, p_av, pc_av, pr_av, pt_av, q_av, qc_av,    &
+               ql_av, ql_c_av, ql_v_av, ql_vp_av, qv_av, qr_av, rho_av, s_av,  &
+               sa_av, u_av, v_av, vpt_av, w_av 
     
     USE cloud_parameters,                                                      &
@@ -81 +82 @@
     
     USE control_parameters,                                                    &
-        ONLY:  cloud_physics, domask, domask_no, domask_time_count, mask_i,    &
-               mask_j, mask_k, mask_size, mask_size_l, mask_start_l,           &
-               max_masks, message_string, mid, netcdf_data_format,             &
-               nz_do3d, simulated_time
-    
+        ONLY:  cloud_physics, domask, domask_no, domask_time_count,            &
+               mask_i, mask_j, mask_k, mask_size, mask_size_l,                 &
+               mask_start_l, max_masks, message_string, mid,                   &
+               netcdf_data_format, nz_do3d, simulated_time
     USE cpulog,                                                                &
         ONLY:  cpu_log, log_point
+
+
     
     USE indices,                                                               &
@@ -192 +194 @@
              ELSE
                 to_be_resorted => lpt_av
+             ENDIF
+
+          CASE ( 'nr' )
+             IF ( av == 0 )  THEN
+                to_be_resorted => nr
+             ELSE
+                to_be_resorted => nr_av
              ENDIF
 
@@ -293 +302 @@
              ENDIF
 
+          CASE ( 'qc' )
+             IF ( av == 0 )  THEN
+                to_be_resorted => qc
+             ELSE
+                to_be_resorted => qc_av
+             ENDIF
+
           CASE ( 'ql' )
              IF ( av == 0 )  THEN
@@ -367 +383 @@
              ENDIF
 
+          CASE ( 'qr' )
+             IF ( av == 0 )  THEN
+                to_be_resorted => qr
+             ELSE
+                to_be_resorted => qr_av
+             ENDIF
+
           CASE ( 'rho' )
              IF ( av == 0 )  THEN