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

Timestamp:

Dec 28, 2018 5:58:49 PM (5 years ago)

Author:

kanani

Message:

Bugfix: replace simulated_time by time_since_reference_point where required

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: use time_since_reference_point instead of simulated_time where
+! required (relevant when using wall/soil spinup)
+! 
+! 3634 2018-12-18 12:31:28Z knoop
 ! OpenACC port for SPEC
 ! 
@@ -915 +919 @@
 !--       to regard droplet interactions directly
           IF ( particle_advection  .AND.                         &
-               simulated_time >= particle_advection_start  .AND. &
+               time_since_reference_point >= particle_advection_start  .AND. &
                intermediate_timestep_count == 1 )  THEN
              CALL lpm
@@ -1424 +1428 @@
 
 
-       IF ( simulated_time >= skip_time_data_output_av )  THEN
+       IF ( time_since_reference_point >= skip_time_data_output_av )  THEN
           time_do_av         = time_do_av       + dt_3d
        ENDIF
-       IF ( simulated_time >= skip_time_do2d_xy )  THEN
+       IF ( time_since_reference_point >= skip_time_do2d_xy )  THEN
           time_do2d_xy       = time_do2d_xy     + dt_3d
        ENDIF
-       IF ( simulated_time >= skip_time_do2d_xz )  THEN
+       IF ( time_since_reference_point >= skip_time_do2d_xz )  THEN
           time_do2d_xz       = time_do2d_xz     + dt_3d
        ENDIF
-       IF ( simulated_time >= skip_time_do2d_yz )  THEN
+       IF ( time_since_reference_point >= skip_time_do2d_yz )  THEN
           time_do2d_yz       = time_do2d_yz     + dt_3d
        ENDIF
-       IF ( simulated_time >= skip_time_do3d    )  THEN
+       IF ( time_since_reference_point >= skip_time_do3d    )  THEN
           time_do3d          = time_do3d        + dt_3d
        ENDIF
        DO  mid = 1, masks
-          IF ( simulated_time >= skip_time_domask(mid) )  THEN
+          IF ( time_since_reference_point >= skip_time_domask(mid) )  THEN
              time_domask(mid)= time_domask(mid) + dt_3d
           ENDIF
        ENDDO
        time_dvrp          = time_dvrp        + dt_3d
-       IF ( simulated_time >= skip_time_dosp )  THEN
+       IF ( time_since_reference_point >= skip_time_dosp )  THEN
           time_dosp       = time_dosp        + dt_3d
        ENDIF
@@ -1452 +1456 @@
           time_dopts      = time_dopts       + dt_3d
        ENDIF
-       IF ( simulated_time >= skip_time_dopr )  THEN
+       IF ( time_since_reference_point >= skip_time_dopr )  THEN
           time_dopr       = time_dopr        + dt_3d
        ENDIF
@@ -1460 +1464 @@
 !--    Increment time-counter for surface output
        IF ( surface_data_output )  THEN
-          IF ( simulated_time >= skip_time_dosurf )  THEN
+          IF ( time_since_reference_point >= skip_time_dosurf )  THEN
              time_dosurf    = time_dosurf + dt_3d
           ENDIF
-          IF ( simulated_time >= skip_time_dosurf_av )  THEN
+          IF ( time_since_reference_point >= skip_time_dosurf_av )  THEN
              time_dosurf_av = time_dosurf_av + dt_3d
           ENDIF
@@ -1552 +1556 @@
        IF ( averaging_interval_pr /= 0.0_wp  .AND.  &
             ( dt_dopr - time_dopr ) <= averaging_interval_pr  .AND.  &
-            simulated_time >= skip_time_dopr )  THEN
+            time_since_reference_point >= skip_time_dopr )  THEN
           time_dopr_av = time_dopr_av + dt_3d
           IF ( time_dopr_av >= dt_averaging_input_pr )  THEN
@@ -1566 +1570 @@
        IF ( averaging_interval /= 0.0_wp  .AND.                                &
             ( dt_data_output_av - time_do_av ) <= averaging_interval  .AND. &
-            simulated_time >= skip_time_data_output_av )                    &
+            time_since_reference_point >= skip_time_data_output_av )                    &
        THEN
           time_do_sla = time_do_sla + dt_3d
@@ -1580 +1584 @@
           IF ( averaging_interval_surf /= 0.0_wp  .AND.                        & 
                ( dt_dosurf_av - time_dosurf_av ) <= averaging_interval_surf    &
-          .AND.  simulated_time >= skip_time_dosurf_av )  THEN
+          .AND.  time_since_reference_point >= skip_time_dosurf_av )  THEN
              IF ( time_dosurf_av >= dt_averaging_input )  THEN        
                 CALL surface_output_averaging
@@ -1592 +1596 @@
        IF ( averaging_interval_sp /= 0.0_wp  .AND.  &
             ( dt_dosp - time_dosp ) <= averaging_interval_sp  .AND.  &
-            simulated_time >= skip_time_dosp )  THEN
+            time_since_reference_point >= skip_time_dosp )  THEN
           time_dosp_av = time_dosp_av + dt_3d
           IF ( time_dosp_av >= dt_averaging_input_pr )  THEN
@@ -1706 +1710 @@
        IF ( particle_advection )  THEN
           IF ( time_dopts >= dt_dopts  .OR. &
-               ( simulated_time >= particle_advection_start  .AND. &
+               ( time_since_reference_point >= particle_advection_start  .AND. &
                  first_call_lpm ) )  THEN
              CALL data_output_ptseries