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

WarpX class: do_multi_J and do_multi_J_n_depositions no longer static #5623

Closed
wants to merge 1 commit into from
Closed

WarpX class: do_multi_J and do_multi_J_n_depositions no longer static #5623

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
4 changes: 2 additions & 2 deletions Source/Evolve/WarpXEvolve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ WarpX::Evolve (int numsteps)
PushParticlesandDeposit(cur_time, skip_deposition);
}
// Electromagnetic case: multi-J algorithm
else if (do_multi_J)
else if (m_do_multi_J)
{
OneStep_multiJ(cur_time);
}
Expand Down Expand Up @@ -724,7 +724,7 @@ WarpX::OneStep_multiJ (const amrex::Real cur_time)
}

// Number of depositions for multi-J scheme
const int n_deposit = WarpX::do_multi_J_n_depositions;
const int n_deposit = m_do_multi_J_n_depositions;
// Time sub-step for each multi-J deposition
const amrex::Real sub_dt = dt[0] / static_cast<amrex::Real>(n_deposit);
// Whether to perform multi-J depositions on a time interval that spans
Expand Down
4 changes: 2 additions & 2 deletions Source/Initialization/WarpXInitData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,10 @@ WarpX::PrintMainPICparameters ()
if (WarpX::do_divb_cleaning) {
amrex::Print() << " | - div(B) cleaning is ON \n";
}
if (do_multi_J){
if (m_do_multi_J){
amrex::Print() << " | - multi-J deposition is ON \n";
amrex::Print() << " | - do_multi_J_n_depositions = "
<< WarpX::do_multi_J_n_depositions << "\n";
<< m_do_multi_J_n_depositions << "\n";
if (J_in_time == JInTime::Linear){
amrex::Print() << " | - J_in_time = linear \n";
}
Expand Down
6 changes: 3 additions & 3 deletions Source/WarpX.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,6 @@ public:
//! Specifies the type of grid used for the above sorting, i.e. cell-centered, nodal, or mixed
static amrex::IntVect sort_idx_type;

static bool do_multi_J;
static int do_multi_J_n_depositions;

static bool do_device_synchronize;

//! With mesh refinement, particles located inside a refinement patch, but within
Expand Down Expand Up @@ -1606,6 +1603,9 @@ private:
int noy_fft = 16;
int noz_fft = 16;

bool m_do_multi_J = false;
int m_do_multi_J_n_depositions;

//! Solve Poisson equation when loading an external magnetic field to clean divergence
//! This is useful to remove errors that could lead to non-zero B field divergence
bool m_do_divb_cleaning_external = false;
Expand Down
25 changes: 11 additions & 14 deletions Source/WarpX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,6 @@ amrex::IntVect WarpX::sort_idx_type(AMREX_D_DECL(0,0,0));

bool WarpX::do_dynamic_scheduling = true;

bool WarpX::do_multi_J = false;
int WarpX::do_multi_J_n_depositions;

IntVect WarpX::filter_npass_each_dir(1);

int WarpX::n_field_gather_buffer = -1;
Expand Down Expand Up @@ -642,11 +639,11 @@ WarpX::ReadParameters ()
pp_warpx.query("verbose", verbose);
utils::parser::queryWithParser(pp_warpx, "regrid_int", regrid_int);
pp_warpx.query("do_subcycling", m_do_subcycling);
pp_warpx.query("do_multi_J", do_multi_J);
if (do_multi_J)
pp_warpx.query("do_multi_J", m_do_multi_J);
if (m_do_multi_J)
{
utils::parser::getWithParser(
pp_warpx, "do_multi_J_n_depositions", do_multi_J_n_depositions);
pp_warpx, "do_multi_J_n_depositions", m_do_multi_J_n_depositions);
}
pp_warpx.query("use_hybrid_QED", use_hybrid_QED);
pp_warpx.query("safe_guard_cells", m_safe_guard_cells);
Expand Down Expand Up @@ -1198,7 +1195,7 @@ WarpX::ReadParameters ()

if (WarpX::current_deposition_algo == CurrentDepositionAlgo::Vay) {
WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
do_multi_J == false,
m_do_multi_J == false,
"Vay deposition not implemented with multi-J algorithm");
}

