From 0f191bd330ef2fcf96151297631e8ec2cbe4e51c Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@zedat.fu-berlin.de>
Date: Mon, 1 Mar 2021 13:02:15 +0100
Subject: [PATCH] use general global friction instead of zeroNonlinearity
---
src/foam/foam.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/foam/foam.cc b/src/foam/foam.cc
index aad5457a..d1048185 100644
--- a/src/foam/foam.cc
+++ b/src/foam/foam.cc
@@ -396,8 +396,8 @@ int main(int argc, char *argv[]) {
// Set up TNNMG solver
// -------------------
- 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&, ZeroNonlinearity&, Vector&, Vector&, field_type>;
+ using Functional = Functional<Matrix&, Vector&, GlobalFriction<Matrix, Vector>&, Vector&, Vector&, field_type>;
using NonlinearFactory = SolverFactory<Functional, BitVector>;
using BoundaryFunctions = typename ContactNetwork::BoundaryFunctions;
@@ -472,7 +472,7 @@ int main(int argc, char *argv[]) {
auto&& noFriction = ZeroNonlinearity();
StepBase<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>>
- stepBase(parset, contactNetwork, totalDirichletNodes, noFriction, frictionNodes,
+ stepBase(parset, contactNetwork, totalDirichletNodes, globalFriction, frictionNodes,
externalForces, stateEnergyNorms);
UniformTimeStepper<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>>
--
GitLab