diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index 16546a502e4bf87cadafdf7cbfff6e7b88989bef..aae5010589532737883f3a4af196fdd04db8380f 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -363,7 +363,7 @@ int main(int argc, char *argv[]) { refinements, 1e-12, // FIXME, *grid, displacementDirichletNodes); auto multigridStep = displacementFactory.getSolver(); - auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity"); + auto const verbosity = parset.get<Solver::VerbosityMode>("io.verbosity"); typename LinearFactoryType::ConvexProblemType myConvexProblem( 1.0, A, zeroNonlinearity, ell, u_initial); @@ -415,7 +415,7 @@ int main(int argc, char *argv[]) { refinements, 1e-12, // FIXME, *grid, accelerationDirichletNodes); auto multigridStep = accelerationFactory.getSolver(); - auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity"); + auto const verbosity = parset.get<Solver::VerbosityMode>("io.verbosity"); typename LinearFactoryType::ConvexProblemType myConvexProblem( 1.0, M, zeroNonlinearity, problem_rhs_initial, a_initial); @@ -446,7 +446,7 @@ int main(int argc, char *argv[]) { solverTolerance, *grid, velocityDirichletNodes); auto multigridStep = factory.getSolver(); - auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity"); + auto const verbosity = parset.get<Solver::VerbosityMode>("io.verbosity"); { std::fstream coordinateWriter("coordinates", std::fstream::out); @@ -482,7 +482,7 @@ int main(int argc, char *argv[]) { auto const damping = parset.get<double>("solver.damping"); auto const minimalCorrectionReduction = parset.get<double>("solver.minimal_correction_reduction"); - auto const printProgress = parset.get<bool>("printProgress"); + auto const printProgress = parset.get<bool>("io.printProgress"); for (size_t run = 1; run <= timesteps; ++run) { VectorType u; double lastCorrection; @@ -587,7 +587,7 @@ int main(int argc, char *argv[]) { iterationWriter << std::endl; dampingWriter << std::endl; - if (parset.get<bool>("writeVTK")) { + if (parset.get<bool>("io.writeVTK")) { SingletonVectorType vonMisesStress; auto const gridDisplacement = Dune::make_shared<BasisGridFunction<P1Basis, VectorType> const>( @@ -600,7 +600,7 @@ int main(int argc, char *argv[]) { (boost::format("obs%d") % run).str()); } } - if (parset.get<bool>("enableTimer")) + if (parset.get<bool>("io.enableTimer")) std::cerr << std::endl << "Making " << timesteps << " time steps took " << timer.elapsed() << "s" << std::endl; diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset index c6b4cd4a0a6ec3d2f48c8fd1cfff2d5e603e388f..6135012c253f93b8992dcafae538354363eda1d2 100644 --- a/src/one-body-sample.parset +++ b/src/one-body-sample.parset @@ -2,15 +2,14 @@ timeSteps = 10000 endOfTime = 15 -verbosity = quiet -printProgress = false - -writeVTK = false - -enableTimer = false - timeSteppingScheme = newmark +[io] +verbosity = quiet +printProgress = false +enableTimer = false +writeVTK = false + [grid] refinements = 4