diff --git a/src/foam/foam.cc b/src/foam/foam.cc index 9f359fa5e59a7f2836ecf6c5c7531c7cadf64e63..aad5457a983facea7299c71beb5bba931dd8548b 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; @@ -469,8 +469,10 @@ int main(int argc, char *argv[]) { typename ContactNetwork::ExternalForces externalForces; contactNetwork.externalForces(externalForces); + auto&& noFriction = ZeroNonlinearity(); + 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); UniformTimeStepper<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>>