From bf535730cb6c170394da8375887b3ae57ad6ecf5 Mon Sep 17 00:00:00 2001 From: Roelof Groenewald <40245517+roelof-groenewald@users.noreply.github.com> Date: Mon, 7 Nov 2022 20:30:31 -0800 Subject: Allow `None` for Maxwell solver (#3504) * Add "None" as an option for the Maxwell solver * fixed some of the reasons for failing CI tests * no longer pass `do_electrostatic` to `GuardCellManager` * renamed `MaxwellSolverAlgo` to `ElectromagneticSolverAlgo` * rename `do_electrostatic` to `electrostatic_solver_id` * rename `maxwell_solver_id` to `electromagnetic_solver_id` * changes requested during PR review * remove `do_no_deposit` from tests without field evolution * Fix doc-string in `GuardCellManager.H` Co-authored-by: Edoardo Zoni <59625522+EZoni@users.noreply.github.com> Co-authored-by: Edoardo Zoni <59625522+EZoni@users.noreply.github.com> --- Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp') diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp index ae5600dae..c29c0cdb6 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp @@ -53,7 +53,7 @@ void FiniteDifferenceSolver::EvolveF ( // Select algorithm (The choice of algorithm is a runtime option, // but we compile code for each algorithm, using templates) #ifdef WARPX_DIM_RZ - if (m_fdtd_algo == MaxwellSolverAlgo::Yee){ + if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee){ EvolveFCylindrical ( Ffield, Efield, rhofield, rhocomp, dt ); @@ -62,11 +62,11 @@ void FiniteDifferenceSolver::EvolveF ( EvolveFCartesian ( Ffield, Efield, rhofield, rhocomp, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { EvolveFCartesian ( Ffield, Efield, rhofield, rhocomp, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveFCartesian ( Ffield, Efield, rhofield, rhocomp, dt ); -- cgit v1.2.3