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

Timestamp:

Oct 12, 2018 3:17:09 PM (6 years ago)

Author:

kanani

Message:

reintegrate branch resler to trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• average_3d_data.f90 (modified) (5 diffs)

palm/trunk/SOURCE/average_3d_data.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! (from resler branch)
+! Add biometeorology output,
+! fix for chemistry output,
+! move of urban surface output
+! 
+! 3294 2018-10-01 02:37:10Z raasch
 ! changes concerning modularization of ocean option
 ! 
@@ -174 +180 @@
         ONLY:  radiation, radiation_3d_data_averaging
 
+    USE biometeorology_mod,                                                    &
+        ONLY:  biometeorology_3d_data_averaging
+
     USE turbulence_closure_mod,                                                &
         ONLY:  tcm_3d_data_averaging
@@ -203 +212 @@
     DO  ii = 1, doav_n
 
-!
-!--    Temporary solution to account for data output within the new urban 
-!--    surface model (urban_surface_mod.f90), see also SELECT CASE ( trimvar )
        trimvar = TRIM( doav(ii) )
-       IF ( urban_surface  .AND.  trimvar(1:4) == 'usm_' )  THEN
-          trimvar = 'usm_output'
-       ENDIF
 
 !
@@ -533 +536 @@
              ENDIF
 
-          CASE ( 'usm_output' )
-!             
-!--          Block of urban surface model outputs
-             CALL usm_average_3d_data( 'average', doav(ii) )
-
           CASE DEFAULT
 !
 !--          Averaging of data from other modules
-             IF ( air_chemistry )  THEN
+             IF ( air_chemistry .AND. &
+                  (trimvar(1:3) == 'kc_' .OR. trimvar(1:3) == 'em_')  )  THEN
                 CALL chem_3d_data_averaging( 'average', doav(ii) )
              ENDIF
@@ -565 +564 @@
              ENDIF
 
+             IF ( radiation  .AND.  trimvar(1:4) == 'bio_' )  THEN
+                CALL biometeorology_3d_data_averaging( 'average', doav(ii) )
+             ENDIF
+
              CALL tcm_3d_data_averaging( 'average', doav(ii) )
+
+             IF ( urban_surface  .AND.  trimvar(1:4) == 'usm_' )  THEN
+                CALL usm_average_3d_data( 'average', doav(ii) )
+             ENDIF
+
 !
 !--          User-defined quantities