diff options
Diffstat (limited to 'Source/FieldSolver')
14 files changed, 36 insertions, 36 deletions
diff --git a/Source/FieldSolver/ElectrostaticSolver.cpp b/Source/FieldSolver/ElectrostaticSolver.cpp index 103fff131..c227506f6 100644 --- a/Source/FieldSolver/ElectrostaticSolver.cpp +++ b/Source/FieldSolver/ElectrostaticSolver.cpp @@ -69,7 +69,7 @@ WarpX::ComputeSpaceChargeField (bool const reset_fields) } } - if (do_electrostatic == ElectrostaticSolverAlgo::LabFrame) { + if (electrostatic_solver_id == ElectrostaticSolverAlgo::LabFrame) { AddSpaceChargeFieldLabFrame(); } else { @@ -79,13 +79,13 @@ WarpX::ComputeSpaceChargeField (bool const reset_fields) for (int ispecies=0; ispecies<mypc->nSpecies(); ispecies++){ WarpXParticleContainer& species = mypc->GetParticleContainer(ispecies); if (species.initialize_self_fields || - (do_electrostatic == ElectrostaticSolverAlgo::Relativistic)) { + (electrostatic_solver_id == ElectrostaticSolverAlgo::Relativistic)) { AddSpaceChargeField(species); } } // Add the field due to the boundary potentials - if (do_electrostatic == ElectrostaticSolverAlgo::Relativistic){ + if (electrostatic_solver_id == ElectrostaticSolverAlgo::Relativistic){ AddBoundaryField(); } } @@ -311,7 +311,7 @@ WarpX::computePhi (const amrex::Vector<std::unique_ptr<amrex::MultiFab> >& rho, #if defined(AMREX_USE_EB) // EB: use AMReX to directly calculate the electric field since with EB's the // simple finite difference scheme in WarpX::computeE sometimes fails - if (do_electrostatic == ElectrostaticSolverAlgo::LabFrame) + if (electrostatic_solver_id == ElectrostaticSolverAlgo::LabFrame) { // TODO: maybe make this a helper function or pass Efield_fp directly amrex::Vector< diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp index 01ae22a09..d6ac45a98 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/ApplySilverMuellerBoundary.cpp @@ -44,7 +44,7 @@ void FiniteDifferenceSolver::ApplySilverMuellerBoundary ( // Ensure that we are using the Yee solver WARPX_ALWAYS_ASSERT_WITH_MESSAGE( - m_fdtd_algo == MaxwellSolverAlgo::Yee, + m_fdtd_algo == ElectromagneticSolverAlgo::Yee, "The Silver-Mueller boundary conditions can only be used with the Yee solver." ); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp index f9e434699..9ac32a19d 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp @@ -46,7 +46,7 @@ void FiniteDifferenceSolver::ComputeDivE ( // 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){ ComputeDivECylindrical <CylindricalYeeAlgorithm> ( Efield, divEfield ); @@ -55,11 +55,11 @@ void FiniteDifferenceSolver::ComputeDivE ( ComputeDivECartesian <CartesianNodalAlgorithm> ( Efield, divEfield ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { ComputeDivECartesian <CartesianYeeAlgorithm> ( Efield, divEfield ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { ComputeDivECartesian <CartesianCKCAlgorithm> ( Efield, divEfield ); 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 <CylindricalYeeAlgorithm> ( 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 <CartesianNodalAlgorithm> ( Bfield, Efield, Gfield, lev, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { EvolveBCartesian <CartesianYeeAlgorithm> ( Bfield, Efield, Gfield, lev, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveBCartesian <CartesianCKCAlgorithm> ( 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); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp index aad66d3d4..2907e3fdf 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp @@ -57,11 +57,11 @@ void FiniteDifferenceSolver::EvolveBPML ( EvolveBPMLCartesian <CartesianNodalAlgorithm> (Bfield, Efield, dt, dive_cleaning); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee || m_fdtd_algo == MaxwellSolverAlgo::ECT) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee || m_fdtd_algo == ElectromagneticSolverAlgo::ECT) { EvolveBPMLCartesian <CartesianYeeAlgorithm> (Bfield, Efield, dt, dive_cleaning); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveBPMLCartesian <CartesianCKCAlgorithm> (Bfield, Efield, dt, dive_cleaning); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp index da91eb73d..fe6181aca 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp @@ -56,7 +56,7 @@ void FiniteDifferenceSolver::EvolveE ( int lev, amrex::Real const dt ) { #ifdef AMREX_USE_EB - if (m_fdtd_algo != MaxwellSolverAlgo::ECT) { + if (m_fdtd_algo != ElectromagneticSolverAlgo::ECT) { amrex::ignore_unused(face_areas, ECTRhofield); } #else @@ -66,7 +66,7 @@ void FiniteDifferenceSolver::EvolveE ( // 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(edge_lengths); EvolveECylindrical <CylindricalYeeAlgorithm> ( Efield, Bfield, Jfield, Ffield, lev, dt ); #else @@ -74,11 +74,11 @@ void FiniteDifferenceSolver::EvolveE ( EvolveECartesian <CartesianNodalAlgorithm> ( Efield, Bfield, Jfield, edge_lengths, Ffield, lev, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee || m_fdtd_algo == MaxwellSolverAlgo::ECT) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee || m_fdtd_algo == ElectromagneticSolverAlgo::ECT) { EvolveECartesian <CartesianYeeAlgorithm> ( Efield, Bfield, Jfield, edge_lengths, Ffield, lev, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveECartesian <CartesianCKCAlgorithm> ( Efield, Bfield, Jfield, edge_lengths, Ffield, lev, dt ); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp index 59a247921..0ef5571a1 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp @@ -54,7 +54,7 @@ void FiniteDifferenceSolver::EvolveECTRho ( const int lev) { #if !defined(WARPX_DIM_RZ) and defined(AMREX_USE_EB) - if (m_fdtd_algo == MaxwellSolverAlgo::ECT) { + if (m_fdtd_algo == ElectromagneticSolverAlgo::ECT) { EvolveRhoCartesianECT(Efield, edge_lengths, face_areas, ECTRhofield, lev); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp index e01d813ff..8232d2d0d 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp @@ -64,12 +64,12 @@ void FiniteDifferenceSolver::EvolveEPML ( EvolveEPMLCartesian <CartesianNodalAlgorithm> ( Efield, Bfield, Jfield, edge_lengths, Ffield, sigba, dt, pml_has_particles ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee || m_fdtd_algo == MaxwellSolverAlgo::ECT) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee || m_fdtd_algo == ElectromagneticSolverAlgo::ECT) { EvolveEPMLCartesian <CartesianYeeAlgorithm> ( Efield, Bfield, Jfield, edge_lengths, Ffield, sigba, dt, pml_has_particles ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveEPMLCartesian <CartesianCKCAlgorithm> ( Efield, Bfield, Jfield, edge_lengths, Ffield, sigba, dt, pml_has_particles ); 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 <CylindricalYeeAlgorithm> ( Ffield, Efield, rhofield, rhocomp, dt ); @@ -62,11 +62,11 @@ void FiniteDifferenceSolver::EvolveF ( EvolveFCartesian <CartesianNodalAlgorithm> ( Ffield, Efield, rhofield, rhocomp, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { EvolveFCartesian <CartesianYeeAlgorithm> ( Ffield, Efield, rhofield, rhocomp, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveFCartesian <CartesianCKCAlgorithm> ( Ffield, Efield, rhofield, rhocomp, dt ); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp index c1d88282e..6a94d205a 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp @@ -55,11 +55,11 @@ void FiniteDifferenceSolver::EvolveFPML ( EvolveFPMLCartesian <CartesianNodalAlgorithm> ( Ffield, Efield, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { EvolveFPMLCartesian <CartesianYeeAlgorithm> ( Ffield, Efield, dt ); - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveFPMLCartesian <CartesianCKCAlgorithm> ( Ffield, Efield, dt ); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp index 3a705698b..0c971d577 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp @@ -51,11 +51,11 @@ void FiniteDifferenceSolver::EvolveG ( { EvolveGCartesian<CartesianNodalAlgorithm>(Gfield, Bfield, dt); } - else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) + else if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { EvolveGCartesian<CartesianYeeAlgorithm>(Gfield, Bfield, dt); } - else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) + else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { EvolveGCartesian<CartesianCKCAlgorithm>(Gfield, Bfield, dt); } diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp index f63028f50..e8529ef15 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp @@ -37,7 +37,7 @@ FiniteDifferenceSolver::FiniteDifferenceSolver ( m_do_nodal = do_nodal; // return if not FDTD - if (fdtd_algo == MaxwellSolverAlgo::PSATD) + if (fdtd_algo == ElectromagneticSolverAlgo::None || fdtd_algo == ElectromagneticSolverAlgo::PSATD) return; // Calculate coefficients of finite-difference stencil @@ -45,7 +45,7 @@ FiniteDifferenceSolver::FiniteDifferenceSolver ( m_dr = cell_size[0]; m_nmodes = WarpX::GetInstance().n_rz_azimuthal_modes; m_rmin = WarpX::GetInstance().Geom(0).ProbLo(0); - if (fdtd_algo == MaxwellSolverAlgo::Yee) { + if (fdtd_algo == ElectromagneticSolverAlgo::Yee) { CylindricalYeeAlgorithm::InitializeStencilCoefficients( cell_size, m_h_stencil_coefs_r, m_h_stencil_coefs_z ); m_stencil_coefs_r.resize(m_h_stencil_coefs_r.size()); @@ -67,12 +67,12 @@ FiniteDifferenceSolver::FiniteDifferenceSolver ( CartesianNodalAlgorithm::InitializeStencilCoefficients( cell_size, m_h_stencil_coefs_x, m_h_stencil_coefs_y, m_h_stencil_coefs_z ); - } else if (fdtd_algo == MaxwellSolverAlgo::Yee || fdtd_algo == MaxwellSolverAlgo::ECT) { + } else if (fdtd_algo == ElectromagneticSolverAlgo::Yee || fdtd_algo == ElectromagneticSolverAlgo::ECT) { CartesianYeeAlgorithm::InitializeStencilCoefficients( cell_size, m_h_stencil_coefs_x, m_h_stencil_coefs_y, m_h_stencil_coefs_z ); - } else if (fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (fdtd_algo == ElectromagneticSolverAlgo::CKC) { CartesianCKCAlgorithm::InitializeStencilCoefficients( cell_size, m_h_stencil_coefs_x, m_h_stencil_coefs_y, m_h_stencil_coefs_z ); diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp index d6bc9be9e..ab2e25014 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp @@ -53,7 +53,7 @@ void FiniteDifferenceSolver::MacroscopicEvolveE ( !m_do_nodal, "macro E-push does not work for nodal"); - if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + if (m_fdtd_algo == ElectromagneticSolverAlgo::Yee) { if (WarpX::macroscopic_solver_algo == MacroscopicSolverAlgo::LaxWendroff) { @@ -68,7 +68,7 @@ void FiniteDifferenceSolver::MacroscopicEvolveE ( } - } else if (m_fdtd_algo == MaxwellSolverAlgo::CKC) { + } else if (m_fdtd_algo == ElectromagneticSolverAlgo::CKC) { // Note : EvolveE is the same for CKC and Yee. // In the templated Yee and CKC calls, the core operations for EvolveE is the same. diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp index e8f20661a..a3a882962 100644 --- a/Source/FieldSolver/WarpXPushFieldsEM.cpp +++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp @@ -880,7 +880,7 @@ WarpX::EvolveE (int lev, PatchType patch_type, amrex::Real a_dt) // ECTRhofield must be recomputed at the very end of the Efield update to ensure // that ECTRhofield is consistent with Efield #ifdef AMREX_USE_EB - if (WarpX::maxwell_solver_id == MaxwellSolverAlgo::ECT) { + if (WarpX::electromagnetic_solver_id == ElectromagneticSolverAlgo::ECT) { if (patch_type == PatchType::fine) { m_fdtd_solver_fp[lev]->EvolveECTRho(Efield_fp[lev], m_edge_lengths[lev], m_face_areas[lev], ECTRhofield[lev], lev); |