aboutsummaryrefslogtreecommitdiff
path: root/Source/FieldSolver/SpectralSolver
diff options
context:
space:
mode:
authorGravatar Luca Fedeli <luca.fedeli@cea.fr> 2020-10-19 10:17:46 +0200
committerGravatar GitHub <noreply@github.com> 2020-10-19 01:17:46 -0700
commit1e7de3b536c974327513d17f9aee156d93030825 (patch)
treefb5885e8fbbbfdd51d5d9efcc53c597a41b2fa1d /Source/FieldSolver/SpectralSolver
parent1f8f4f74adf7d460c593752a83e3574cc5cc0589 (diff)
downloadWarpX-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/SpectralSolver')
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp8
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralSolver.cpp18
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp8
3 files changed, 19 insertions, 15 deletions
diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp
index 7886bd549..884ee5f45 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.cpp
@@ -7,6 +7,8 @@
#include "Utils/WarpXConst.H"
#include "SpectralHankelTransformer.H"
+#include <memory>
+
SpectralHankelTransformer::SpectralHankelTransformer (int const nr,
int const n_rz_azimuthal_modes,
amrex::Real const rmax)
@@ -18,9 +20,9 @@ SpectralHankelTransformer::SpectralHankelTransformer (int const nr,
dhtm.resize(m_n_rz_azimuthal_modes);
for (int mode=0 ; mode < m_n_rz_azimuthal_modes ; mode++) {
- dht0[mode].reset( new HankelTransform(mode , mode, m_nr, rmax) );
- dhtp[mode].reset( new HankelTransform(mode+1, mode, m_nr, rmax) );
- dhtm[mode].reset( new HankelTransform(mode-1, mode, m_nr, rmax) );
+ dht0[mode] = std::make_unique<HankelTransform>(mode , mode, m_nr, rmax);
+ dhtp[mode] = std::make_unique<HankelTransform>(mode+1, mode, m_nr, rmax);
+ dhtm[mode] = std::make_unique<HankelTransform>(mode-1, mode, m_nr, rmax);
}
ExtractKrArray();
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
index 5d2c954ce..0cfd899df 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
@@ -14,6 +14,8 @@
#include "Utils/WarpXProfilerWrapper.H"
#include "Utils/WarpXUtil.H"
+#include <memory>
+
#if WARPX_USE_PSATD
/* \brief Initialize the spectral Maxwell solver
@@ -53,23 +55,23 @@ SpectralSolver::SpectralSolver(
// Initialize the corresponding coefficients over k space
if (pml) {
- algorithm = std::unique_ptr<PMLPsatdAlgorithm>( new PMLPsatdAlgorithm(
- k_space, dm, norder_x, norder_y, norder_z, nodal, dt ) );
+ algorithm = std::make_unique<PMLPsatdAlgorithm>(
+ k_space, dm, norder_x, norder_y, norder_z, nodal, dt);
}
else {
if (fft_do_time_averaging){
- algorithm = std::unique_ptr<AvgGalileanAlgorithm>( new AvgGalileanAlgorithm(
- k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt ) );
+ algorithm = std::make_unique<AvgGalileanAlgorithm>(
+ k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt);
}
else {
if ((v_galilean[0]==0) && (v_galilean[1]==0) && (v_galilean[2]==0)){
// v_galilean is 0: use standard PSATD algorithm
- algorithm = std::unique_ptr<PsatdAlgorithm>( new PsatdAlgorithm(
- k_space, dm, norder_x, norder_y, norder_z, nodal, dt, update_with_rho ) );
+ algorithm = std::make_unique<PsatdAlgorithm>(
+ k_space, dm, norder_x, norder_y, norder_z, nodal, dt, update_with_rho);
}
else {
- algorithm = std::unique_ptr<GalileanAlgorithm>( new GalileanAlgorithm(
- k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt, update_with_rho ) );
+ algorithm = std::make_unique<GalileanAlgorithm>(
+ k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt, update_with_rho);
}
}
}
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
index 38851ef50..581538d6a 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
@@ -45,12 +45,12 @@ SpectralSolverRZ::SpectralSolverRZ (amrex::BoxArray const & realspace_ba,
// PML is not supported.
if (v_galilean[2] == 0) {
// v_galilean is 0: use standard PSATD algorithm
- algorithm = std::unique_ptr<PsatdAlgorithmRZ>(
- new PsatdAlgorithmRZ(k_space, dm, n_rz_azimuthal_modes, norder_z, nodal, dt));
+ algorithm = std::make_unique<PsatdAlgorithmRZ>(
+ k_space, dm, n_rz_azimuthal_modes, norder_z, nodal, dt);
} else {
// Otherwise: use the Galilean algorithm
- algorithm = std::unique_ptr<GalileanPsatdAlgorithmRZ>(
- new GalileanPsatdAlgorithmRZ(k_space, dm, n_rz_azimuthal_modes, norder_z, nodal, v_galilean, dt));
+ algorithm = std::make_unique<GalileanPsatdAlgorithmRZ>(
+ k_space, dm, n_rz_azimuthal_modes, norder_z, nodal, v_galilean, dt);
}
// - Initialize arrays for fields in spectral space + FFT plans