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

revert workarounds for Intel ICC 19.x

Browse Source
This commit is contained in:
Axel Kohlmeyer
2025-01-12 20:13:24 -05:00
parent 4519489f8b
commit c476e6704b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/timer.cpp
View File

@ -15,6 +15,7 @@
#include "comm.h" #include "comm.h"
#include "error.h" #include "error.h"
#include "fmt/chrono.h"
#include "tokenizer.h" #include "tokenizer.h"
#include <cstring> #include <cstring>
@ -259,10 +260,8 @@ 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.0) { if (_timeout >= 0.0) {
std::time_t to = (std::time_t) _timeout; std::tm tv = fmt::gmtime((std::time_t) _timeout);
std::tm *tv = std::gmtime(&to); timeout = fmt::format("{:02d}:{:%M:%S}", tv.tm_yday * 24 + tv.tm_hour, tv);
timeout = fmt::format("{:02d}:{:02d}:{:02d}", tv->tm_yday * 24 + tv->tm_hour, tv->tm_min,
tv->tm_sec);
} }
utils::logmesg(lmp, "New timer settings: style={} mode={} timeout={}\n", timer_style[_level], utils::logmesg(lmp, "New timer settings: style={} mode={} timeout={}\n", timer_style[_level],

2
src/utils.cpp
View File

@ -1804,7 +1804,7 @@ std::string utils::current_date()
{ {
time_t tv = time(nullptr); time_t tv = time(nullptr);
std::tm today = fmt::localtime(tv); std::tm today = fmt::localtime(tv);
return fmt::format("{:04d}-{:02d}-{:02d}", 1900 + today.tm_year, 1 + today.tm_mon, today.tm_mday); return fmt::format("{:%Y-%m-%d}", today);
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------