From 7228b2390d52e0de155160fadd0d962bae749718 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 27 Feb 2012 09:51:20 +0100
Subject: [PATCH] Make b and L configurable
---
src/one-body-sample.cc | 6 +++---
src/one-body-sample.parset | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index b5c69abb..da5825a5 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -169,10 +169,10 @@ assemble_nonlinearity(
*eta = parset.get<double>("boundary.friction.eta");
auto b = Dune::make_shared<SingletonVectorType>(size);
- *b = 1; // FIXME
+ *b = parset.get<double>("boundary.friction.ruina.b");
auto L = Dune::make_shared<SingletonVectorType>(size);
- *L = 1.0 / parset.get<double>("boundary.friction.eta"); // FIXME
+ *L = parset.get<double>("boundary.friction.ruina.L");
return Dune::make_shared<
Dune::GlobalRuinaNonlinearity<VectorType, MatrixType> const>(
@@ -435,7 +435,7 @@ int main(int argc, char *argv[]) {
for (size_t i = 0; i < frictionalNodes.size(); ++i) {
if (frictionalNodes[i][0]) {
- double const L = 1e-4; // FIXME: magic value
+ double const L = parset.get<double>("boundary.friction.ruina.L");
double const unorm = u4_diff[i].two_norm();
double ret1 =
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index 764632c2..bc484944 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -89,6 +89,8 @@ initial = 10
# -- Ronaldo I. Borja and Craig D. Foster:
# Continuum mathematical modeling of slip weakening in geological systems
a = 0.015
+b = 0.005
+L = 1e-4
# The second-order a and b terms in [..] are very important in
# determining whether sliding is stable or unstable and (in appli-
--
GitLab