Changeset 4750 for palm/trunk/SOURCE/time_integration_spinup.f90

Timestamp:

Oct 16, 2020 2:27:48 PM (4 years ago)

Author:

suehring

Message:

Indoor-model new: Namelist parameter added to switch-off/on the indoor model during wall/soil spinup; bugfixes concerning indoor model: bugfix in window-wall treatment during spinup - in the urban-surface model the window fraction is set to zero during spinup, so it is done here also; bugfix in wall treatment - inner wall temperature was too low due to wrong weighting of wall/green/window fractions; Revision of 10-cm temperature at vertical walls - assume grid-cell temperature rather than employ MOST; call hourly-based indoor model only once per hour during spinup, not every timestep; add missing dependency in Makefile; urban-surface model: bugfix in openmp directive

File:

• palm/trunk/SOURCE/time_integration_spinup.f90 (modified) (4 diffs)

palm/trunk/SOURCE/time_integration_spinup.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - bugfix, call hourly-based indoor model only once per hour, not every timestep.
+! - optionally switch-off/on the indoor model during spinup
+!
+! 4687 2020-09-21 19:40:16Z maronga
 ! Indoor model is now available during spinup
 !
@@ -110 +114 @@
                constant_flux_layer,                                                                &
                coupling_start_time,                                                                &
-               current_timestep_number,                                                            &
                data_output_during_spinup,                                                          &
                debug_output_timestep,                                                              &
@@ -167 +170 @@
 
     USE indoor_model_mod,                                                                          &
-        ONLY:  dt_indoor, im_main_heatcool, time_indoor
+        ONLY:  dt_indoor,                                                                          &
+               im_main_heatcool,                                                                   &
+               indoor_during_spinup,                                                               &
+               time_indoor
 
     USE land_surface_model_mod,                                                                    &
@@ -490 +496 @@
 !--    Note, at first timestep indoor model is called, in order to provide
 !--    a waste heat flux.
-       IF ( indoor_model )  THEN
+       IF ( indoor_model  .AND.  indoor_during_spinup )  THEN
 
           time_indoor = time_indoor + dt_3d
 
-          IF ( time_indoor >= dt_indoor  .OR.  current_timestep_number == 0 )  THEN
+          IF ( time_indoor >= dt_indoor  .OR.  current_timestep_number_spinup == 0 )  THEN
 
              time_indoor = time_indoor - dt_indoor