diff options
Diffstat (limited to 'Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties')
| -rw-r--r-- | Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp index 438e237fb..0bd063beb 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp @@ -1,7 +1,7 @@ #include "MacroscopicProperties.H" +#include "Utils/Parser/ParserUtils.H" #include "Utils/TextMsg.H" -#include "Utils/WarpXUtil.H" #include "WarpX.H" #include <ablastr/warn_manager/WarnManager.H> @@ -43,7 +43,7 @@ MacroscopicProperties::ReadParameters () // Query input for material conductivity, sigma. bool sigma_specified = false; - if (queryWithParser(pp_macroscopic, "sigma", m_sigma)) { + if (utils::parser::queryWithParser(pp_macroscopic, "sigma", m_sigma)) { m_sigma_s = "constant"; sigma_specified = true; } @@ -60,13 +60,14 @@ MacroscopicProperties::ReadParameters () } // initialization of sigma (conductivity) with parser if (m_sigma_s == "parse_sigma_function") { - Store_parserString(pp_macroscopic, "sigma_function(x,y,z)", m_str_sigma_function); + utils::parser::Store_parserString( + pp_macroscopic, "sigma_function(x,y,z)", m_str_sigma_function); m_sigma_parser = std::make_unique<amrex::Parser>( - makeParser(m_str_sigma_function,{"x","y","z"})); + utils::parser::makeParser(m_str_sigma_function,{"x","y","z"})); } bool epsilon_specified = false; - if (queryWithParser(pp_macroscopic, "epsilon", m_epsilon)) { + if (utils::parser::queryWithParser(pp_macroscopic, "epsilon", m_epsilon)) { m_epsilon_s = "constant"; epsilon_specified = true; } @@ -84,14 +85,15 @@ MacroscopicProperties::ReadParameters () // initialization of epsilon (permittivity) with parser if (m_epsilon_s == "parse_epsilon_function") { - Store_parserString(pp_macroscopic, "epsilon_function(x,y,z)", m_str_epsilon_function); + utils::parser::Store_parserString( + pp_macroscopic, "epsilon_function(x,y,z)", m_str_epsilon_function); m_epsilon_parser = std::make_unique<amrex::Parser>( - makeParser(m_str_epsilon_function,{"x","y","z"})); + utils::parser::makeParser(m_str_epsilon_function,{"x","y","z"})); } // Query input for material permittivity, epsilon. bool mu_specified = false; - if (queryWithParser(pp_macroscopic, "mu", m_mu)) { + if (utils::parser::queryWithParser(pp_macroscopic, "mu", m_mu)) { m_mu_s = "constant"; mu_specified = true; } @@ -109,9 +111,10 @@ MacroscopicProperties::ReadParameters () // initialization of mu (permeability) with parser if (m_mu_s == "parse_mu_function") { - Store_parserString(pp_macroscopic, "mu_function(x,y,z)", m_str_mu_function); + utils::parser::Store_parserString( + pp_macroscopic, "mu_function(x,y,z)", m_str_mu_function); m_mu_parser = std::make_unique<amrex::Parser>( - makeParser(m_str_mu_function,{"x","y","z"})); + utils::parser::makeParser(m_str_mu_function,{"x","y","z"})); } } |