ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reapply changes to the timer class that got lost somehow

Browse Source
This commit is contained in:
Axel Kohlmeyer
2016-10-18 14:05:08 -04:00
parent 3e88fb5355
commit 2c5ea9fc61
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/timer.cpp
View File

@ -95,10 +95,10 @@ Timer::Timer(LAMMPS *lmp) : Pointers(lmp)
{
_level = NORMAL;
_sync = OFF;
_timeout = -1.0;
_timeout = -1;
_s_timeout = -1;
_checkfreq = 10;
_nextcheck = -1;
_laststep = -1;
this->_stamp(RESET);
}
@ -216,7 +216,7 @@ void Timer::set_wall(enum ttype which, double newtime)
void Timer::init_timeout()
{
_laststep = -1;
_s_timeout = _timeout;
if (_timeout < 0)
_nextcheck = -1;
else
@ -249,14 +249,6 @@ void Timer::print_timeout(FILE *fp)
/* ---------------------------------------------------------------------- */
void Timer::force_timeout()
{
_timeout = 0.0;
_nextcheck = _laststep + 1;
}
/* ---------------------------------------------------------------------- */
bool Timer::_check_timeout()
{
double walltime = MPI_Wtime() - timeout_start;