From 300c1659c4bcdae104f828c01de8873743f73d94 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni <59625522+EZoni@users.noreply.github.com> Date: Thu, 15 Jul 2021 15:39:34 -0700 Subject: Spectral Index: Replace `struct`s of `enum` with Class (#2062) * Add New Spectral Index Class * Cleaning * Use New Spectral Index Class in PML * Cleaning * Reuse Available Data for divE * Allocate Rho Data Only when Necessary * Cleaning * Fix Bug in RZ Geometry * Revert Commits for Allocation of Rho Data * Cleaning * Update Forward Declaration Header * Do Not Include Unnecessary Header Files * Doxygen * Do Not Use Separate div() Cleaning Flags * SpectralFieldIndex: Add Missing param to Doxygen * Remove Unused getRequiredNumberOfFields --- Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp') diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp index 80760afb3..9604ccb44 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralFieldDataRZ.cpp @@ -25,7 +25,8 @@ SpectralFieldDataRZ::SpectralFieldDataRZ (const int lev, amrex::DistributionMapping const & dm, int const n_field_required, int const n_modes) - : n_rz_azimuthal_modes(n_modes) + : n_rz_azimuthal_modes(n_modes), + m_n_fields(n_field_required) { amrex::BoxArray const & spectralspace_ba = k_space.spectralspace_ba; @@ -281,7 +282,7 @@ SpectralFieldDataRZ::FABZForwardTransform (amrex::MFIter const & mfi, amrex::Box amrex::Box const& spectralspace_bx = tmpSpectralField[mfi].box(); int const nz = spectralspace_bx.length(1); amrex::Real inv_nz = 1._rt/nz; - constexpr int n_fields = SpectralFieldIndex::n_fields; + const int n_fields = m_n_fields; ParallelFor(spectralspace_bx, modes, [=] AMREX_GPU_DEVICE(int i, int j, int k, int mode) noexcept { @@ -319,7 +320,7 @@ SpectralFieldDataRZ::FABZBackwardTransform (amrex::MFIter const & mfi, amrex::Bo amrex::Box const& spectralspace_bx = tmpSpectralField[mfi].box(); int const modes = n_rz_azimuthal_modes; - constexpr int n_fields = SpectralFieldIndex::n_fields; + const int n_fields = m_n_fields; ParallelFor(spectralspace_bx, modes, [=] AMREX_GPU_DEVICE(int i, int j, int k, int mode) noexcept { int const ic = field_index + mode*n_fields; @@ -735,7 +736,7 @@ SpectralFieldDataRZ::ApplyFilter (const int lev, int const field_index) amrex::Array4 const& fields_arr = fields[mfi].array(); int const modes = n_rz_azimuthal_modes; - constexpr int n_fields = SpectralFieldIndex::n_fields; + const int n_fields = m_n_fields; amrex::Box const& spectralspace_bx = fields[mfi].box(); int const nr = spectralspace_bx.length(0); @@ -779,7 +780,7 @@ SpectralFieldDataRZ::ApplyFilter (const int lev, int const field_index1, amrex::Array4 const& fields_arr = fields[mfi].array(); int const modes = n_rz_azimuthal_modes; - constexpr int n_fields = SpectralFieldIndex::n_fields; + const int n_fields = m_n_fields; amrex::Box const& spectralspace_bx = fields[mfi].box(); int const nr = spectralspace_bx.length(0); -- cgit v1.2.3