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

Merge branch 'master' into prepare-clang-format

Browse Source 
# Conflicts:
#	src/MOLECULE/bond_fene.h
#	src/MOLECULE/bond_fene_expand.h
This commit is contained in:
Axel Kohlmeyer
2021-05-11 21:49:48 -04:00
parent d1941392d3 ee546e2fa3
commit d8291eea7b
205 changed files with 16072 additions and 8024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/timer.cpp
View File

@ -16,6 +16,7 @@
#include "comm.h"
#include "error.h"
#include "fmt/chrono.h"
#include <cstring>
@ -27,8 +28,6 @@
#include <sys/resource.h>
#endif
#include <ctime>
using namespace LAMMPS_NS;
@ -287,15 +286,13 @@ void Timer::modify_params(int narg, char **arg)
if (comm->me == 0) {
// format timeout setting
char timebuf[32];
if (_timeout < 0) strcpy(timebuf,"off");
else {
time_t tv = _timeout;
struct tm *tm = gmtime(&tv);
strftime(timebuf,32,"%H:%M:%S",tm);
std::string timeout = "off";
if (_timeout >= 0) {
std::time_t tv = _timeout;
timeout = fmt::format("{:%H:%M:%S}", fmt::gmtime(tv));
}
utils::logmesg(lmp,"New timer settings: style={} mode={} timeout={}\n",
timer_style[_level],timer_mode[_sync],timebuf);
timer_style[_level],timer_mode[_sync],timeout);
}
}