diff options
| author |  Neïl Zaim <49716072+NeilZaim@users.noreply.github.com>
| 2022-08-10 18:37:14 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-08-10 09:37:14 -0700 |
| commit | b4686616d884e11f4a624989d370b3c032d0c1c4 (patch) | |
| tree | 656ecada72edfcb2217f0220403792c655857c18 /Source/Python | |
| parent | b13e7f53959656a8d47adc63f20d9ed055288be0 (diff) | |
| download | WarpX-b4686616d884e11f4a624989d370b3c032d0c1c4.tar.gz WarpX-b4686616d884e11f4a624989d370b3c032d0c1c4.tar.zst WarpX-b4686616d884e11f4a624989d370b3c032d0c1c4.zip | |
Initialize particle runtime attributes inside AddNParticles (#3272)
* Initialize particle runtime attributes before calling AddNParticles
* Avoid Multiplication result converted to larger type warning
* Directly initialize runtime attributes inside AddNParticles
* Update doxygen comment
Diffstat (limited to 'Source/Python')
| -rw-r--r-- | Source/Python/WarpXWrappers.H | 6 | ||||
| -rw-r--r-- | Source/Python/WarpXWrappers.cpp | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Source/Python/WarpXWrappers.H b/Source/Python/WarpXWrappers.H index 9d4f2475b..7cded8a89 100644 --- a/Source/Python/WarpXWrappers.H +++ b/Source/Python/WarpXWrappers.H @@ -62,8 +62,10 @@ extern "C" { amrex::ParticleReal const * vx, amrex::ParticleReal const * vy, amrex::ParticleReal const * vz, - int nattr, - amrex::ParticleReal const * attr, + const int nattr_real, + amrex::ParticleReal const * attr_real, + const int nattr_int, + int const * attr_int, int uniqueparticles); void warpx_ConvertLabParamsToBoost(); diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp index 4cca0b3c1..f2855a145 100644 --- a/Source/Python/WarpXWrappers.cpp +++ b/Source/Python/WarpXWrappers.cpp @@ -198,14 +198,16 @@ namespace const char* char_species_name, int lenx, amrex::ParticleReal const * x, amrex::ParticleReal const * y, amrex::ParticleReal const * z, amrex::ParticleReal const * vx, amrex::ParticleReal const * vy, - amrex::ParticleReal const * vz, int nattr, - amrex::ParticleReal const * attr, int uniqueparticles) + amrex::ParticleReal const * vz, const int nattr_real, + amrex::ParticleReal const * attr_real, const int nattr_int, + int const * attr_int, int uniqueparticles) { auto & mypc = WarpX::GetInstance().GetPartContainer(); const std::string species_name(char_species_name); auto & myspc = mypc.GetParticleContainerFromName(species_name); const int lev = 0; - myspc.AddNParticles(lev, lenx, x, y, z, vx, vy, vz, nattr, attr, uniqueparticles); + myspc.AddNParticles(lev, lenx, x, y, z, vx, vy, vz, nattr_real, attr_real, + nattr_int, attr_int, uniqueparticles); } void warpx_ConvertLabParamsToBoost() |