From 734aa557fa3da0d51eadb39afe18b510e25e7581 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 11 Mar 2012 18:42:19 +0100
Subject: [PATCH] Rely on FieldVector<double, 1><->double conversion
---
dune/tectonic/globallaursennonlinearity.hh | 4 ++--
dune/tectonic/globalruinanonlinearity.hh | 6 +++---
src/one-body-sample.cc | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dune/tectonic/globallaursennonlinearity.hh b/dune/tectonic/globallaursennonlinearity.hh
index ff8f3034..1dfc6775 100644
--- a/dune/tectonic/globallaursennonlinearity.hh
+++ b/dune/tectonic/globallaursennonlinearity.hh
@@ -50,13 +50,13 @@ class GlobalLaursenNonlinearity
sigma_n [id + mu id] = sigma_n (1 + mu) id
*/
virtual shared_ptr<LocalNonlinearity<dim> const> restriction(int i) const {
- if ((*nodalIntegrals)[i][0] == 0)
+ if ((*nodalIntegrals)[i] == 0)
return trivialNonlinearity;
if (restrictions[i] != nullptr)
return restrictions[i];
- double coefficient = (*nodalIntegrals)[i][0];
+ double coefficient = (*nodalIntegrals)[i];
coefficient *= (*normalStress)[i];
coefficient *= 1 + (*mu)[i];
diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh
index 67b32252..4787a4a0 100644
--- a/dune/tectonic/globalruinanonlinearity.hh
+++ b/dune/tectonic/globalruinanonlinearity.hh
@@ -51,15 +51,15 @@ class GlobalRuinaNonlinearity
Return a restriction of the outer function to the i'th node.
*/
virtual shared_ptr<LocalNonlinearity<dim> const> restriction(int i) const {
- if ((*nodalIntegrals)[i][0] == 0)
+ if ((*nodalIntegrals)[i] == 0)
return trivialNonlinearity;
if (restrictions[i] != nullptr)
return restrictions[i];
auto const func = make_shared<RuinaFunction const>(
- (*nodalIntegrals)[i][0], (*a)[i][0], (*mu)[i][0], (*eta)[i][0],
- (*normalStress)[i][0], (*b)[i][0], (*state)[i][0], (*L)[i][0], h);
+ (*nodalIntegrals)[i], (*a)[i], (*mu)[i], (*eta)[i], (*normalStress)[i],
+ (*b)[i], (*state)[i], (*L)[i], h);
restrictions[i] = make_shared<LocalNonlinearity<dim> const>(func);
return restrictions[i];
}
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index f4a31133..09eea49e 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -311,7 +311,7 @@ int main(int argc, char *argv[]) {
double const L = parset.get<double>("boundary.friction.ruina.L");
double const unorm = u4_diff[i].two_norm();
- (*s4_new)[i][0] = compute_state_update(h, unorm, L, s4_old[i][0]);
+ (*s4_new)[i] = compute_state_update(h, unorm, L, s4_old[i]);
}
}
}
@@ -364,7 +364,7 @@ int main(int argc, char *argv[]) {
double const L = parset.get<double>("boundary.friction.ruina.L");
double const unorm = u5_diff[i].two_norm();
- (*s5_new)[i][0] = compute_state_update(h, unorm, L, s5_old[i][0]);
+ (*s5_new)[i] = compute_state_update(h, unorm, L, s5_old[i]);
}
}
}
--
GitLab