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

19
src/utils.cpp
View File

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

9
unittest/utils/test_tokenizer.cpp
View File

@ -62,6 +62,15 @@ TEST(Tokenizer, iterate_words)
ASSERT_EQ(t.count(), 2); ASSERT_EQ(t.count(), 2);
} }
TEST(Tokenizer, no_separator_path)
{
Tokenizer t("one", ":");
ASSERT_EQ(t.has_next(), true);
ASSERT_EQ(t.count(), 1);
ASSERT_THAT(t.next(), Eq("one"));
ASSERT_EQ(t.has_next(), false);
}
TEST(Tokenizer, unix_paths) TEST(Tokenizer, unix_paths)
{ {
Tokenizer t(":one:two:three:", ":"); Tokenizer t(":one:two:three:", ":");