Changeset 3448 for palm/trunk/SOURCE/sum_up_3d_data.f90

Timestamp:

Oct 29, 2018 6:14:31 PM (5 years ago)

Author:

kanani

Message:

Implementation of human thermal indices (from branch biomet_p2 at r3444)

File:

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

palm/trunk/SOURCE/sum_up_3d_data.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Adjustment of biometeorology calls
+! 
+! 3421 2018-10-24 18:39:32Z gronemeier
 ! Renamed output variables
 ! 
@@ -236 +239 @@
         ONLY:  c_p, lv_d_cp, l_v
 
+    USE biometeorology_mod,                                                    &
+        ONLY:  biom_3d_data_averaging
+
     USE bulk_cloud_model_mod,                                                  &
         ONLY:  bulk_cloud_model, bcm_3d_data_averaging
@@ -243 +249 @@
 
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, average_count_3d, doav, doav_n, land_surface,    &
-               ocean_mode, rho_surface, urban_surface, uv_exposure,            &
-               varnamelength
+        ONLY:  air_chemistry, average_count_3d, biometeorology, doav, doav_n,  &
+               land_surface, ocean_mode, rho_surface, urban_surface,           &
+               uv_exposure, varnamelength
 
     USE cpulog,                                                                &
@@ -269 +275 @@
     USE radiation_model_mod,                                                   &
         ONLY:  radiation, radiation_3d_data_averaging
-
-    USE biometeorology_mod,                                                    &
-        ONLY:  biometeorology_3d_data_averaging
 
     USE surface_mod,                                                           &
@@ -517 +520 @@
                 ENDIF
 
-                IF ( radiation  .AND.  trimvar(1:4) == 'bio_' )  THEN
-                   CALL biometeorology_3d_data_averaging( 'allocate', doav(ii) )
-                ENDIF
-
                 IF ( gust_module_enabled )  THEN
                    CALL gust_3d_data_averaging( 'allocate', doav(ii) )
+                ENDIF
+
+                IF ( biometeorology  .AND.  trimvar(1:5) == 'biom_')  THEN
+                   CALL biom_3d_data_averaging( 'allocate', doav(ii) )
                 ENDIF
 
@@ -1165 +1168 @@
              ENDIF
 
-             IF ( radiation   .AND.  trimvar(1:4) == 'bio_')  THEN
-                CALL biometeorology_3d_data_averaging( 'sum', doav(ii) )
-             ENDIF
-
              IF ( gust_module_enabled )  THEN
                 CALL gust_3d_data_averaging( 'sum', doav(ii) )
+             ENDIF
+
+             IF ( biometeorology  .AND.  trimvar(1:5) == 'biom_' )  THEN
+                   CALL biom_3d_data_averaging( 'sum', doav(ii) )
              ENDIF