diff options
Diffstat (limited to 'Source/Particles/ParticleBoundaryBuffer.cpp')
| -rw-r--r-- | Source/Particles/ParticleBoundaryBuffer.cpp | 65 |
1 files changed, 41 insertions, 24 deletions
diff --git a/Source/Particles/ParticleBoundaryBuffer.cpp b/Source/Particles/ParticleBoundaryBuffer.cpp index 7877e33d3..f1ee10593 100644 --- a/Source/Particles/ParticleBoundaryBuffer.cpp +++ b/Source/Particles/ParticleBoundaryBuffer.cpp @@ -74,24 +74,41 @@ ParticleBoundaryBuffer::ParticleBoundaryBuffer () m_do_boundary_buffer[i].resize(numSpecies(), 0); } +#if defined(WARPX_DIM_1D_Z) + constexpr auto idx_zlo = 0; + constexpr auto idx_zhi = 1; +#elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) + constexpr auto idx_xlo = 0; + constexpr auto idx_xhi = 1; + constexpr auto idx_zlo = 2; + constexpr auto idx_zhi = 3; +#else + constexpr auto idx_xlo = 0; + constexpr auto idx_xhi = 1; + constexpr auto idx_ylo = 2; + constexpr auto idx_yhi = 3; + constexpr auto idx_zlo = 4; + constexpr auto idx_zhi = 5; +#endif + for (int ispecies = 0; ispecies < numSpecies(); ++ispecies) { amrex::ParmParse pp_species(getSpeciesNames()[ispecies]); #if defined(WARPX_DIM_1D_Z) - pp_species.query("save_particles_at_zlo", m_do_boundary_buffer[0][ispecies]); - pp_species.query("save_particles_at_zhi", m_do_boundary_buffer[1][ispecies]); + pp_species.query("save_particles_at_zlo", m_do_boundary_buffer[idx_zlo][ispecies]); + pp_species.query("save_particles_at_zhi", m_do_boundary_buffer[idx_zhi][ispecies]); #elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) - pp_species.query("save_particles_at_xlo", m_do_boundary_buffer[0][ispecies]); - pp_species.query("save_particles_at_xhi", m_do_boundary_buffer[1][ispecies]); - pp_species.query("save_particles_at_zlo", m_do_boundary_buffer[2][ispecies]); - pp_species.query("save_particles_at_zhi", m_do_boundary_buffer[3][ispecies]); + pp_species.query("save_particles_at_xlo", m_do_boundary_buffer[idx_xlo][ispecies]); + pp_species.query("save_particles_at_xhi", m_do_boundary_buffer[idx_xhi][ispecies]); + pp_species.query("save_particles_at_zlo", m_do_boundary_buffer[idx_zlo][ispecies]); + pp_species.query("save_particles_at_zhi", m_do_boundary_buffer[idx_zhi][ispecies]); #else - pp_species.query("save_particles_at_xlo", m_do_boundary_buffer[0][ispecies]); - pp_species.query("save_particles_at_xhi", m_do_boundary_buffer[1][ispecies]); - pp_species.query("save_particles_at_ylo", m_do_boundary_buffer[2][ispecies]); - pp_species.query("save_particles_at_yhi", m_do_boundary_buffer[3][ispecies]); - pp_species.query("save_particles_at_zlo", m_do_boundary_buffer[4][ispecies]); - pp_species.query("save_particles_at_zhi", m_do_boundary_buffer[5][ispecies]); + pp_species.query("save_particles_at_xlo", m_do_boundary_buffer[idx_xlo][ispecies]); + pp_species.query("save_particles_at_xhi", m_do_boundary_buffer[idx_xhi][ispecies]); + pp_species.query("save_particles_at_ylo", m_do_boundary_buffer[idx_ylo][ispecies]); + pp_species.query("save_particles_at_yhi", m_do_boundary_buffer[idx_yhi][ispecies]); + pp_species.query("save_particles_at_zlo", m_do_boundary_buffer[idx_zlo][ispecies]); + pp_species.query("save_particles_at_zhi", m_do_boundary_buffer[idx_zhi][ispecies]); #endif #ifdef AMREX_USE_EB pp_species.query("save_particles_at_eb", m_do_boundary_buffer[AMREX_SPACEDIM*2][ispecies]); @@ -103,20 +120,20 @@ ParticleBoundaryBuffer::ParticleBoundaryBuffer () } #if defined(WARPX_DIM_1D_Z) - m_boundary_names[0] = "zlo"; - m_boundary_names[1] = "zhi"; + m_boundary_names[idx_zlo] = "zlo"; + m_boundary_names[idx_zhi] = "zhi"; #elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) - m_boundary_names[0] = "xlo"; - m_boundary_names[1] = "xhi"; - m_boundary_names[2] = "zlo"; - m_boundary_names[3] = "zhi"; + m_boundary_names[idx_xlo] = "xlo"; + m_boundary_names[idx_xhi] = "xhi"; + m_boundary_names[idx_zlo] = "zlo"; + m_boundary_names[idx_zhi] = "zhi"; #else - m_boundary_names[0] = "xlo"; - m_boundary_names[1] = "xhi"; - m_boundary_names[2] = "ylo"; - m_boundary_names[3] = "yhi"; - m_boundary_names[4] = "zlo"; - m_boundary_names[5] = "zhi"; + m_boundary_names[idx_xlo] = "xlo"; + m_boundary_names[idx_xhi] = "xhi"; + m_boundary_names[idx_ylo] = "ylo"; + m_boundary_names[idx_yhi] = "yhi"; + m_boundary_names[idx_zlo] = "zlo"; + m_boundary_names[idx_zhi] = "zhi"; #endif #ifdef AMREX_USE_EB m_boundary_names[AMREX_SPACEDIM*2] = "eb"; |