diff options
Diffstat (limited to 'Source/FieldSolver/SpectralSolver/SpectralSolver.cpp')
| -rw-r--r-- | Source/FieldSolver/SpectralSolver/SpectralSolver.cpp | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp index 4c9cb6967..725cfcf92 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp @@ -7,8 +7,6 @@ #include "SpectralKSpace.H" #include "SpectralSolver.H" #include "SpectralAlgorithms/PsatdAlgorithm.H" -#include "SpectralAlgorithms/GalileanAlgorithm.H" -#include "SpectralAlgorithms/AvgGalileanAlgorithm.H" #include "SpectralAlgorithms/PMLPsatdAlgorithm.H" #include "SpectralAlgorithms/ComovingPsatdAlgorithm.H" #include "WarpX.H" @@ -61,26 +59,15 @@ SpectralSolver::SpectralSolver( k_space, dm, norder_x, norder_y, norder_z, nodal, dt); } else { - if (fft_do_time_averaging){ - algorithm = std::make_unique<AvgGalileanAlgorithm>( - k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt); + // Comoving PSATD algorithm + if (v_comoving[0] != 0. || v_comoving[1] != 0. || v_comoving[2] != 0.) { + algorithm = std::make_unique<ComovingPsatdAlgorithm>( + k_space, dm, norder_x, norder_y, norder_z, nodal, v_comoving, dt, update_with_rho); } + // PSATD algorithms: standard, Galilean, or averaged Galilean else { - // Galilean PSATD algorithm - if (v_galilean[0] != 0. || v_galilean[1] != 0. || v_galilean[2] != 0.) { - algorithm = std::make_unique<GalileanAlgorithm>( - k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt, update_with_rho); - } - // Comoving PSATD algorithm - else if (v_comoving[0] != 0. || v_comoving[1] != 0. || v_comoving[2] != 0.) { - algorithm = std::make_unique<ComovingPsatdAlgorithm>( - k_space, dm, norder_x, norder_y, norder_z, nodal, v_comoving, dt, update_with_rho); - } - // Standard PSATD algorithm - else { - algorithm = std::make_unique<PsatdAlgorithm>( - k_space, dm, norder_x, norder_y, norder_z, nodal, dt, update_with_rho); - } + algorithm = std::make_unique<PsatdAlgorithm>( + k_space, dm, norder_x, norder_y, norder_z, nodal, v_galilean, dt, update_with_rho, fft_do_time_averaging); } } |