From 0468f8267a12d115f015dac9b7b2bd30caec8f25 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 13 Dec 2013 02:34:16 +0100
Subject: [PATCH] [Cleanup] Rename elasticity parameters
---
src/one-body-sample.cc | 13 +++++++------
src/one-body-sample.parset | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index aa21696f..a9931a85 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -110,8 +110,10 @@ int main(int argc, char *argv[]) {
using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
using Nonlinearity = GlobalNonlinearity<Matrix, Vector>;
- auto const E = parset.get<double>("body.E");
- auto const nu = parset.get<double>("body.nu");
+ auto const youngModulus = parset.get<double>("body.youngModulus");
+ auto const poissonRatio = parset.get<double>("body.poissonRatio");
+ auto const shearViscosity = parset.get<double>("body.shearViscosity");
+ auto const bulkViscosity = parset.get<double>("body.bulkViscosity");
auto const density = parset.get<double>("body.density");
double const gravity = 9.81;
@@ -228,9 +230,8 @@ int main(int argc, char *argv[]) {
MyAssembler myAssembler(leafView);
Matrix A, C, M;
- myAssembler.assembleElasticity(E, nu, A);
- myAssembler.assembleViscosity(parset.get<double>("body.shearViscosity"),
- parset.get<double>("body.bulkViscosity"), C);
+ myAssembler.assembleElasticity(youngModulus, poissonRatio, A);
+ myAssembler.assembleViscosity(shearViscosity, bulkViscosity, C);
myAssembler.assembleMass(density, M);
EnergyNorm<Matrix, Vector> const ANorm(A), MNorm(M);
// Q: Does it make sense to weigh them in this manner?
@@ -490,7 +491,7 @@ int main(int argc, char *argv[]) {
myAssembler.vertexBasis, u);
ScalarVector vonMisesStress;
VonMisesStressAssembler<Grid, P0Basis::LocalFiniteElement>
- localStressAssembler(E, nu, gridDisplacement);
+ localStressAssembler(youngModulus, poissonRatio, gridDisplacement);
p0Assembler.assembleFunctional(localStressAssembler, vonMisesStress);
writeVtk(myAssembler.vertexBasis, u, alpha, p0Basis, vonMisesStress,
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index 4f663a2f..7a244923 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -7,8 +7,8 @@ writeVTK = false
finalTime = 15
[body]
-E = 5e7
-nu = 0.3 # The closer we get to 0.5, the more wiggly everything gets
+youngModulus = 5e7
+poissonRatio = 0.3 # The closer we get to 0.5, the more wiggly everything gets
density = 5000
height = 1
width = 5
--
GitLab