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/Initialization/PlasmaInjector.cpp | |
| 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/Initialization/PlasmaInjector.cpp')
| -rw-r--r-- | Source/Initialization/PlasmaInjector.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp index 3930fd4de..69aefc47e 100644 --- a/Source/Initialization/PlasmaInjector.cpp +++ b/Source/Initialization/PlasmaInjector.cpp @@ -20,6 +20,7 @@ #include <functional> #include <sstream> #include <string> +#include <memory> using namespace amrex; @@ -230,8 +231,9 @@ PlasmaInjector::PlasmaInjector (int ispecies, const std::string& name) "(Please visit PR#765 for more information.)"); #endif // Construct InjectorPosition with InjectorPositionRandom. - h_inj_pos.reset(new InjectorPosition((InjectorPositionRandom*)nullptr, - xmin, xmax, ymin, ymax, zmin, zmax)); + h_inj_pos = std::make_unique<InjectorPosition>( + (InjectorPositionRandom*)nullptr, + xmin, xmax, ymin, ymax, zmin, zmax); parseDensity(pp); parseMomentum(pp); } else if (part_pos_s == "nuniformpercell") { @@ -250,11 +252,12 @@ PlasmaInjector::PlasmaInjector (int ispecies, const std::string& name) "n_rz_azimuthal_modes (Please visit PR#765 for more information.)"); #endif // Construct InjectorPosition from InjectorPositionRegular. - h_inj_pos.reset(new InjectorPosition((InjectorPositionRegular*)nullptr, - xmin, xmax, ymin, ymax, zmin, zmax, - Dim3{num_particles_per_cell_each_dim[0], - num_particles_per_cell_each_dim[1], - num_particles_per_cell_each_dim[2]})); + h_inj_pos = std::make_unique<InjectorPosition>( + (InjectorPositionRegular*)nullptr, + xmin, xmax, ymin, ymax, zmin, zmax, + Dim3{num_particles_per_cell_each_dim[0], + num_particles_per_cell_each_dim[1], + num_particles_per_cell_each_dim[2]}); num_particles_per_cell = num_particles_per_cell_each_dim[0] * num_particles_per_cell_each_dim[1] * num_particles_per_cell_each_dim[2]; |