Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HybridPICModel : pass m_fields as an argument to InitData() to reduce reliance on WarpX::GetInstance() #5744

Merged
merged 1 commit into from
Mar 10, 2025
+13 −13
Merged

HybridPICModel : pass m_fields as an argument to InitData() to reduce reliance on WarpX::GetInstance() #5744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public:
const amrex::IntVect& Bz_nodal_flag
) const;

void InitData ();
void InitData (const ablastr::fields::MultiFabRegister& fields);

/**
* \brief
Expand Down
22 changes: 11 additions & 11 deletions Source/FieldSolver/FiniteDifferenceSolver/HybridPICModel/HybridPICModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void HybridPICModel::AllocateLevelMFs (
#endif
}

void HybridPICModel::InitData ()
void HybridPICModel::InitData (const ablastr::fields::MultiFabRegister& fields)
{
m_resistivity_parser = std::make_unique<amrex::Parser>(
utils::parser::makeParser(m_eta_expression, {"rho","J"}));
Expand Down Expand Up @@ -183,19 +183,19 @@ void HybridPICModel::InitData ()
m_external_current_has_time_dependence += J_ext_symbols.count("t");
}

auto & warpx = WarpX::GetInstance();
auto& warpx = WarpX::GetInstance();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still need this because it is used somewhere below.

using ablastr::fields::Direction;

// Get the grid staggering of the fields involved in calculating E
amrex::IntVect Jx_stag = warpx.m_fields.get(FieldType::current_fp, Direction{0}, 0)->ixType().toIntVect();
amrex::IntVect Jy_stag = warpx.m_fields.get(FieldType::current_fp, Direction{1}, 0)->ixType().toIntVect();
amrex::IntVect Jz_stag = warpx.m_fields.get(FieldType::current_fp, Direction{2}, 0)->ixType().toIntVect();
amrex::IntVect Bx_stag = warpx.m_fields.get(FieldType::Bfield_fp, Direction{0}, 0)->ixType().toIntVect();
amrex::IntVect By_stag = warpx.m_fields.get(FieldType::Bfield_fp, Direction{1}, 0)->ixType().toIntVect();
amrex::IntVect Bz_stag = warpx.m_fields.get(FieldType::Bfield_fp, Direction{2}, 0)->ixType().toIntVect();
amrex::IntVect Ex_stag = warpx.m_fields.get(FieldType::Efield_fp, Direction{0}, 0)->ixType().toIntVect();
amrex::IntVect Ey_stag = warpx.m_fields.get(FieldType::Efield_fp, Direction{1}, 0)->ixType().toIntVect();
amrex::IntVect Ez_stag = warpx.m_fields.get(FieldType::Efield_fp, Direction{2}, 0)->ixType().toIntVect();
amrex::IntVect Jx_stag = fields.get(FieldType::current_fp, Direction{0}, 0)->ixType().toIntVect();
amrex::IntVect Jy_stag = fields.get(FieldType::current_fp, Direction{1}, 0)->ixType().toIntVect();
amrex::IntVect Jz_stag = fields.get(FieldType::current_fp, Direction{2}, 0)->ixType().toIntVect();
amrex::IntVect Bx_stag = fields.get(FieldType::Bfield_fp, Direction{0}, 0)->ixType().toIntVect();
amrex::IntVect By_stag = fields.get(FieldType::Bfield_fp, Direction{1}, 0)->ixType().toIntVect();
amrex::IntVect Bz_stag = fields.get(FieldType::Bfield_fp, Direction{2}, 0)->ixType().toIntVect();
amrex::IntVect Ex_stag = fields.get(FieldType::Efield_fp, Direction{0}, 0)->ixType().toIntVect();
amrex::IntVect Ey_stag = fields.get(FieldType::Efield_fp, Direction{1}, 0)->ixType().toIntVect();
amrex::IntVect Ez_stag = fields.get(FieldType::Efield_fp, Direction{2}, 0)->ixType().toIntVect();

// Check that the grid types are appropriate
const bool appropriate_grids = (
Expand Down
2 changes: 1 addition & 1 deletion Source/Initialization/WarpXInitData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ WarpX::InitData ()
m_electrostatic_solver->InitData();

if (WarpX::electromagnetic_solver_id == ElectromagneticSolverAlgo::HybridPIC) {
m_hybrid_pic_model->InitData();
m_hybrid_pic_model->InitData(m_fields);
}

if (ParallelDescriptor::IOProcessor()) {
Expand Down
Loading