Skip to content

[Core] Fix ignored solver settings in PMGBuilderAndSolver #14357

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

Open
matekelemen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Core] Fix ignored solver settings in PMGBuilderAndSolver #14357

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
33 changes: 17 additions & 16 deletions kratos/solving_strategies/builder_and_solvers/p_multigrid/p_multigrid_builder_and_solver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,7 @@ void PMultigridBuilderAndSolver<TSparse,TDense>::AssignSettings(const Parameters
<< "Make sure you imported the application it is defined in and that the spelling is correct.";
const auto& r_factory = SolverFactoryRegistry::Get(solver_name);
this->mpImpl->mpRootGridSolver = r_factory.Create(smoother_settings);
Interface::mpLinearSystemSolver = mpImpl->mpRootGridSolver;

// Construct the coarse hierarchy.
const std::string coarse_build_precision = coarse_hierarchy_settings["precision"].Get<std::string>();
Expand Down Expand Up @@ -1102,19 +1103,21 @@ void PMultigridBuilderAndSolver<TSparse,TDense>::AssignSettings(const Parameters
KRATOS_CATCH("")
} /* if coarse_hierarchy_settings["max_depth"].Get<int>() */ else {
KRATOS_TRY
KRATOS_ERROR_IF_NOT(leaf_solver_settings.Has("solver_type"));
const std::string solver_name = leaf_solver_settings["solver_type"].Get<std::string>();
using SolverFactoryRegistry = KratosComponents<LinearSolverFactory<TSparse,TDense>>;
KRATOS_ERROR_IF_NOT(SolverFactoryRegistry::Has(solver_name))
<< "'" << solver_name << "' does not name a registered linear solver. Options are:\n"
<< []() -> std::string {
std::stringstream message;
for (const auto& r_pair : SolverFactoryRegistry::GetComponents())
message << "\t" << r_pair.first << "\n";
return message.str();
}();
const auto& r_factory = SolverFactoryRegistry::Get(solver_name);
this->mpImpl->mpRootGridSolver = r_factory.Create(leaf_solver_settings);
if (leaf_solver_settings.Has("solver_type")) {
const std::string solver_name = leaf_solver_settings["solver_type"].Get<std::string>();
using SolverFactoryRegistry = KratosComponents<LinearSolverFactory<TSparse,TDense>>;
KRATOS_ERROR_IF_NOT(SolverFactoryRegistry::Has(solver_name))
<< "'" << solver_name << "' does not name a registered linear solver. Options are:\n"
<< []() -> std::string {
std::stringstream message;
for (const auto& r_pair : SolverFactoryRegistry::GetComponents())
message << "\t" << r_pair.first << "\n";
return message.str();
}();
const auto& r_factory = SolverFactoryRegistry::Get(solver_name);
this->mpImpl->mpRootGridSolver = r_factory.Create(leaf_solver_settings);
Interface::mpLinearSystemSolver = mpImpl->mpRootGridSolver;
}
KRATOS_CATCH("")
}

Expand Down Expand Up @@ -1154,9 +1157,7 @@ Parameters PMultigridBuilderAndSolver<TSparse,TDense>::GetDefaultParameters() co
"smoother_settings" : {
"solver_type" : ""
},
"linear_solver_settings" : {
"solver_type" : "amgcl"
},
"linear_solver_settings" : {},
"constraint_imposition_settings" : {
"method" : "master_slave"
},
Expand Down
Loading