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

Config file option for disabling h-multigrid #148

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Config file option for disabling h-multigrid #148

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
1 change: 1 addition & 0 deletions docs/src/config/solver.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ vectors in Krylov subspace methods or other parts of the code.
### Advanced linear solver options

- `"InitialGuess" [true]`
- `"MGUseMesh" [true]`
- `"MGAuxiliarySmoother" [true]`
- `"MGSmoothEigScaleMax" [1.0]`
- `"MGSmoothEigScaleMin" [0.0]`
Expand Down
3 changes: 3 additions & 0 deletions palace/utils/configfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,6 +1683,7 @@ void LinearSolverData::SetUp(json &solver)
// Options related to multigrid.
mg_max_levels = linear->value("MGMaxLevels", mg_max_levels);
mg_coarsen_type = linear->value("MGCoarsenType", mg_coarsen_type);
mg_use_mesh = linear->value("MGUseMesh", mg_use_mesh);
mg_cycle_it = linear->value("MGCycleIts", mg_cycle_it);
mg_smooth_aux = linear->value("MGAuxiliarySmoother", mg_smooth_aux);
mg_smooth_it = linear->value("MGSmoothIts", mg_smooth_it);
Expand Down Expand Up @@ -1722,6 +1723,7 @@ void LinearSolverData::SetUp(json &solver)

linear->erase("MGMaxLevels");
linear->erase("MGCoarsenType");
linear->erase("MGUseMesh");
linear->erase("MGCycleIts");
linear->erase("MGAuxiliarySmoother");
linear->erase("MGSmoothIts");
Expand Down Expand Up @@ -1760,6 +1762,7 @@ void LinearSolverData::SetUp(json &solver)

// std::cout << "MGMaxLevels: " << mg_max_levels << '\n';
// std::cout << "MGCoarsenType: " << mg_coarsen_type << '\n';
// std::cout << "MGUseMesh: " << mg_use_mesh << '\n';
// std::cout << "MGCycleIts: " << mg_cycle_it << '\n';
// std::cout << "MGAuxiliarySmoother: " << mg_smooth_aux << '\n';
// std::cout << "MGSmoothIts: " << mg_smooth_it << '\n';
Expand Down
4 changes: 4 additions & 0 deletions palace/utils/configfile.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,10 @@ struct LinearSolverData
};
MultigridCoarsenType mg_coarsen_type = MultigridCoarsenType::LOGARITHMIC;

// Controls whether or not to include in the geometric multigrid hierarchy the mesh levels
// from uniform refinement.
bool mg_use_mesh = true;

// Number of iterations for preconditioners which support it. For multigrid, this is the
// number of V-cycles per Krylov solver iteration.
int mg_cycle_it = 1;
Expand Down
2 changes: 1 addition & 1 deletion palace/utils/geodata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void RefineMesh(const IoData &iodata, std::vector<std::unique_ptr<mfem::ParMesh>
max_region_ref_levels = sphere.ref_levels;
}
}
if (iodata.solver.linear.mg_max_levels > 1)
if (iodata.solver.linear.mg_use_mesh && iodata.solver.linear.mg_max_levels > 1)
{
mesh.reserve(1 + uniform_ref_levels + max_region_ref_levels);
}
Expand Down
1 change: 1 addition & 0 deletions scripts/schema/config/solver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"InitialGuess": { "type": "boolean" },
"MGMaxLevels": { "type": "integer", "minimum": 1 },
"MGCoarsenType": { "type": "string" },
"MGUseMesh": { "type": "boolean" },
"MGAuxiliarySmoother": { "type": "boolean" },
"MGCycleIts": { "type": "integer", "exclusiveMinimum": 0 },
"MGSmoothIts": { "type": "integer", "exclusiveMinimum": 0 },
Expand Down