Ignore:
Timestamp:
Dec 14, 2017 5:12:51 PM (4 years ago)
Author:
kanani
Message:

Merge of branch palm4u into trunk

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

  • palm/trunk/SOURCE

  • palm/trunk/SOURCE/time_integration_spinup.f90

    r2544 r2696  
    11!> @file time_integration_spinup.f90
    22!------------------------------------------------------------------------------!
    3 ! This file is part of PALM.
     3! This file is part of the PALM model system.
    44!
    55! PALM is free software: you can redistribute it and/or modify it under the
     
    2525! -----------------
    2626! $Id$
     27! Added radiation interactions (moved from USM) (MS)
     28!
     29! 2544 2017-10-13 18:09:32Z maronga
    2730! Date and time quantities are now read from date_and_time_mod
    2831!
     
    8790    USE radiation_model_mod,                                                   &
    8891        ONLY:  dt_radiation, force_radiation_call, radiation,                  &
    89                radiation_control, rad_sw_in, time_radiation
     92               radiation_control, rad_sw_in, time_radiation,                   &
     93               radiation_interaction, radiation_interactions
    9094
    9195    USE statistics,                                                            &
     
    101105    USE urban_surface_mod,                                                     &
    102106        ONLY:  usm_material_heat_model, usm_material_model,                    &
    103                usm_radiation, usm_surface_energy_balance, usm_swap_timelevel
     107               usm_surface_energy_balance, usm_swap_timelevel,                 &
     108               usm_green_heat_model, usm_temperature_near_surface
    104109
    105110
     
    274279                CALL usm_surface_energy_balance
    275280                IF ( usm_material_model )  THEN
     281                   CALL usm_green_heat_model
    276282                   CALL usm_material_heat_model
     283                ENDIF
     284                IF ( urban_surface ) THEN
     285                   CALL usm_temperature_near_surface
    277286                ENDIF
    278287                CALL cpu_log( log_point(74), 'urban_surface', 'stop' )
     
    301310                CALL cpu_log( log_point(50), 'radiation', 'stop' )
    302311
    303                 IF (urban_surface)  THEN
    304                    CALL cpu_log( log_point(75), 'usm_radiation', 'start' )
    305                    CALL usm_radiation
    306                    CALL cpu_log( log_point(75), 'usm_radiation', 'stop' )
     312                IF ( radiation_interactions )  THEN
     313                   CALL cpu_log( log_point(75), 'radiation_interaction', 'start' )
     314                   CALL radiation_interaction
     315                   CALL cpu_log( log_point(75), 'radiation_interaction', 'stop' )
    307316                ENDIF
    308317             ENDIF
Note: See TracChangeset for help on using the changeset viewer.