From 9810532d19d0f613d069ad1b461ce97b3e105617 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 29 Jan 2020 17:21:35 +0100
Subject: [PATCH] [istl][solver] Do not use logging tree directly
---
dumux/linear/istlsolverfactorybackend.hh | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/dumux/linear/istlsolverfactorybackend.hh b/dumux/linear/istlsolverfactorybackend.hh
index c01afb3a6b..4e17853ebd 100644
--- a/dumux/linear/istlsolverfactorybackend.hh
+++ b/dumux/linear/istlsolverfactorybackend.hh
@@ -165,18 +165,16 @@ private:
void convertParameterTree_(const std::string& paramGroup="")
{
- const auto& loggingTree = Parameters::getTree();
auto linearSolverGroups = getParamSubGroups("LinearSolver", paramGroup);
-
for (const auto& [istlKey, dumuxKey] : istlToDumuxSolverParams)
{
for (const auto& group : linearSolverGroups)
{
auto istlName = group + "." + istlKey;
auto dumuxName = group + "." + dumuxKey;
- if (loggingTree.hasKeyOrDefaultKey(dumuxName))
+ if (hasParam(dumuxName))
{
- if(loggingTree.hasKeyOrDefaultKey(istlName))
+ if(hasParam(istlName))
{
std::cerr << "Found equivalent keys " << istlName
<< " " << dumuxName << std::endl
@@ -184,12 +182,12 @@ private:
<< ")." << std::endl;
DUNE_THROW(Dune::InvalidStateException, "Ambiguous parameters used for linear solver");
}
- params_[istlKey] = loggingTree.get<std::string>(dumuxName);
+ params_[istlKey] = getParam<std::string>(dumuxName);
break;
}
- else if (loggingTree.hasKey(istlName))
+ else if (hasParam(istlName))
{
- params_[istlKey] = loggingTree.get<std::string>(istlName);
+ params_[istlKey] = getParam<std::string>(istlName);
break;
}
}
--
GitLab