diff options
| author |  Prabhat Kumar <89051199+prkkumar@users.noreply.github.com>
| 2021-12-06 16:26:47 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-12-06 16:26:47 -0800 |
| commit | f2d5182bc3ba7304d48b9d98f590b6248f89f0be (patch) | |
| tree | 3dc35bbe8777394661071f077a7fa1c2bd21aa24 /Source/Particles/WarpXParticleContainer.cpp | |
| parent | 7b5eb5b978106cd9c9bde100faba1a91b841c897 (diff) | |
| download | WarpX-f2d5182bc3ba7304d48b9d98f590b6248f89f0be.tar.gz WarpX-f2d5182bc3ba7304d48b9d98f590b6248f89f0be.tar.zst WarpX-f2d5182bc3ba7304d48b9d98f590b6248f89f0be.zip | |
AMREX_SPACEDIM : Initialization and Particles (#2628)
* AMREX_SPACEDIM : Boundary Conditions
* AMREX_SPACEDIM : Parallelization
* Fix compilation
* AMREX_SPACEDIM : Initialization
* Fix Typo
* space
* AMREX_SPACEDIM : Particles
Diffstat (limited to 'Source/Particles/WarpXParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/WarpXParticleContainer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp index a306eee91..5905ccdb7 100644 --- a/Source/Particles/WarpXParticleContainer.cpp +++ b/Source/Particles/WarpXParticleContainer.cpp @@ -203,11 +203,11 @@ WarpXParticleContainer::AddNParticles (int /*lev*/, p.id() = id; } p.cpu() = ParallelDescriptor::MyProc(); -#if (AMREX_SPACEDIM == 3) +#if defined(WARPX_DIM_3D) p.pos(0) = x[i]; p.pos(1) = y[i]; p.pos(2) = z[i]; -#elif (AMREX_SPACEDIM == 2) +#elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) amrex::ignore_unused(y); #ifdef WARPX_DIM_RZ theta[i-ibegin] = std::atan2(y[i], x[i]); @@ -332,12 +332,12 @@ WarpXParticleContainer::DepositCurrent (WarpXParIter& pti, // deposit part of its current in a neighboring box. However, this should catch particles // traveling many cells away, for example with algorithms that allow for large time steps. -#if (AMREX_SPACEDIM == 1) +#if defined(WARPX_DIM_1D_Z) const amrex::IntVect shape_extent = amrex::IntVect(static_cast<int>(WarpX::noz/2)); -#elif (AMREX_SPACEDIM == 2) +#elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) const amrex::IntVect shape_extent = amrex::IntVect(static_cast<int>(WarpX::nox/2), static_cast<int>(WarpX::noz/2)); -#elif (AMREX_SPACEDIM == 3) +#elif defined(WARPX_DIM_3D) const amrex::IntVect shape_extent = amrex::IntVect(static_cast<int>(WarpX::nox/2), static_cast<int>(WarpX::noy/2), static_cast<int>(WarpX::noz/2)); @@ -617,12 +617,12 @@ WarpXParticleContainer::DepositCharge (WarpXParIter& pti, RealVector& wp, // are not trivial, this check might be too strict and we might need to relax it, as currently // done for the current deposition. -#if (AMREX_SPACEDIM == 1) +#if defined(WARPX_DIM_1D_Z) const amrex::IntVect shape_extent = amrex::IntVect(static_cast<int>(WarpX::noz/2+1)); -#elif (AMREX_SPACEDIM == 2) +#elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) const amrex::IntVect shape_extent = amrex::IntVect(static_cast<int>(WarpX::nox/2+1), static_cast<int>(WarpX::noz/2+1)); -#elif (AMREX_SPACEDIM == 3) +#elif defined(WARPX_DIM_3D) const amrex::IntVect shape_extent = amrex::IntVect(static_cast<int>(WarpX::nox/2+1), static_cast<int>(WarpX::noy/2+1), static_cast<int>(WarpX::noz/2+1)); |