Changeset e31b3b5 in flexpart.git for src/timemanager_mpi.f90

Timestamp:

Apr 7, 2016, 9:04:32 AM (8 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

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

Children:

32b49c3

Parents:

8ed5f11 (diff), ec7fc72 (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:

Merge branch 'flux' into dev

File:

• src/timemanager_mpi.f90 (modified) (3 diffs)

src/timemanager_mpi.f90

@@ -494 +494 @@
           if (mp_measure_time) call mpif_mtime('iotime',1)
 
-! :TODO: Correct calling of conc_surf above?
-
-!   call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
-! endif
-
           if (nested_output.eq.1) then
 
@@ -694 +689 @@
 
         if (mp_measure_time) call mpif_mtime('advance',0)
-!mp_advance_wtime_beg = mpi_wtime()
 
         call advance(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), &
@@ -701 +695 @@
 
         if (mp_measure_time) call mpif_mtime('advance',1)
-
-        ! mp_advance_wtime_end = mpi_wtime()
-        ! mp_advance_wtime_total = mp_advance_wtime_total + (mp_advance_wtime_end - &
-        !      & mp_advance_wtime_beg)