merging all makeParser () functions in WarpXUtil.H

2 files changed, 28 insertions, 27 deletions

diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp
index a3ec07f65..247c89869 100644
--- a/Source/Utils/WarpXMovingWindow.cpp
+++ b/Source/Utils/WarpXMovingWindow.cpp
@@ -1,35 +1,9 @@
 #include <WarpX.H>
+#include <WarpXUtil.H>
 #include <WarpXConst.H>
 
 using namespace amrex;
 
-namespace {
-WarpXParser makeParser (std::string const& parse_function)
-{
-    WarpXParser parser(parse_function);
-    parser.registerVariables({"x","y","z"});
-    ParmParse pp("my_constants");
-    std::set<std::string> symbols = parser.symbols();
-    symbols.erase("x");
-    symbols.erase("y");
-    symbols.erase("z");
-    for (auto it = symbols.begin(); it != symbols.end(); ) {
-        Real v;
-        if (pp.query(it->c_str(), v)) {
-           parser.setConstant(*it, v);
-           it = symbols.erase(it);
-        } else {
-           ++it;
-        }
-    }
-    for (auto const& s : symbols) {
-        amrex::Abort(" ExternalEBFieldOnGrid::makeParser::Unknown symbol "+s);
-    }
-    return parser;
-}
-}
-
-
 void
 WarpX::UpdatePlasmaInjectionPosition (Real a_dt)
 {
diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp
index db5a646f9..152eaba07 100644
--- a/Source/Utils/WarpXUtil.cpp
+++ b/Source/Utils/WarpXUtil.cpp
@@ -181,3 +181,30 @@ void Store_parserString(std::string query_string,
     f.clear();
 
 }
+
+
+//namespace {
+WarpXParser makeParser (std::string const& parse_function)
+{
+    WarpXParser parser(parse_function);
+    parser.registerVariables({"x","y","z"});
+    ParmParse pp("my_constants");
+    std::set<std::string> symbols = parser.symbols();
+    symbols.erase("x");
+    symbols.erase("y");
+    symbols.erase("z");
+    for (auto it = symbols.begin(); it != symbols.end(); ) {
+        Real v;
+        if (pp.query(it->c_str(), v)) {
+           parser.setConstant(*it, v);
+           it = symbols.erase(it);
+        } else {
+           ++it;
+        }
+    }
+    for (auto const& s : symbols) {
+        amrex::Abort("makeParser::Unknown symbol "+s);
+    }
+    return parser;
+}
+//}