From c7598f69d64e031c10818dd0465ba4f5d2658155 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 30 Oct 2012 14:44:18 +0100
Subject: [PATCH] Drop ruina from the model name
---
src/assemblers.cc | 6 +++---
src/one-body-sample.org | 10 +++++-----
src/one-body-sample.parset | 20 ++++----------------
3 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/src/assemblers.cc b/src/assemblers.cc
index c3e3c414..38084c9c 100644
--- a/src/assemblers.cc
+++ b/src/assemblers.cc
@@ -69,16 +69,16 @@ assemble_nonlinearity(
switch (parset.get<Config::model>("model")) {
case Config::Exponential: {
SingletonVectorType a(size);
- a = parset.get<double>("ruina.a");
+ a = parset.get<double>("a");
SingletonVectorType V0(size);
V0 = parset.get<double>("V0");
SingletonVectorType b(size);
- b = parset.get<double>("ruina.b");
+ b = parset.get<double>("b");
SingletonVectorType L(size);
- L = parset.get<double>("ruina.L");
+ L = parset.get<double>("L");
return Dune::make_shared<
Dune::GlobalRuinaNonlinearity<MatrixType, VectorType> const>(
diff --git a/src/one-body-sample.org b/src/one-body-sample.org
index 6055ddd2..33b62f9d 100644
--- a/src/one-body-sample.org
+++ b/src/one-body-sample.org
@@ -441,7 +441,7 @@
VectorType udd_initial(finestSize); udd_initial = 0.0;
SingletonVectorType alpha_initial(finestSize);
- alpha_initial = parset.get<double>("boundary.friction.state.initial");
+ alpha_initial = parset.get<double>("boundary.friction.initial_log_state");
SingletonVectorType alpha(alpha_initial);
SingletonVectorType vonMisesStress;
@@ -463,9 +463,9 @@
<<createWriters>>;
- auto const L = parset.get<double>("boundary.friction.ruina.L");
- auto const a = parset.get<double>("boundary.friction.ruina.a");
- auto const b = parset.get<double>("boundary.friction.ruina.b");
+ auto const L = parset.get<double>("boundary.friction.L");
+ auto const a = parset.get<double>("boundary.friction.a");
+ auto const b = parset.get<double>("boundary.friction.b");
auto const V0 = parset.get<double>("boundary.friction.V0");
auto const mu = parset.get<double>("boundary.friction.mu");
auto const timesteps = parset.get<size_t>("timeSteps");
@@ -479,7 +479,7 @@
ignoreNodes, massMatrix, stiffnessMatrix, u_initial, ud_initial,
udd_initial);
auto stateUpdater = initStateUpdater<SingletonVectorType, VectorType>
- (parset.get<Config::state_model>("boundary.friction.state.model"),
+ (parset.get<Config::state_model>("boundary.friction.state_model"),
alpha_initial, frictionalNodes, L);
auto const state_fpi_max
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index bf591145..6f5146f1 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -48,26 +48,14 @@ acceptFactor = 1.0
requiredResidual = 1e-12
[boundary.friction]
-# "mu_0 is the nominal coefficient of friction that has values near 0.6"
-# -- James H. Dieterich and Brian Kilgore: Implications of fault
-# constitutive properties for earthquake prediction
-# http://earthquake.usgs.gov/research/physics/lab/prediction.pdf
mu = 0.6
-V0 = 1
-model = Exponential
-
-[boundary.friction.state]
-# log(alpha(0))
-initial = -10
-model = Dieterich # Ruina
-
-[boundary.friction.ruina]
-# "For rocks, typical values of A and B range from 0.005 to 0.015"
-# -- Ronaldo I. Borja and Craig D. Foster:
-# Continuum mathematical modeling of slip weakening in geological systems
a = 0.010
b = 0.015
+V0 = 1
L = 1e-5
+model = Exponential
+initial_log_state = -10
+state_model = Dieterich
# The second-order a and b terms in [..] are very important in
# determining whether sliding is stable or unstable and (in appli-
--
GitLab