Changes in src/timemanager_mpi.f90 [ec7fc72:8ed5f11] in flexpart.git

File:

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

src/timemanager_mpi.f90

@@ -228 +228 @@
     if (mp_measure_time.and..not.(lmpreader.and.lmp_use_reader)) call mpif_mtime('getfields',0)
 
+! Two approaches to MPI getfields is implemented:
 ! Version 1 (lmp_sync=.true.) uses a read-ahead process where send/recv is done
 ! in sync at start of each new field time interval
+!
+! Version 2 (lmp_sync=.false.) is for holding three fields in memory. Uses a
+! read-ahead process where sending/receiving of the 3rd fields is done in
+! the background in parallel with performing computations with fields 1&2
+!********************************************************************************
+
     if (lmp_sync.and.lmp_use_reader.and.memstat.gt.0) then
       call mpif_gf_send_vars(memstat)
       if (numbnests>0) call mpif_gf_send_vars_nest(memstat)
-! Version 2  (lmp_sync=.false., see below) is also used whenever 2 new fields are
+! Version 2  (lmp_sync=.false.) is also used whenever 2 new fields are
 ! read (as at first time step), in which case async send/recv is impossible.
     else if (.not.lmp_sync.and.lmp_use_reader.and.memstat.ge.32) then
@@ -240 +247 @@
     end if
 
-! Version 2 (lmp_sync=.false.) is for holding three fields in memory. Uses a
-! read-ahead process where sending/receiving of the 3rd fields is done in
-! the background in parallel with performing computations with fields 1&2
-!********************************************************************************
     if (.not.lmp_sync) then
     
-! READER PROCESS:
+! Reader process:
       if (memstat.gt.0..and.memstat.lt.32.and.lmp_use_reader.and.lmpreader) then
         if (mp_dev_mode) write(*,*) 'Reader process: calling mpif_gf_send_vars_async' 
@@ -252 +255 @@
       end if
 
-! COMPLETION CHECK:
+! Completion check:
 ! Issued at start of each new field period. 
       if (memstat.ne.0.and.memstat.lt.32.and.lmp_use_reader) then
@@ -258 +261 @@
       end if
 
-! RECVEIVING PROCESS(ES):
-      ! eso TODO: at this point we do not know if clwc/ciwc will be available
-      ! at next time step. Issue receive request anyway, cancel at mpif_gf_request
+! Recveiving process(es):
+! eso TODO: at this point we do not know if clwc/ciwc will be available
+! at next time step. Issue receive request anyway, cancel at mpif_gf_request
       if (memstat.gt.0.and.lmp_use_reader.and..not.lmpreader) then
         if (mp_dev_mode) write(*,*) 'Receiving process: calling mpif_gf_send_vars_async. PID: ', mp_pid
@@ -490 +493 @@
           endif
           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
@@ -686 +694 @@
 
         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), &
@@ -692 +701 @@
 
         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)