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

Timestamp:

Sep 9, 2020 1:43:47 PM (4 years ago)

Author:

pavelkrc

Message:

Fix multiple issues with radiation call times

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - Fix missing call of radiation after spinup
+! - Fix calculation of force_radiation_call
+! - Fix calculation of radiation times
+!
+! 4668 2020-09-09 13:00:16Z pavelkrc
 ! Improve debug messages during timestepping
 ! 
@@ -1194 +1199 @@
 !
 !--    If required, calculate radiative fluxes and heating rates
-       IF ( radiation  .AND.  time_since_reference_point > skip_time_do_radiation )  THEN
+       IF ( radiation  .AND.  time_since_reference_point >= skip_time_do_radiation )  THEN
 
           time_radiation = time_radiation + dt_3d
@@ -1202 +1207 @@
              CALL cpu_log( log_point(50), 'radiation', 'start' )
 
-             IF ( .NOT. force_radiation_call )  THEN
+             IF ( time_radiation >= dt_radiation )  THEN
                 time_radiation = time_radiation - dt_radiation
              ENDIF
@@ -1211 +1216 @@
 !--          solar positions
              time_since_reference_point_save = time_since_reference_point
-             time_since_reference_point = REAL( FLOOR( time_since_reference_point /             &
-                                                       dt_radiation ), wp ) * dt_radiation
+             time_since_reference_point = time_since_reference_point -                            &
+                                          MODULO(time_since_reference_point, dt_radiation)
 
              CALL radiation_control
@@ -1225 +1230 @@
 !--          Return the current time to its original value
              time_since_reference_point = time_since_reference_point_save
+!
+!--          Reset forcing of radiation call
+             force_radiation_call = .FALSE.
 
              CALL cpu_log( log_point(50), 'radiation', 'stop' )