diff --git a/src/foam/foam.cc b/src/foam/foam.cc index aad5457a983facea7299c71beb5bba931dd8548b..d104818560afad209a720f27b8a581d961cf0d52 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)>>