Skip to content
Snippets Groups Projects
Commit 15a0bb97 authored by podlesny's avatar podlesny
Browse files

no friction setup for debugging

parent 62134e66
No related branches found
No related tags found
No related merge requests found
...@@ -396,8 +396,8 @@ int main(int argc, char *argv[]) { ...@@ -396,8 +396,8 @@ int main(int argc, char *argv[]) {
// Set up TNNMG solver // Set up TNNMG solver
// ------------------- // -------------------
//using Functional = Functional<Matrix&, Vector&, ZeroNonlinearity&, Vector&, Vector&, field_type>; using Functional = Functional<Matrix&, Vector&, ZeroNonlinearity&, Vector&, Vector&, field_type>;
using Functional = Functional<Matrix&, Vector&, GlobalFriction<Matrix, Vector>&, Vector&, Vector&, field_type>; //using Functional = Functional<Matrix&, Vector&, GlobalFriction<Matrix, Vector>&, Vector&, Vector&, field_type>;
using NonlinearFactory = SolverFactory<Functional, BitVector>; using NonlinearFactory = SolverFactory<Functional, BitVector>;
using BoundaryFunctions = typename ContactNetwork::BoundaryFunctions; using BoundaryFunctions = typename ContactNetwork::BoundaryFunctions;
...@@ -469,8 +469,10 @@ int main(int argc, char *argv[]) { ...@@ -469,8 +469,10 @@ int main(int argc, char *argv[]) {
typename ContactNetwork::ExternalForces externalForces; typename ContactNetwork::ExternalForces externalForces;
contactNetwork.externalForces(externalForces); contactNetwork.externalForces(externalForces);
auto&& noFriction = ZeroNonlinearity();
StepBase<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>> StepBase<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>>
stepBase(parset, contactNetwork, totalDirichletNodes, globalFriction, frictionNodes, stepBase(parset, contactNetwork, totalDirichletNodes, noFriction, frictionNodes,
externalForces, stateEnergyNorms); externalForces, stateEnergyNorms);
UniformTimeStepper<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>> UniformTimeStepper<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>>
......
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