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/EvolveB.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp') diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp index 02cd6fc42..0e6515a73 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp @@ -66,11 +66,11 @@ void FiniteDifferenceSolver::EvolveB ( // 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){ ignore_unused(Gfield, face_areas); EvolveBCylindrical ( Bfield, Efield, lev, dt ); #else - if(m_do_nodal or m_fdtd_algo != MaxwellSolverAlgo::ECT){ + if(m_do_nodal or m_fdtd_algo != ElectromagneticSolverAlgo::ECT){ amrex::ignore_unused(face_areas); } @@ -78,15 +78,15 @@ void FiniteDifferenceSolver::EvolveB ( EvolveBCartesian ( Bfield, Efield, Gfield, lev, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { EvolveBCartesian ( Bfield, Efield, Gfield, lev, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveBCartesian ( Bfield, Efield, Gfield, lev, dt ); #ifdef AMREX_USE_EB - } else if (m_fdtd_algo == MaxwellSolverAlgo::ECT) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::ECT) { EvolveBCartesianECT(Bfield, face_areas, area_mod, ECTRhofield, Venl, flag_info_cell, borrowing, lev, dt); -- cgit v1.2.3