From 720838a306ae6ea4242e3bd759532bfa1b5b10e8 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 17 Dec 2013 14:58:19 +0100
Subject: [PATCH] [Cleanup] Rename: nodalIntegrals -> weights
---
dune/tectonic/globalruinanonlinearity.hh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh
index 7e82479c..ec0d5702 100644
--- a/dune/tectonic/globalruinanonlinearity.hh
+++ b/dune/tectonic/globalruinanonlinearity.hh
@@ -24,17 +24,17 @@ class GlobalRuinaNonlinearity : public GlobalNonlinearity<Matrix, Vector> {
public:
GlobalRuinaNonlinearity(Dune::BitSetVector<1> const &frictionalNodes,
- ScalarVector const &nodalIntegrals,
- FrictionData const &fd)
- : restrictions(nodalIntegrals.size()) {
+ ScalarVector const &weights, FrictionData const &fd)
+ : restrictions(frictionalNodes.size()) {
auto trivialNonlinearity =
std::make_shared<Friction>(std::make_shared<TrivialFunction>());
for (size_t i = 0; i < restrictions.size(); ++i) {
- restrictions[i] =
- frictionalNodes[i][0]
- ? std::make_shared<Friction>(
- std::make_shared<FrictionPotential>(nodalIntegrals[i], fd))
- : trivialNonlinearity;
+ if (not frictionalNodes[i][0]) {
+ restrictions[i] = trivialNonlinearity;
+ continue;
+ }
+ auto const fp = std::make_shared<FrictionPotential>(weights[i], fd);
+ restrictions[i] = std::make_shared<Friction>(fp);
}
}
--
GitLab