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

[Cleanup] Rename: nodalIntegrals -> weights

parent ade3cffa
No related branches found
No related tags found
No related merge requests found
...@@ -24,17 +24,17 @@ class GlobalRuinaNonlinearity : public GlobalNonlinearity<Matrix, Vector> { ...@@ -24,17 +24,17 @@ class GlobalRuinaNonlinearity : public GlobalNonlinearity<Matrix, Vector> {
public: public:
GlobalRuinaNonlinearity(Dune::BitSetVector<1> const &frictionalNodes, GlobalRuinaNonlinearity(Dune::BitSetVector<1> const &frictionalNodes,
ScalarVector const &nodalIntegrals, ScalarVector const &weights, FrictionData const &fd)
FrictionData const &fd) : restrictions(frictionalNodes.size()) {
: restrictions(nodalIntegrals.size()) {
auto trivialNonlinearity = auto trivialNonlinearity =
std::make_shared<Friction>(std::make_shared<TrivialFunction>()); std::make_shared<Friction>(std::make_shared<TrivialFunction>());
for (size_t i = 0; i < restrictions.size(); ++i) { for (size_t i = 0; i < restrictions.size(); ++i) {
restrictions[i] = if (not frictionalNodes[i][0]) {
frictionalNodes[i][0] restrictions[i] = trivialNonlinearity;
? std::make_shared<Friction>( continue;
std::make_shared<FrictionPotential>(nodalIntegrals[i], fd)) }
: trivialNonlinearity; auto const fp = std::make_shared<FrictionPotential>(weights[i], fd);
restrictions[i] = std::make_shared<Friction>(fp);
} }
} }
......
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