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

[Cleanup] Add io group to parset

parent d1f00e91
No related branches found
No related tags found
No related merge requests found
...@@ -363,7 +363,7 @@ int main(int argc, char *argv[]) { ...@@ -363,7 +363,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();
auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity"); auto const verbosity = parset.get<Solver::VerbosityMode>("io.verbosity");
typename LinearFactoryType::ConvexProblemType myConvexProblem( typename LinearFactoryType::ConvexProblemType myConvexProblem(
1.0, A, zeroNonlinearity, ell, u_initial); 1.0, A, zeroNonlinearity, ell, u_initial);
...@@ -415,7 +415,7 @@ int main(int argc, char *argv[]) { ...@@ -415,7 +415,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();
auto const verbosity = parset.get<Solver::VerbosityMode>("verbosity"); auto const verbosity = parset.get<Solver::VerbosityMode>("io.verbosity");
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);
...@@ -446,7 +446,7 @@ int main(int argc, char *argv[]) { ...@@ -446,7 +446,7 @@ int main(int argc, char *argv[]) {
solverTolerance, *grid, solverTolerance, *grid,
velocityDirichletNodes); velocityDirichletNodes);
auto multigridStep = factory.getSolver(); 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); std::fstream coordinateWriter("coordinates", std::fstream::out);
...@@ -482,7 +482,7 @@ int main(int argc, char *argv[]) { ...@@ -482,7 +482,7 @@ int main(int argc, char *argv[]) {
auto const damping = parset.get<double>("solver.damping"); auto const damping = parset.get<double>("solver.damping");
auto const minimalCorrectionReduction = auto const minimalCorrectionReduction =
parset.get<double>("solver.minimal_correction_reduction"); 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) { for (size_t run = 1; run <= timesteps; ++run) {
VectorType u; VectorType u;
double lastCorrection; double lastCorrection;
...@@ -587,7 +587,7 @@ int main(int argc, char *argv[]) { ...@@ -587,7 +587,7 @@ int main(int argc, char *argv[]) {
iterationWriter << std::endl; iterationWriter << std::endl;
dampingWriter << std::endl; dampingWriter << std::endl;
if (parset.get<bool>("writeVTK")) { if (parset.get<bool>("io.writeVTK")) {
SingletonVectorType vonMisesStress; SingletonVectorType vonMisesStress;
auto const gridDisplacement = auto const gridDisplacement =
Dune::make_shared<BasisGridFunction<P1Basis, VectorType> const>( Dune::make_shared<BasisGridFunction<P1Basis, VectorType> const>(
...@@ -600,7 +600,7 @@ int main(int argc, char *argv[]) { ...@@ -600,7 +600,7 @@ int main(int argc, char *argv[]) {
(boost::format("obs%d") % run).str()); (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 " std::cerr << std::endl << "Making " << timesteps << " time steps took "
<< timer.elapsed() << "s" << std::endl; << timer.elapsed() << "s" << std::endl;
......
...@@ -2,15 +2,14 @@ ...@@ -2,15 +2,14 @@
timeSteps = 10000 timeSteps = 10000
endOfTime = 15 endOfTime = 15
verbosity = quiet
printProgress = false
writeVTK = false
enableTimer = false
timeSteppingScheme = newmark timeSteppingScheme = newmark
[io]
verbosity = quiet
printProgress = false
enableTimer = false
writeVTK = false
[grid] [grid]
refinements = 4 refinements = 4
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment