Allow setting location of filters through an environment variable (MR…

…ChemSoft#180) * Log location of filters * Fix warning * Abort if filter paths not set * More debug info * Abort if no filters folder is set * Pass more search paths for filter files * Remove code duplication in finding filter files Also search in MWFILTERS_DIR, specifiable as environment variable * Clean up MWFilter.cpp from debug prints * Remove debug printing from details.cpp
stigrj · Oct 11, 2021 · 3e9ffef · 3e9ffef
1 parent dcbad5b
commit 3e9ffef
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 29 deletions.
diff --git a/src/core/CrossCorrelation.cpp b/src/core/CrossCorrelation.cpp
@@ -59,12 +59,7 @@ CrossCorrelation::CrossCorrelation(int k, int t)
             MSG_ERROR("Unknown filter type: " << this->type);
     }
 
-    for (auto n : {mwfilters_source_dir(), mwfilters_install_dir()}) {
-        if (details::directory_exists(n)) {
-            setCCCPaths(n);
-            break;
-        }
-    }
+    setCCCPaths(details::find_filters());
 
     readCCCBin();
 }

diff --git a/src/core/MWFilter.cpp b/src/core/MWFilter.cpp
@@ -60,12 +60,7 @@ MWFilter::MWFilter(int k, int t)
             MSG_ERROR("Unknown filter type: " << this->type);
     }
 
-    for (auto n : {mwfilters_source_dir(), mwfilters_install_dir()}) {
-        if (details::directory_exists(n)) {
-            setFilterPaths(n);
-            break;
-        }
-    }
+    setFilterPaths(details::find_filters());
 
     generateBlocks();
 

diff --git a/src/treebuilders/BSCalculator.cpp b/src/treebuilders/BSCalculator.cpp
@@ -47,13 +47,7 @@ BSCalculator::BSCalculator(const ScalingBasis &basis, int n)
 
 void BSCalculator::readSMatrix(const ScalingBasis &basis, char n) {
     std::string file;
-    std::string path;
-    for (auto l : {mwfilters_source_dir(), mwfilters_install_dir()}) {
-        if (details::directory_exists(l)) {
-            path = l;
-            break;
-        }
-    }
+    std::string path = details::find_filters();
 
     if (basis.getScalingType() == Legendre) file = path + "/L_b-spline-deriv" + n + ".txt";
     if (basis.getScalingType() == Interpol) file = path + "/I_b-spline-deriv" + n + ".txt";

diff --git a/src/treebuilders/ConvolutionCalculator.cpp b/src/treebuilders/ConvolutionCalculator.cpp
@@ -380,7 +380,7 @@ template <int D> void ConvolutionCalculator<D>::touchParentNodes(MWTree<D> &tree
         auto car_prod = math_utils::cartesian_product(std::vector<int>{-1, 0}, D);
         for (auto i = -1; i > oper_scale - 1; i--) {
             for (auto &a : car_prod) {
-                std::array<int, D> l;
+                std::array<int, D> l{};
                 std::copy_n(a.begin(), D, l.begin());
                 NodeIndex<D> idx(i, l);
                 tree.getNode(idx);

diff --git a/src/treebuilders/PHCalculator.cpp b/src/treebuilders/PHCalculator.cpp
@@ -46,13 +46,8 @@ PHCalculator::PHCalculator(const ScalingBasis &basis, int n)
 
 void PHCalculator::readSMatrix(const ScalingBasis &basis, char n) {
     std::string file;
-    std::string path;
-    for (auto l : {mwfilters_source_dir(), mwfilters_install_dir()}) {
-        if (details::directory_exists(l)) {
-            path = l;
-            break;
-        }
-    }
+    std::string path = details::find_filters();
+
     if (basis.getScalingType() == Legendre) file = path + "/L_ph_deriv_" + n + ".txt";
     if (basis.getScalingType() == Interpol) file = path + "/I_ph_deriv_" + n + ".txt";
     if (basis.getScalingOrder() < 0) MSG_ABORT("Scaling order not supported");

diff --git a/src/trees/NodeIndex.h b/src/trees/NodeIndex.h
@@ -84,8 +84,8 @@ template <int D> class NodeIndex final {
     }
 
 private:
-    short int N;          ///< Length scale index 2^N
-    std::array<int, D> L; ///< Translation index [x,y,z,...]
+    short int N{0};          ///< Length scale index 2^N
+    std::array<int, D> L{}; ///< Translation index [x,y,z,...]
 };
 
 /** @brief ostream printer */

diff --git a/src/utils/details.cpp b/src/utils/details.cpp
@@ -27,10 +27,12 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdlib>
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "MRCPP/config.h"
 #include "utils/Printer.h"
 
 namespace mrcpp {
@@ -48,6 +50,24 @@ bool directory_exists(std::string path) {
     return (info.st_mode & S_IFDIR) ? true : false;
 }
 
+std::string find_filters() {
+    std::string filters;
+    auto envvar = "";
+    if (const char *env_p = std::getenv("MWFILTERS_DIR")) envvar = env_p;
+    for (auto n : {envvar, mwfilters_source_dir(), mwfilters_install_dir()}) {
+        if (details::directory_exists(n)) {
+            filters = n;
+            break;
+        }
+    }
+
+    if (filters.empty()) {
+        MSG_ABORT("Could not find a folder containing filters!");
+    } else {
+        return filters;
+    }
+}
+
 // helper function: parse a string and returns the nth integer number
 int get_val(char *line, int n) {
     char *p = line;

diff --git a/src/utils/details.h b/src/utils/details.h
@@ -33,6 +33,7 @@
 namespace mrcpp {
 namespace details {
 bool directory_exists(std::string path);
+std::string find_filters();
 int get_memory_usage();
 template <int D> bool are_all_equal(const std::array<double, D> &exponent);
 template <typename T, size_t D> bool are_any(const std::array<T, D> &col, const T eq) {