diff options
| author |  Luca Fedeli <luca.fedeli@cea.fr>
| 2019-12-19 12:01:30 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-12-19 12:01:30 +0100 |
| commit | 95bf72520c3a78d93f22965fe4848f7cd443ed4c (patch) | |
| tree | fb83394162ef20b11e97dad43720bf4f1fc7c636 /Source/Particles/PhysicalParticleContainer.cpp | |
| parent | f047e4beaab1e2a31bd4a0992fa7a63b0ba0cf8c (diff) | |
| parent | 7d1a572483d5f1b314020b5282c92d48afa26f9d (diff) | |
| download | WarpX-95bf72520c3a78d93f22965fe4848f7cd443ed4c.tar.gz WarpX-95bf72520c3a78d93f22965fe4848f7cd443ed4c.tar.zst WarpX-95bf72520c3a78d93f22965fe4848f7cd443ed4c.zip | |
Merge branch 'dev' into add_harmonic_beam
Diffstat (limited to 'Source/Particles/PhysicalParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index c77ddf83b..d5c08074a 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -963,8 +963,12 @@ PhysicalParticleContainer::EvolveES (const Vector<std::array<std::unique_ptr<Mul void PhysicalParticleContainer::FieldGather (int lev, - const MultiFab& Ex, const MultiFab& Ey, const MultiFab& Ez, - const MultiFab& Bx, const MultiFab& By, const MultiFab& Bz) + const amrex::MultiFab& Ex, + const amrex::MultiFab& Ey, + const amrex::MultiFab& Ez, + const amrex::MultiFab& Bx, + const amrex::MultiFab& By, + const amrex::MultiFab& Bz) { const std::array<Real,3>& dx = WarpX::CellSize(lev); @@ -2148,12 +2152,12 @@ PhysicalParticleContainer::FieldGather (WarpXParIter& pti, RealVector& Bxp, RealVector& Byp, RealVector& Bzp, - FArrayBox const * exfab, - FArrayBox const * eyfab, - FArrayBox const * ezfab, - FArrayBox const * bxfab, - FArrayBox const * byfab, - FArrayBox const * bzfab, + amrex::FArrayBox const * exfab, + amrex::FArrayBox const * eyfab, + amrex::FArrayBox const * ezfab, + amrex::FArrayBox const * bxfab, + amrex::FArrayBox const * byfab, + amrex::FArrayBox const * bzfab, const int ngE, const int e_is_nodal, const long offset, const long np_to_gather, |