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/SpectralSolverRZ.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp') diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp index ee4e5fd6d..8f46d21cd 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp @@ -41,22 +41,30 @@ SpectralSolverRZ::SpectralSolverRZ (const int lev, // the spectral space corresponding to each box in `realspace_ba`, // as well as the value of the corresponding k coordinates. + const bool time_averaging = false; + const bool J_linear_in_time = false; + const bool dive_cleaning = false; + const bool divb_cleaning = false; + const bool pml = false; + m_spectral_index = SpectralFieldIndex(update_with_rho, time_averaging, J_linear_in_time, + dive_cleaning, divb_cleaning, pml); + // - Select the algorithm depending on the input parameters // Initialize the corresponding coefficients over k space // PML is not supported. if (v_galilean[2] == 0) { // v_galilean is 0: use standard PSATD algorithm algorithm = std::make_unique( - k_space, dm, n_rz_azimuthal_modes, norder_z, nodal, dt, update_with_rho); + k_space, dm, m_spectral_index, n_rz_azimuthal_modes, norder_z, nodal, dt, update_with_rho); } else { // Otherwise: use the Galilean algorithm algorithm = std::make_unique( - k_space, dm, n_rz_azimuthal_modes, norder_z, nodal, v_galilean, dt, update_with_rho); + k_space, dm, m_spectral_index, n_rz_azimuthal_modes, norder_z, nodal, v_galilean, dt, update_with_rho); } // - Initialize arrays for fields in spectral space + FFT plans field_data = SpectralFieldDataRZ(lev, realspace_ba, k_space, dm, - algorithm->getRequiredNumberOfFields(), + m_spectral_index.n_fields, n_rz_azimuthal_modes); } -- cgit v1.2.3