Skip to content

Update convergence criterion for MLMG #6408

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

Merged
merged 5 commits into from
Nov 24, 2025
Merged

Update convergence criterion for MLMG #6408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35dc5f0
Update convergence criterion for MLMG
RemiLehe Nov 19, 2025
a2adeba
Fix warnings
RemiLehe Nov 19, 2025
f290f49
Update checksums
RemiLehe Nov 19, 2025
6fd43f2
Update checksum
RemiLehe Nov 20, 2025
cea222f
Update checksum
RemiLehe Nov 20, 2025
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
26 changes: 13 additions & 13 deletions Regression/Checksum/benchmarks_json/test_2d_background_mcc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"lev=0": {
"rho_electrons": 0.03558889420026204,
"rho_he_ions": 0.041762340951146074
"rho_electrons": 0.03558889420351498,
"rho_he_ions": 0.04176234095095327
},
"he_ions": {
"particle_momentum_x": 2.8840921556995102e-18,
"particle_momentum_y": 2.1957048736351022e-18,
"particle_momentum_z": 2.198216674541737e-18,
"particle_position_x": 17607.425457505866,
"particle_position_y": 1100.0247860590894,
"particle_momentum_x": 2.8840921570976e-18,
"particle_momentum_y": 2.195704873634808e-18,
"particle_momentum_z": 2.1982166745272215e-18,
"particle_position_x": 17607.425457559715,
"particle_position_y": 1100.024786059876,
"particle_weight": 71976747650.1465
},
"electrons": {
"particle_momentum_x": 1.0105526130672624e-18,
"particle_momentum_y": 2.8197429889743996e-19,
"particle_momentum_z": 2.8091808266114265e-19,
"particle_position_x": 17136.01865030665,
"particle_position_y": 936.3651769884851,
"particle_momentum_x": 1.010552606677337e-18,
"particle_momentum_y": 2.81974298750407e-19,
"particle_momentum_z": 2.8091808348750305e-19,
"particle_position_x": 17136.0186559433,
"particle_position_y": 936.3651746710019,
"particle_weight": 61113170379.63868
}
}
}
4 changes: 2 additions & 2 deletions Regression/Checksum/benchmarks_json/test_2d_embedded_boundary_cube.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"Bx": 9.2636945391314e-05,
"By": 0.00031905198911870116,
"Bz": 7.328424778796838e-05,
"Ex": 8553.90669231672,
"Ex": 8553.906692257373,
"Ey": 60867.0482641368,
"Ez": 4.223901049143958e-06
"Ez": 3.35209259952839e-08
}
}
6 changes: 3 additions & 3 deletions Regression/Checksum/benchmarks_json/test_2d_particle_reflection_picmi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"lev=0": {
"Ex": 4.865922376234882e-11,
"Ex": 1.5548810315827429e-18,
"Ey": 0.0,
"Ez": 2.3293326580399806e-10
"Ez": 9.69073951936753e-18
}
}
}
6 changes: 1 addition & 5 deletions Source/ablastr/fields/EffectivePotentialPoissonSolver.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@ computeEffectivePotentialPhi (

auto const finest_level = static_cast<int>(rho.size() - 1);

// determine if rho is zero everywhere
const amrex::Real max_norm_b = getMaxNormRho(
amrex::GetVecOfConstPtrs(rho), finest_level, absolute_tolerance);

const amrex::LPInfo info;

for (int lev=0; lev<=finest_level; lev++) {
Expand Down Expand Up @@ -231,7 +227,7 @@ computeEffectivePotentialPhi (
amrex::MLMG mlmg(*linop); // actual solver defined here
mlmg.setVerbose(verbosity);
mlmg.setMaxIter(max_iters);
mlmg.setConvergenceNormType((max_norm_b > 0) ? amrex::MLMGNormType::bnorm : amrex::MLMGNormType::greater);
mlmg.setConvergenceNormType(amrex::MLMGNormType::greater);

const int ng = int(grid_type == utils::enums::GridType::Collocated); // ghost cells
if (ng) {
Expand Down
9 changes: 4 additions & 5 deletions Source/ablastr/fields/PoissonSolver.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,6 @@ computePhi (
[](const auto b){return (b<1.0_rt);}),
"Components of beta_solver must be < 1.");

// determine if rho is zero everywhere
const amrex::Real max_norm_b = getMaxNormRho(
amrex::GetVecOfConstPtrs(rho), finest_level, absolute_tolerance);

amrex::LPInfo info;

for (int lev=0; lev<=finest_level; lev++) {
Expand All @@ -274,6 +270,9 @@ computePhi (
geom[lev].CellSize(2)/std::sqrt(1._rt-beta_solver[2]*beta_solver[2]))};

#if (defined(ABLASTR_USE_FFT) && defined(WARPX_DIM_3D))
// determine if rho is zero everywhere
const amrex::Real max_norm_b = getMaxNormRho(
amrex::GetVecOfConstPtrs(rho), finest_level, absolute_tolerance);
Copy link
Member Author

@RemiLehe RemiLehe Nov 20, 2025

Choose a reason for hiding this comment

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

I move the calculation of max_norm_b here, because it is still used by the FFT solver.

// Use the Integrated Green Function solver (FFT) on the coarsest level if it was selected
if(is_solver_igf_on_lev0 && lev==0){
if ( max_norm_b == 0 ) {
Expand Down Expand Up @@ -404,7 +403,7 @@ computePhi (
amrex::MLMG mlmg(*linop); // actual solver defined here
mlmg.setVerbose(verbosity);
mlmg.setMaxIter(max_iters);
mlmg.setConvergenceNormType((max_norm_b > 0) ? amrex::MLMGNormType::bnorm : amrex::MLMGNormType::greater);
mlmg.setConvergenceNormType(amrex::MLMGNormType::greater);

const int ng = int(grid_type == utils::enums::GridType::Collocated); // ghost cells
if (ng) {
Expand Down
Loading