Skip to content
Snippets Groups Projects
Commit af4b7fb3 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Assemble a GlobalRuinaNonlinearity

parent 093c3102
No related branches found
No related tags found
No related merge requests found
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <dune/fufem/assemblers/localassemblers/viscosityassembler.hh> #include <dune/fufem/assemblers/localassemblers/viscosityassembler.hh>
#include <dune/fufem/assemblers/localassemblers/vonmisesstressassembler.hh> #include <dune/fufem/assemblers/localassemblers/vonmisesstressassembler.hh>
#include <dune/tectonic/globalruinanonlinearity.hh>
#include "assemblers.hh" #include "assemblers.hh"
template <class GridView, int dimension> template <class GridView, int dimension>
...@@ -95,7 +93,7 @@ void MyAssembler<GridView, dimension>::assembleNeumann( ...@@ -95,7 +93,7 @@ void MyAssembler<GridView, dimension>::assembleNeumann(
template <class GridView, int dimension> template <class GridView, int dimension>
auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary, FrictionData const &fd) BoundaryPatch<GridView> const &frictionalBoundary, FrictionData const &fd)
-> std::shared_ptr<GlobalNonlinearity<Matrix, Vector>> { -> std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector>> {
// Lump negative normal stress (kludge) // Lump negative normal stress (kludge)
ScalarVector weights; ScalarVector weights;
{ {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#pragma clang diagnostic pop #pragma clang diagnostic pop
#include <dune/fufem/functionspacebases/p1nodalbasis.hh> #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
#include <dune/tectonic/globalnonlinearity.hh> #include <dune/tectonic/globalruinanonlinearity.hh>
template <class GridView, int dimension> class MyAssembler { template <class GridView, int dimension> class MyAssembler {
public: public:
...@@ -62,7 +62,7 @@ template <class GridView, int dimension> class MyAssembler { ...@@ -62,7 +62,7 @@ template <class GridView, int dimension> class MyAssembler {
Dune::VirtualFunction<double, double> const &neumann, Dune::VirtualFunction<double, double> const &neumann,
double relativeTime); double relativeTime);
std::shared_ptr<GlobalNonlinearity<Matrix, Vector>> std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector>>
assembleFrictionNonlinearity( assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary, BoundaryPatch<GridView> const &frictionalBoundary,
FrictionData const &fd); FrictionData const &fd);
......
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