Changeset 2696 for palm/trunk/SOURCE/average_3d_data.f90

Timestamp:

Dec 14, 2017 5:12:51 PM (6 years ago)

Author:

kanani

Message:

Merge of branch palm4u into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/average_3d_data.f90 (modified) (6 diffs)

palm/trunk/SOURCE/average_3d_data.f90

@@ -1 +1 @@
 !> @file average_3d_data.f90
 !------------------------------------------------------------------------------!
-! This file is part of PALM.
+! This file is part of the PALM model system.
 !
 ! PALM is free software: you can redistribute it and/or modify it under the
@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Implement call for turbulence_closure_mod (TG)
+! Implementation of chemistry module (FK)
+! 
+! 2292 2017-06-20 09:51:42Z schwenkel
 ! Implementation of new microphysic scheme: cloud_scheme = 'morrison' 
 ! includes two more prognostic equations for cloud drop concentration (nc)  
@@ -112 +116 @@
     USE averaging
 
+#if defined( __chem )
+    USE chemistry_model_mod,                                                   &
+        ONLY:  chem_3d_data_averaging
+#endif
+
     USE control_parameters,                                                    &
-        ONLY:  average_count_3d, doav, doav_n, land_surface, urban_surface,    &
-               varnamelength
+        ONLY:  air_chemistry, average_count_3d, doav, doav_n, land_surface,    &
+               urban_surface, varnamelength
 
     USE cpulog,                                                                &
@@ -130 +139 @@
         ONLY:  radiation, radiation_3d_data_averaging
 
+    USE turbulence_closure_mod,                                                &
+        ONLY:  tcm_3d_data_averaging
+
     USE urban_surface_mod,                                                     &
         ONLY:  usm_average_3d_data
+
+
 
 
@@ -459 +473 @@
           CASE DEFAULT
 !
+!--          Turbulence closure module
+             CALL tcm_3d_data_averaging( 'average', doav(ii) )
+
+!
 !--          Land surface quantity
              IF ( land_surface )  THEN
                 CALL lsm_3d_data_averaging( 'average', doav(ii) )
              ENDIF
-
 !
 !--          Radiation quantity
@@ -469 +486 @@
                 CALL radiation_3d_data_averaging( 'average', doav(ii) )
              ENDIF
-
+!
+!--          Chemistry quantity
+#if defined( __chem )
+             IF ( air_chemistry )  THEN
+                CALL chem_3d_data_averaging( 'average', doav(ii) )
+             ENDIF
+#endif
 !
 !--          User-defined quantity