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

Timer::_timeout should be double and it should be allowed to have fractions.

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-06-29 03:43:26 -04:00
parent 8397738978
commit 246698d3c2
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/timer.cpp
View File

@ -28,8 +28,8 @@ Timer::Timer(LAMMPS *_lmp) : Pointers(_lmp)
{ {
_level = NORMAL; _level = NORMAL;
_sync = OFF; _sync = OFF;
_timeout = -1; _timeout = -1.0;
_s_timeout = -1; _s_timeout = -1.0;
_checkfreq = 10; _checkfreq = 10;
_nextcheck = -1; _nextcheck = -1;
this->_stamp(RESET); this->_stamp(RESET);
@ -251,7 +251,7 @@ void Timer::modify_params(int narg, char **arg)
// format timeout setting // format timeout setting
std::string timeout = "off"; std::string timeout = "off";
if (_timeout >= 0) { if (_timeout >= 0.0) {
std::tm tv = fmt::gmtime((std::time_t) _timeout); std::tm tv = fmt::gmtime((std::time_t) _timeout);
timeout = fmt::format("{:02d}:{:%M:%S}", tv.tm_yday * 24 + tv.tm_hour, tv); timeout = fmt::format("{:02d}:{:%M:%S}", tv.tm_yday * 24 + tv.tm_hour, tv);
} }

12
src/timer.h
View File

@ -110,12 +110,12 @@ class Timer : protected Pointers {
double previous_cpu; double previous_cpu;
double previous_wall; double previous_wall;
double timeout_start; double timeout_start;
int _level; // level of detail: off=0,loop=1,normal=2,full=3 double _timeout; // max allowed wall time in seconds. infinity if negative
int _sync; // if nonzero, synchronize tasks before setting the timer double _s_timeout; // copy of timeout for restoring after a forced timeout
int _timeout; // max allowed wall time in seconds. infinity if negative int _level; // level of detail: off=0,loop=1,normal=2,full=3
int _s_timeout; // copy of timeout for restoring after a forced timeout int _sync; // if nonzero, synchronize tasks before setting the timer
int _checkfreq; // frequency of timeout checking int _checkfreq; // frequency of timeout checking
int _nextcheck; // loop number of next timeout check int _nextcheck; // loop number of next timeout check
// update one specific timer array // update one specific timer array
void _stamp(enum ttype); void _stamp(enum ttype);

2
src/utils.cpp
View File

@ -1677,7 +1677,7 @@ double utils::timespec2seconds(const std::string &timespec)
try { try {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (!values.has_next()) break; if (!values.has_next()) break;
vals[i] = values.next_int(); vals[i] = values.next_double();
} }
} catch (TokenizerException &) { } catch (TokenizerException &) {
return -1.0; return -1.0;

10
unittest/utils/test_utils.cpp
View File

@ -1061,6 +1061,16 @@ TEST(Utils, timespec2seconds_hhmmss)
ASSERT_DOUBLE_EQ(utils::timespec2seconds("2:10:45"), 7845.0); ASSERT_DOUBLE_EQ(utils::timespec2seconds("2:10:45"), 7845.0);
} }
TEST(Utils, timespec2seconds_ssfraction)
{
ASSERT_DOUBLE_EQ(utils::timespec2seconds("5.2"), 5.2);
}
TEST(Utils, timespec2seconds_mmfraction)
{
ASSERT_DOUBLE_EQ(utils::timespec2seconds("2.5:10"), 160.0);
}
TEST(Utils, timespec2seconds_invalid) TEST(Utils, timespec2seconds_invalid)
{ {
ASSERT_DOUBLE_EQ(utils::timespec2seconds("2:aa:45"), -1.0); ASSERT_DOUBLE_EQ(utils::timespec2seconds("2:aa:45"), -1.0);