Changeset 3298 for palm/trunk/SOURCE/flow_statistics.f90

Timestamp:

Oct 2, 2018 12:21:11 PM (6 years ago)

Author:

kanani

Message:

Merge chemistry branch at r3297 to trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• flow_statistics.f90 (modified) (10 diffs)

palm/trunk/SOURCE/flow_statistics.f90

@@ -19 +19 @@
 !
 ! Current revisions:
-! -----------------
+! ------------------
 ! 
 ! 
@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - Minor formatting (kanani)
+! - Added  .AND. max_pr_cs > 0 before MPI_ALLREDUCE call (forkel)
+! - Data arrays, sums, sums_l, hom, hom_sum updated for chem species (basit)
+! - Directives of parallelism added for chemistry (basit)
+! - Call for chem_statistics added (basit)
+!
+! 3294 2018-10-01 02:37:10Z raasch
 ! ocean renamed ocean_mode
 ! 
@@ -283 +290 @@
 !------------------------------------------------------------------------------!
  SUBROUTINE flow_statistics
- 
+
 
     USE arrays_3d,                                                             &
@@ -291 +298 @@
                sa, u, ug, v, vg, vpt, w, w_subs, waterflux_output_conversion,  &
                zw, d_exner
-        
+
     USE basic_constants_and_equations_mod,                                     &
-        ONLY:   g, lv_d_cp
-        
+        ONLY:  g, lv_d_cp
+
+
+    USE chem_modules,                                                          &
+        ONLY:  max_pr_cs
+
+    USE chemistry_model_mod,                                                   &
+        ONLY:  chem_species, chem_statistics
+
     USE control_parameters,                                                    &
-        ONLY:   average_count_pr, cloud_droplets, do_sum,                      &
+        ONLY:   air_chemistry, average_count_pr, cloud_droplets, do_sum,       &
                 dt_3d, humidity, initializing_actions, land_surface,           &
                 large_scale_forcing, large_scale_subsidence, max_pr_user,      &
@@ -303 +317 @@
                 use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, &
                 ws_scheme_mom, ws_scheme_sca
-        
+
     USE cpulog,                                                                &
         ONLY:   cpu_log, log_point
-        
+
     USE grid_variables,                                                        &
         ONLY:   ddx, ddy
@@ -1780 +1794 @@
        ENDIF
 !
+!--    Calculate the chemistry module profiles
+       IF ( air_chemistry ) THEN
+          CALL chem_statistics( 'profiles', sr, tn )
+       ENDIF
+!
 !--    Calculate the user-defined profiles
        CALL user_statistics( 'profiles', sr, tn )
@@ -1797 +1816 @@
                                    sums_l(:,pr_palm+1:pr_palm+max_pr_user,i)
              ENDIF
+
+             IF ( air_chemistry )  THEN
+                IF ( max_pr_cs > 0 )  THEN                                 
+                     sums_l(:,pr_palm+max_pr_user+1:pr_palm + max_pr_user+ max_pr_cs,0) =          &
+                               sums_l(:,pr_palm+max_pr_user+1:pr_palm + max_pr_user+max_pr_cs,0) + &
+                               sums_l(:,pr_palm+max_pr_user+1:pr_palm + max_pr_user+max_pr_cs,i)
+
+                ENDIF
+             ENDIF
           ENDDO
        ENDIF
@@ -1811 +1839 @@
                               MPI_REAL, MPI_SUM, comm2d, ierr )
        ENDIF
+
+       IF ( air_chemistry .AND. max_pr_cs > 0 )  THEN
+          IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
+             CALL MPI_ALLREDUCE( sums_l(nzb,pr_palm+1,0), sums(nzb,pr_palm+1), &
+                                 nzt+2-nzb, MPI_REAL, MPI_SUM, comm2d, ierr )
+       ENDIF
+
 #else
        sums = sums_l(:,:,0)
@@ -1875 +1910 @@
                                     ngp_2dh_s_inner(k,sr)
           ENDDO
+       ENDIF
+
+       IF ( air_chemistry ) THEN
+          IF ( max_pr_cs > 0 )  THEN                  
+             DO k = nzb, nzt+1
+                sums(k, pr_palm+1:pr_palm+max_pr_user+max_pr_cs) = &
+                                 sums(k, pr_palm+1:pr_palm+max_pr_user+max_pr_cs) / &
+                                 ngp_2dh_s_inner(k,sr)
+             ENDDO
+          ENDIF  
        ENDIF
 
@@ -2018 +2063 @@
        ENDIF
 
+       IF ( air_chemistry )  THEN
+          IF ( max_pr_cs > 0 )  THEN    ! chem_spcs profiles      
+             hom(:, 1, pr_palm+max_pr_user+1:pr_palm + max_pr_user+max_pr_cs, sr) = &
+                               sums(:, pr_palm+max_pr_user+1:pr_palm+max_pr_user+max_pr_cs)
+          ENDIF
+       ENDIF
 !
 !--    Determine the boundary layer height using two different schemes.