Skip to content
Snippets Groups Projects
Commit 022d4cd0 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

[Cleanup] Parse Solver::VerbosityMode as enum

parent 60e97580
No related branches found
No related tags found
No related merge requests found
#include <dune/solvers/common/numproc.hh> // Solver::VerbosityMode
#include <dune/common/exceptions.hh>
template <> struct StringToEnum<Solver::VerbosityMode> {
static Solver::VerbosityMode convert(std::string const &s) {
if (s == "full")
return Solver::FULL;
if (s == "reduced")
return Solver::REDUCED;
if (s == "quiet")
return Solver::QUIET;
DUNE_THROW(Dune::Exception, "failed to parse enum");
}
};
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
#include "enum_parser.cc" #include "enum_parser.cc"
#include "enum_state_model.cc" #include "enum_state_model.cc"
#include "enum_scheme.cc" #include "enum_scheme.cc"
#include "enum_verbosity.cc"
#include "timestepping.hh" #include "timestepping.hh"
...@@ -367,8 +368,7 @@ int main(int argc, char *argv[]) { ...@@ -367,8 +368,7 @@ int main(int argc, char *argv[]) {
refinements, 1e-12, // FIXME, refinements, 1e-12, // FIXME,
*grid, displacementDirichletNodes); *grid, displacementDirichletNodes);
auto multigridStep = displacementFactory.getSolver(); auto multigridStep = displacementFactory.getSolver();
Solver::VerbosityMode const verbosity = auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity");
parset.get<bool>("verbose") ? Solver::FULL : Solver::QUIET;
typename LinearFactoryType::ConvexProblemType myConvexProblem( typename LinearFactoryType::ConvexProblemType myConvexProblem(
1.0, A, zeroNonlinearity, ell, u_initial); 1.0, A, zeroNonlinearity, ell, u_initial);
...@@ -420,8 +420,7 @@ int main(int argc, char *argv[]) { ...@@ -420,8 +420,7 @@ int main(int argc, char *argv[]) {
refinements, 1e-12, // FIXME, refinements, 1e-12, // FIXME,
*grid, accelerationDirichletNodes); *grid, accelerationDirichletNodes);
auto multigridStep = accelerationFactory.getSolver(); auto multigridStep = accelerationFactory.getSolver();
Solver::VerbosityMode const verbosity = auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity");
parset.get<bool>("verbose") ? Solver::FULL : Solver::QUIET;
typename LinearFactoryType::ConvexProblemType myConvexProblem( typename LinearFactoryType::ConvexProblemType myConvexProblem(
1.0, M, zeroNonlinearity, problem_rhs_initial, a_initial); 1.0, M, zeroNonlinearity, problem_rhs_initial, a_initial);
...@@ -452,8 +451,7 @@ int main(int argc, char *argv[]) { ...@@ -452,8 +451,7 @@ int main(int argc, char *argv[]) {
solverTolerance, *grid, solverTolerance, *grid,
velocityDirichletNodes); velocityDirichletNodes);
auto multigridStep = factory.getSolver(); auto multigridStep = factory.getSolver();
Solver::VerbosityMode const verbosity = auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity");
parset.get<bool>("verbose") ? Solver::FULL : Solver::QUIET;
{ {
std::fstream coordinateWriter("coordinates", std::fstream::out); std::fstream coordinateWriter("coordinates", std::fstream::out);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
timeSteps = 10000 timeSteps = 10000
endOfTime = 15 endOfTime = 15
verbose = false verbosity = quiet
printProgress = false printProgress = false
writeVTK = false writeVTK = false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment