Changeset 3569 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Nov 27, 2018 5:03:40 PM (5 years ago)

Author:

kanani

Message:

Fix for biomet output (ticket:757), merge of uv_exposure into biometeorology_mod

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! dom_dwd_user, Schrempf:
+! Changes due to merge of uv exposure model into biometeorology_mod.
+!
+! 3525 2018-11-14 16:06:14Z kanani
 ! Changes related to clean-up of biometeorology (dom_dwd_user)
 ! 
@@ -415 +419 @@
 
     USE biometeorology_mod,                                                    &
-        ONLY:  bio_calculate_thermal_index_maps, time_bio_results
+        ONLY:  bio_calculate_thermal_index_maps, time_bio_results,             &
+               thermal_comfort, uvem_calc_exposure, uv_exposure
 
     USE bulk_cloud_model_mod,                                                  &
@@ -468 +473 @@
                turbulent_inflow, turbulent_outflow, urban_surface,             &
                use_initial_profile_as_reference,                               &
-               use_single_reference_value, uv_exposure, u_gtrans, v_gtrans,    &
+               use_single_reference_value, u_gtrans, v_gtrans,                 &
                virtual_flight, virtual_measurement, wind_turbine,              &
                ws_scheme_mom, ws_scheme_sca
@@ -579 +584 @@
         ONLY:  user_actions
 
-    USE uv_exposure_model_mod,                                                 &
-        ONLY:  uvem_calc_exposure
 
     USE wind_turbine_model_mod,                                                &
@@ -1254 +1257 @@
           ENDIF
        ENDIF
-!
-!--    If required, do UV exposure calculations
-       IF ( uv_exposure )  THEN
-          CALL uvem_calc_exposure
-       ENDIF
+
 !
 !--    If required, calculate indoor temperature, waste heat, heat flux
@@ -1366 +1365 @@
 !--    Biometeorology calculation of stationary thermal indices
        IF ( biometeorology  .AND.  time_do3d >= dt_do3d )  THEN
-          CALL bio_calculate_thermal_index_maps ( .FALSE. )
-          time_bio_results = time_since_reference_point
+!
+!--       If required, do thermal comfort calculations
+          IF ( thermal_comfort )  THEN
+             CALL bio_calculate_thermal_index_maps ( .FALSE. )
+             time_bio_results = time_since_reference_point
+          ENDIF
+!
+!--       If required, do UV exposure calculations
+          IF ( uv_exposure )  THEN
+             CALL uvem_calc_exposure
+          ENDIF
        ENDIF