Expand Down Expand Up @@ -1498,7 +1495,7 @@ WarpX::ReadParameters ()
pp_psatd.query_enum_sloppy("J_in_time", J_in_time, "-_");
pp_psatd.query_enum_sloppy("rho_in_time", rho_in_time, "-_");

if (m_psatd_solution_type != PSATDSolutionType::FirstOrder || !do_multi_J)
if (m_psatd_solution_type != PSATDSolutionType::FirstOrder || !m_do_multi_J)
{
WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
rho_in_time == RhoInTime::Linear,
Expand All @@ -1519,7 +1516,7 @@ WarpX::ReadParameters ()

// TODO Remove this default when current correction will
// be implemented for the multi-J algorithm as well.
if (do_multi_J) { current_correction = false; }
if (m_do_multi_J) { current_correction = false; }

pp_psatd.query("current_correction", current_correction);

Expand Down Expand Up @@ -1658,7 +1655,7 @@ WarpX::ReadParameters ()
"psatd.update_with_rho must be equal to 1 for comoving PSATD"
);

if (do_multi_J)
if (m_do_multi_J)
{
WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
v_galilean_is_zero,
Expand Down Expand Up @@ -2078,7 +2075,7 @@ WarpX::AllocLevelData (int lev, const BoxArray& ba, const DistributionMapping& d
WarpX::m_v_galilean,
WarpX::m_v_comoving,
m_safe_guard_cells,
WarpX::do_multi_J,
m_do_multi_J,
WarpX::fft_do_time_averaging,
::isAnyBoundaryPML(field_boundary_lo, field_boundary_hi),
WarpX::do_pml_in_domain,
Expand Down Expand Up @@ -2429,7 +2426,7 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm
if (WarpX::electromagnetic_solver_id == ElectromagneticSolverAlgo::PSATD) {
if (do_dive_cleaning || update_with_rho || current_correction) {
// For the multi-J algorithm we can allocate only one rho component (no distinction between old and new)
rho_ncomps = (WarpX::do_multi_J) ? ncomps : 2*ncomps;
rho_ncomps = (m_do_multi_J) ? ncomps : 2*ncomps;
}
}
if (rho_ncomps > 0)
Expand Down Expand Up @@ -2819,7 +2816,7 @@ void WarpX::AllocLevelSpectralSolverRZ (amrex::Vector<std::unique_ptr<SpectralSo
const RealVect dx_vect(dx[0], dx[2]);

amrex::Real solver_dt = dt[lev];
if (WarpX::do_multi_J) { solver_dt /= static_cast<amrex::Real>(WarpX::do_multi_J_n_depositions); }
if (m_do_multi_J) { solver_dt /= static_cast<amrex::Real>(m_do_multi_J_n_depositions); }
if (evolve_scheme == EvolveScheme::StrangImplicitSpectralEM) {
// The step is Strang split into two half steps
solver_dt /= 2.;
Expand Down Expand Up @@ -2876,7 +2873,7 @@ void WarpX::AllocLevelSpectralSolver (amrex::Vector<std::unique_ptr<SpectralSolv
#endif

amrex::Real solver_dt = dt[lev];
if (WarpX::do_multi_J) { solver_dt /= static_cast<amrex::Real>(WarpX::do_multi_J_n_depositions); }
if (m_do_multi_J) { solver_dt /= static_cast<amrex::Real>(m_do_multi_J_n_depositions); }
if (evolve_scheme == EvolveScheme::StrangImplicitSpectralEM) {
// The step is Strang split into two half steps
solver_dt /= 2.;
Expand Down
Loading