diff options
| author |  Luca Fedeli <luca.fedeli@cea.fr>
| 2020-10-19 10:17:46 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-10-19 01:17:46 -0700 |
| commit | 1e7de3b536c974327513d17f9aee156d93030825 (patch) | |
| tree | fb5885e8fbbbfdd51d5d9efcc53c597a41b2fa1d /Source/FieldSolver/FiniteDifferenceSolver | |
| parent | 1f8f4f74adf7d460c593752a83e3574cc5cc0589 (diff) | |
| download | WarpX-1e7de3b536c974327513d17f9aee156d93030825.tar.gz WarpX-1e7de3b536c974327513d17f9aee156d93030825.tar.zst WarpX-1e7de3b536c974327513d17f9aee156d93030825.zip | |
Replace wherever possible '.reset(new' with '= make_unique' (#1429)
* replace wherever possible .reset(new with = make_unique
* fixed bug
* fixed bug
* revert WarpXOpenPMD.cpp to the original version
* removed another .reset(new
Diffstat (limited to 'Source/FieldSolver/FiniteDifferenceSolver')
| -rw-r--r-- | Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp index a368dc026..2232c4e5b 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp @@ -2,6 +2,8 @@ #include <AMReX_ParmParse.H> #include "WarpX.H" +#include <memory> + using namespace amrex; MacroscopicProperties::MacroscopicProperties () @@ -34,8 +36,8 @@ MacroscopicProperties::ReadParameters () // initialization of sigma (conductivity) with parser if (m_sigma_s == "parse_sigma_function") { Store_parserString(pp, "sigma_function(x,y,z)", m_str_sigma_function); - m_sigma_parser.reset(new ParserWrapper<3>( - makeParser(m_str_sigma_function,{"x","y","z"}) ) ); + m_sigma_parser = std::make_unique<ParserWrapper<3>>( + makeParser(m_str_sigma_function,{"x","y","z"})); } bool epsilon_specified = false; @@ -54,8 +56,8 @@ MacroscopicProperties::ReadParameters () // initialization of epsilon (permittivity) with parser if (m_epsilon_s == "parse_epsilon_function") { Store_parserString(pp, "epsilon_function(x,y,z)", m_str_epsilon_function); - m_epsilon_parser.reset(new ParserWrapper<3>( - makeParser(m_str_epsilon_function,{"x","y","z"}) ) ); + m_epsilon_parser = std::make_unique<ParserWrapper<3>>( + makeParser(m_str_epsilon_function,{"x","y","z"})); } // Query input for material permittivity, epsilon. @@ -75,8 +77,8 @@ MacroscopicProperties::ReadParameters () // initialization of mu (permeability) with parser if (m_mu_s == "parse_mu_function") { Store_parserString(pp, "mu_function(x,y,z)", m_str_mu_function); - m_mu_parser.reset(new ParserWrapper<3>( - makeParser(m_str_mu_function,{"x","y","z"}) ) ); + m_mu_parser = std::make_unique<ParserWrapper<3>>( + makeParser(m_str_mu_function,{"x","y","z"})); } } @@ -194,4 +196,3 @@ MacroscopicProperties::InitializeMacroMultiFabUsingParser ( } - |