Skip to content
Snippets Groups Projects
Commit 745023a8 authored by podlesny's avatar podlesny
Browse files

switch to multi threading

parent 05515907
No related branches found
No related tags found
No related merge requests found
...@@ -78,7 +78,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::coarsen( ...@@ -78,7 +78,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::coarsen(
setDeformation(current_); setDeformation(current_);
auto C_Step = Step(stepBase_, current_, currentNBodyAssembler, relativeTime_, 2 * relativeTau_, iterationRegister_); auto C_Step = Step(stepBase_, current_, currentNBodyAssembler, relativeTime_, 2 * relativeTau_, iterationRegister_);
C_Step.run(Step::Mode::sameThread); //newThread C_Step.run(Step::Mode::newThread); //newThread
//updateReductionFactors(reductionFactors); //updateReductionFactors(reductionFactors);
//std::cout << "AdaptiveTimeStepper C computed!" << std::endl << std::endl; //std::cout << "AdaptiveTimeStepper C computed!" << std::endl << std::endl;
...@@ -92,7 +92,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::coarsen( ...@@ -92,7 +92,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::coarsen(
//auto R2_linearSolver = makeLinearSolver(); //auto R2_linearSolver = makeLinearSolver();
auto&& nBodyAssembler = step(currentNBodyAssembler); auto&& nBodyAssembler = step(currentNBodyAssembler);
auto R2_Step = Step(stepBase_, R1_.updaters, nBodyAssembler, relativeTime_ + relativeTau_, relativeTau_, iterationRegister_); auto R2_Step = Step(stepBase_, R1_.updaters, nBodyAssembler, relativeTime_ + relativeTau_, relativeTau_, iterationRegister_);
R2_Step.run(Step::Mode::sameThread); //newThread R2_Step.run(Step::Mode::newThread); //newThread
//updateReductionFactors(reductionFactors); //updateReductionFactors(reductionFactors);
//std::cout << "AdaptiveTimeStepper R2 computed!" << std::endl << std::endl; //std::cout << "AdaptiveTimeStepper R2 computed!" << std::endl << std::endl;
...@@ -195,7 +195,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin ...@@ -195,7 +195,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin
setDeformation(current_); setDeformation(current_);
//auto C_linearSolver = makeLinearSolver(); //auto C_linearSolver = makeLinearSolver();
auto C_Step = Step(stepBase_, current_, currentNBodyAssembler, relativeTime_, 2 * relativeTau_, iterationRegister_); auto C_Step = Step(stepBase_, current_, currentNBodyAssembler, relativeTime_, 2 * relativeTau_, iterationRegister_);
C_Step.run(Step::Mode::sameThread); // newThread C_Step.run(Step::Mode::newThread); // newThread
//updateReductionFactors(reductionFactors); //updateReductionFactors(reductionFactors);
//std::cout << "AdaptiveTimeStepper C computed!" << std::endl << std::endl; //std::cout << "AdaptiveTimeStepper C computed!" << std::endl << std::endl;
...@@ -203,7 +203,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin ...@@ -203,7 +203,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin
//auto R2_linearSolver = makeLinearSolver(); //auto R2_linearSolver = makeLinearSolver();
auto&& nBodyAssembler = step(currentNBodyAssembler); auto&& nBodyAssembler = step(currentNBodyAssembler);
auto R2_Step = Step(stepBase_, R1_.updaters, nBodyAssembler, relativeTime_ + relativeTau_, relativeTau_, iterationRegister_); auto R2_Step = Step(stepBase_, R1_.updaters, nBodyAssembler, relativeTime_ + relativeTau_, relativeTau_, iterationRegister_);
R2_Step.run(Step::Mode::sameThread); //newThread R2_Step.run(Step::Mode::newThread); //newThread
//updateReductionFactors(reductionFactors); //updateReductionFactors(reductionFactors);
//std::cout << "AdaptiveTimeStepper R2 computed!" << std::endl << std::endl; //std::cout << "AdaptiveTimeStepper R2 computed!" << std::endl << std::endl;
...@@ -221,7 +221,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin ...@@ -221,7 +221,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin
setDeformation(current_); setDeformation(current_);
//auto F1_linearSolver = makeLinearSolver(); //auto F1_linearSolver = makeLinearSolver();
auto F1_Step = Step(stepBase_, current_, currentNBodyAssembler, relativeTime_, relativeTau_ / 2.0, iterationRegister_); auto F1_Step = Step(stepBase_, current_, currentNBodyAssembler, relativeTime_, relativeTau_ / 2.0, iterationRegister_);
F1_Step.run(Step::Mode::sameThread); //newThread F1_Step.run(Step::Mode::newThread); //newThread
//updateReductionFactors(reductionFactors); //updateReductionFactors(reductionFactors);
//std::cout << "AdaptiveTimeStepper F1 computed!" << std::endl << std::endl; //std::cout << "AdaptiveTimeStepper F1 computed!" << std::endl << std::endl;
......
...@@ -6,7 +6,7 @@ smallestDiameter = 0.02 # 2e-3 [m] ...@@ -6,7 +6,7 @@ smallestDiameter = 0.02 # 2e-3 [m]
smallestDiameter = 0.02 # 2e-3 [m] smallestDiameter = 0.02 # 2e-3 [m]
[timeSteps] [timeSteps]
refinementTolerance = 1e-5 # 1e-5 refinementTolerance = 1e-3# 1e-5
[u0.solver] [u0.solver]
tolerance = 1e-8 tolerance = 1e-8
...@@ -18,7 +18,7 @@ tolerance = 1e-8 ...@@ -18,7 +18,7 @@ tolerance = 1e-8
tolerance = 1e-8 tolerance = 1e-8
[v.fpi] [v.fpi]
tolerance = 1e-5 # 1e-5 tolerance = 1e-3 # 1e-5
[solver.tnnmg.preconditioner.basesolver] [solver.tnnmg.preconditioner.basesolver]
tolerance = 1e-10 tolerance = 1e-10
......
...@@ -69,11 +69,11 @@ bodyCount = 2 ...@@ -69,11 +69,11 @@ bodyCount = 2
[initialTime] [initialTime]
timeStep = 0 timeStep = 0
relativeTime = 0.0 relativeTime = 0.0
relativeTau = 2e-4 # 1e-6 relativeTau = 2e-2 # 1e-6
[timeSteps] [timeSteps]
scheme = newmark scheme = newmark
timeSteps = 5000 timeSteps = 5
[u0.solver] [u0.solver]
maximumIterations = 100 maximumIterations = 100
......
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