Changeset 3224 for palm

Timestamp:

Aug 30, 2018 4:06:58 PM (6 years ago)

Author:

kanani

Message:

Fix for progress bar, minor changes

Location:

palm/trunk/SOURCE

Files:

• header.f90 (modified) (3 diffs)
• progress_bar_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/header.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Increase printed length of run identifier
 ! 
 ! Former revisions:
@@ -2057 +2057 @@
 101 FORMAT (35X,'coupled run: ',A/ &
             35X,42('-'))
-102 FORMAT (/' Date:                 ',A8,4X,'Run:       ',A20/      &
+102 FORMAT (/' Date:                 ',A8,4X,'Run:       ',A34/      &
             ' Time:                 ',A8,4X,'Run-No.:   ',I2.2/     &
             ' Run on host:        ',A10)
@@ -2477 +2477 @@
 511 FORMAT ('    Sedimentation Courant number:                  '/&
             '                               C_s   =',F4.1,'        ')
-512 FORMAT (/' Date:                 ',A8,6X,'Run:       ',A20/      &
+512 FORMAT (/' Date:                 ',A8,6X,'Run:       ',A34/      &
             ' Time:                 ',A8,6X,'Run-No.:   ',I2.2/     &
             ' Run on host:        ',A10,6X,'En-No.:    ',I2.2)

palm/trunk/SOURCE/progress_bar_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Increase printed length of run identifier,
+! bugfix for restarts
 ! 
 ! Former revisions:
@@ -61 +62 @@
 
     USE control_parameters,                                                    &
-        ONLY : end_time, run_identifier, simulated_time,                       &
+        ONLY : end_time, initializing_actions, run_identifier, simulated_time, &
                simulated_time_at_begin, spinup_time, time_restart
 
@@ -106 +107 @@
             time_restart > simulated_time_at_begin )  THEN
           time_to_be_simulated = time_restart - simulated_time_at_begin
+       ELSEIF ( initializing_actions == 'read_restart_data' )  THEN
+          time_to_be_simulated = end_time     - simulated_time_at_begin
        ELSE
           time_to_be_simulated = end_time     - simulated_time_at_begin        &
@@ -114 +117 @@
 
           CALL check_open ( 117 )
-          WRITE ( 117, FMT='(A20,/)' ) run_identifier
+          WRITE ( 117, FMT='(A34,/)' ) run_identifier
 
        ELSE
@@ -156 +159 @@
        IF ( .NOT. initialized )  CALL init_progress_bar
 
-
-       remaining_time_in_percent =                                             &
-          ( 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 ) )
+       IF ( initializing_actions == 'read_restart_data' )  THEN
+          remaining_time_in_percent =                                             &
+             ( simulated_time - simulated_time_at_begin )                         &
+             / time_to_be_simulated
+
+          remaining_time_in_percent_total = simulated_time / end_time
+       ELSE
+          remaining_time_in_percent =                                             &
+             ( 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 ) )
+       ENDIF
 
 !