Merge branch 'master' into reconnection

This commit is contained in:
Grzegorz Kowal 2014-10-14 13:13:23 -03:00
commit 8871c7428f

View File

@ -274,9 +274,11 @@ module mpitools
! !
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
#ifdef MPI
! start time accounting for the MPI initialization ! start time accounting for the MPI initialization
! !
call start_timer(imi) call start_timer(imi)
#endif /* MPI */
! set the periodic flag ! set the periodic flag
! !
@ -387,11 +389,11 @@ module mpitools
pparity(3) = mod(pcoords(3), 2) pparity(3) = mod(pcoords(3), 2)
end if end if
#endif /* MPI */
! stop time accounting for the MPI initialization ! stop time accounting for the MPI initialization
! !
call stop_timer(imi) call stop_timer(imi)
#endif /* MPI */
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !