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

support that LAMMPS_POTENTIALS is a real path variable with multiple entries, not just a single folder

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-08-29 22:09:07 -04:00
parent 05ff352021
commit 5a22f4d7f2
3 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/utils.cpp
View File

@ -16,6 +16,7 @@
#include <cstdlib>
#include <cerrno>
#include "lammps.h"
#include "comm.h"
#include "compute.h"
#include "error.h"
#include "fix.h"
@ -23,6 +24,7 @@
#include "modify.h"
#include "tokenizer.h"
#include "text_file_reader.h"
#include "update.h"
#include "fmt/format.h"
#if defined(__linux__)
@ -822,6 +824,11 @@ bool utils::file_is_readable(const std::string &path) {
search current directory and the LAMMPS_POTENTIALS directory if
specified
------------------------------------------------------------------------- */
#if defined(_WIN32)
#define OS_PATH_VAR_SEP ";"
#else
#define OS_PATH_VAR_SEP ":"
#endif
std::string utils::get_potential_file_path(const std::string &path) {
std::string filepath = path;
@ -831,19 +838,25 @@ std::string utils::get_potential_file_path(const std::string &path) {
return filepath;
} else {
// try the environment variable directory
const char *path = getenv("LAMMPS_POTENTIALS");
const char *var = getenv("LAMMPS_POTENTIALS");
if (path != nullptr){
std::string pot = utils::path_basename(filepath);
filepath = utils::path_join(path, pot);
if (var != nullptr){
Tokenizer dirs(var,OS_PATH_VAR_SEP);
if (utils::file_is_readable(filepath)) {
return filepath;
while (dirs.has_next()) {
auto pot = utils::path_basename(filepath);
auto path = dirs.next();
filepath = utils::path_join(path, pot);
if (utils::file_is_readable(filepath)) {
return filepath;
}
}
}
}
return "";
}
#undef OS_PATH_VAR_SEP
/* ----------------------------------------------------------------------
read first line of potential file