From af4b7fb3aa04c7a4042ea0a35d8de63e237468a1 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 17 Dec 2013 13:13:33 +0100
Subject: [PATCH] [Cleanup] Assemble a GlobalRuinaNonlinearity
---
src/assemblers.cc | 4 +---
src/assemblers.hh | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/assemblers.cc b/src/assemblers.cc
index 6b66fa44..cfa0de5f 100644
--- a/src/assemblers.cc
+++ b/src/assemblers.cc
@@ -15,8 +15,6 @@
#include <dune/fufem/assemblers/localassemblers/viscosityassembler.hh>
#include <dune/fufem/assemblers/localassemblers/vonmisesstressassembler.hh>
-#include <dune/tectonic/globalruinanonlinearity.hh>
-
#include "assemblers.hh"
template <class GridView, int dimension>
@@ -95,7 +93,7 @@ void MyAssembler<GridView, dimension>::assembleNeumann(
template <class GridView, int dimension>
auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary, FrictionData const &fd)
- -> std::shared_ptr<GlobalNonlinearity<Matrix, Vector>> {
+ -> std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector>> {
// Lump negative normal stress (kludge)
ScalarVector weights;
{
diff --git a/src/assemblers.hh b/src/assemblers.hh
index aa5ad3e3..0987f2a1 100644
--- a/src/assemblers.hh
+++ b/src/assemblers.hh
@@ -13,7 +13,7 @@
#pragma clang diagnostic pop
#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
-#include <dune/tectonic/globalnonlinearity.hh>
+#include <dune/tectonic/globalruinanonlinearity.hh>
template <class GridView, int dimension> class MyAssembler {
public:
@@ -62,7 +62,7 @@ template <class GridView, int dimension> class MyAssembler {
Dune::VirtualFunction<double, double> const &neumann,
double relativeTime);
- std::shared_ptr<GlobalNonlinearity<Matrix, Vector>>
+ std::shared_ptr<GlobalRuinaNonlinearity<Matrix, Vector>>
assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary,
FrictionData const &fd);
--
GitLab