Changeset 2726

Timestamp:

Jan 8, 2018 5:40:52 PM (6 years ago)

Author:

kanani

Message:

Exclude spinup time from progress bar

File:

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

palm/trunk/SOURCE/progress_bar_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Exclude spinup time from progress bar 
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -59 +62 @@
     USE control_parameters,                                                    &
         ONLY : end_time, run_identifier, simulated_time,                       &
-               simulated_time_at_begin, time_restart
+               simulated_time_at_begin, spinup_time, time_restart
 
     USE, INTRINSIC ::  ISO_FORTRAN_ENV,                                        &
@@ -104 +107 @@
           time_to_be_simulated = time_restart - simulated_time_at_begin
        ELSE
-          time_to_be_simulated = end_time     - simulated_time_at_begin
+          time_to_be_simulated = end_time     - simulated_time_at_begin        &
+                                              - spinup_time
        ENDIF
 
@@ -154 +158 @@
 
        remaining_time_in_percent =                                             &
-          ( simulated_time - simulated_time_at_begin ) / time_to_be_simulated
-
-       remaining_time_in_percent_total = ( simulated_time / end_time )
+          ( simulated_time - simulated_time_at_begin - spinup_time )           &
+          / time_to_be_simulated
+
+       remaining_time_in_percent_total = ( ( simulated_time - spinup_time )    &
+                                         / ( end_time       - spinup_time ) )
 
 !