Changeset 2753a5c in flexpart.git for src/timemanager.f90

Timestamp:

Dec 20, 2018, 2:55:22 PM (5 years ago)

Author:

Ignacio Pisso <ip@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug

Children:

7123c70

Parents:

df96ea65 (diff), 4ad96c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolved merging conflicts with GFS branch

File:

• src/timemanager.f90 (modified) (1 diff)

src/timemanager.f90

@@ -449 +449 @@
 
         !write(*,46) float(itime)/3600,itime,numpart
-45      format(i13,' SECONDS SIMULATED: ',i13, ' PARTICLES:    Uncertainty: ',3f7.3)
+45      format(i13,' Seconds simulated: ',i13, ' Particles:    Uncertainty: ',3f7.3)
 46      format(' Simulated ',f7.1,' hours (',i13,' s), ',i13, ' particles')
         if (ipout.ge.1) call partoutput(itime)    ! dump particle positions