Changeset 2696 for palm/trunk/SOURCE/time_integration_spinup.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/time_integration_spinup.f90 (modified) (6 diffs)

palm/trunk/SOURCE/time_integration_spinup.f90

@@ -1 +1 @@
 !> @file time_integration_spinup.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$
+! Added radiation interactions (moved from USM) (MS)
+! 
+! 2544 2017-10-13 18:09:32Z maronga
 ! Date and time quantities are now read from date_and_time_mod 
 ! 
@@ -87 +90 @@
     USE radiation_model_mod,                                                   &
         ONLY:  dt_radiation, force_radiation_call, radiation,                  &
-               radiation_control, rad_sw_in, time_radiation 
+               radiation_control, rad_sw_in, time_radiation,                   &
+               radiation_interaction, radiation_interactions
 
     USE statistics,                                                            &
@@ -101 +105 @@
     USE urban_surface_mod,                                                     &
         ONLY:  usm_material_heat_model, usm_material_model,                    &
-               usm_radiation, usm_surface_energy_balance, usm_swap_timelevel
+               usm_surface_energy_balance, usm_swap_timelevel,                 &
+               usm_green_heat_model, usm_temperature_near_surface
 
 
@@ -274 +279 @@
                 CALL usm_surface_energy_balance
                 IF ( usm_material_model )  THEN
+                   CALL usm_green_heat_model
                    CALL usm_material_heat_model
+                ENDIF
+                IF ( urban_surface ) THEN
+                   CALL usm_temperature_near_surface
                 ENDIF
                 CALL cpu_log( log_point(74), 'urban_surface', 'stop' )
@@ -301 +310 @@
                 CALL cpu_log( log_point(50), 'radiation', 'stop' )
 
-                IF (urban_surface)  THEN
-                   CALL cpu_log( log_point(75), 'usm_radiation', 'start' )
-                   CALL usm_radiation
-                   CALL cpu_log( log_point(75), 'usm_radiation', 'stop' )
+                IF ( radiation_interactions )  THEN
+                   CALL cpu_log( log_point(75), 'radiation_interaction', 'start' )
+                   CALL radiation_interaction
+                   CALL cpu_log( log_point(75), 'radiation_interaction', 'stop' )
                 ENDIF
              ENDIF