diff --git a/dune/tectonic/globallaursennonlinearity.hh b/dune/tectonic/globallaursennonlinearity.hh index ff8f303495b3e2a028f9f3590d91a10e16963e99..1dfc677590ca1e1f41aed25f14a30fda09bfcf91 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 67b32252a8c06f323a6a1c0bd66ec569bcef46b5..4787a4a01a620c6783165dbae323cb1d5341b6a7 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 f4a311335e7f30e6d89d29b31da4e076bf078359..09eea49e5cd9e9dff1327e2be398eeb522e84e81 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]); } } }