From 1e7de3b536c974327513d17f9aee156d93030825 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Mon, 19 Oct 2020 10:17:46 +0200 Subject: 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 --- Source/FieldSolver/SpectralSolver/SpectralSolver.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'Source/FieldSolver/SpectralSolver/SpectralSolver.cpp') 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 + #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( new PMLPsatdAlgorithm( - k_space, dm, norder_x, norder_y, norder_z, nodal, dt ) ); + algorithm = std::make_unique( + k_space, dm, norder_x, norder_y, norder_z, nodal, dt); } else { if (fft_do_time_averaging){ - algorithm = std::unique_ptr( new AvgGalileanAlgorithm( - k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt ) ); + algorithm = std::make_unique( + 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( new PsatdAlgorithm( - k_space, dm, norder_x, norder_y, norder_z, nodal, dt, update_with_rho ) ); + algorithm = std::make_unique( + k_space, dm, norder_x, norder_y, norder_z, nodal, dt, update_with_rho); } else { - algorithm = std::unique_ptr( new GalileanAlgorithm( - k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt, update_with_rho ) ); + algorithm = std::make_unique( + k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt, update_with_rho); } } } -- cgit v1.2.3