From e2e79ee9650b34ec77ceff373f27ab2f0ff1a2f3 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 21 Apr 2015 11:35:09 +0200
Subject: [PATCH] [Cleanup] Get gridView from boundary patch
---
dune/tectonic/globalratestatefriction.hh | 2 +-
src/assemblers.cc | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dune/tectonic/globalratestatefriction.hh b/dune/tectonic/globalratestatefriction.hh
index 3edfe081..ea53d9fb 100644
--- a/dune/tectonic/globalratestatefriction.hh
+++ b/dune/tectonic/globalratestatefriction.hh
@@ -24,13 +24,13 @@ class GlobalRateStateFriction : public GlobalFriction<Matrix, Vector> {
public:
GlobalRateStateFriction(BoundaryPatch<GridView> const &frictionalBoundary,
- GridView const &gridView,
GlobalFrictionData<block_size> const &frictionInfo,
ScalarVector const &weights,
ScalarVector const &weightedNormalStress)
: restrictions(weightedNormalStress.size()) {
auto zeroNonlinearity =
std::make_shared<Friction>(std::make_shared<ZeroFunction>());
+ auto const gridView = frictionalBoundary.gridView();
Dune::MultipleCodimMultipleGeomTypeMapper<
GridView, Dune::MCMGVertexLayout> const vertexMapper(gridView);
diff --git a/src/assemblers.cc b/src/assemblers.cc
index 56288f54..a2b6e1ed 100644
--- a/src/assemblers.cc
+++ b/src/assemblers.cc
@@ -152,13 +152,11 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
case Config::Truncated:
return std::make_shared<GlobalRateStateFriction<
Matrix, Vector, TruncatedRateState, GridView>>(
- frictionalBoundary, gridView, frictionInfo, weights,
- weightedNormalStress);
+ frictionalBoundary, frictionInfo, weights, weightedNormalStress);
case Config::Regularised:
return std::make_shared<GlobalRateStateFriction<
Matrix, Vector, RegularisedRateState, GridView>>(
- frictionalBoundary, gridView, frictionInfo, weights,
- weightedNormalStress);
+ frictionalBoundary, frictionInfo, weights, weightedNormalStress);
default:
assert(false);
}
--
GitLab