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

add units metadata check to legacy potential file reading method

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-06-16 06:36:26 -04:00
parent b5a809413e
commit 37a0999826
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/force.cpp
View File

@ -34,6 +34,7 @@
#include "improper.h" #include "improper.h"
#include "kspace.h" #include "kspace.h"
#include "error.h" #include "error.h"
#include "update.h"
#include "utils.h" #include "utils.h"
#include "fmt/format.h" #include "fmt/format.h"
@ -1013,15 +1014,20 @@ tagint Force::tnumeric(const char *file, int line, char *str)
FILE *Force::open_potential(const char *name) FILE *Force::open_potential(const char *name)
{ {
std::string filepath = utils::get_potential_file_path(name); std::string filepath = utils::get_potential_file_path(name);
std::string date;
if(!filepath.empty()) { if(!filepath.empty()) {
date = utils::get_potential_date(filepath, "potential"); std::string unit_style = update->unit_style;
std::string date = utils::get_potential_date(filepath, "potential");
std::string units = utils::get_potential_units(filepath, "potential");
if(!date.empty()) { if(!date.empty()) {
utils::logmesg(lmp, fmt::format("Reading potential file {} " utils::logmesg(lmp, fmt::format("Reading potential file {} "
"with DATE: {}\n", name, date)); "with DATE: {}\n", name, date));
} }
if (!units.empty() && (units != unit_style)) {
error->one(FLERR, fmt::format("Potential file {} requires {} units "
"but {} units are in use", name, units, unit_style));
}
return fopen(filepath.c_str(), "r"); return fopen(filepath.c_str(), "r");
} }
return nullptr; return nullptr;