From 7727421363d2cdc9d95709dea36e8ffaee7d601f Mon Sep 17 00:00:00 2001
From: Klaus <klaus.boehnlein@tu-dresden.de>
Date: Thu, 9 Sep 2021 15:10:36 +0200
Subject: [PATCH] Combine material_implementation & prestrain_implementation to
material_prestrain_imp
---
.../prestrain_material_geometry.hh | 6 ++---
inputs/cellsolver.parset | 27 +++++++++----------
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/dune/microstructure/prestrain_material_geometry.hh b/dune/microstructure/prestrain_material_geometry.hh
index f86071c9..092fa547 100644
--- a/dune/microstructure/prestrain_material_geometry.hh
+++ b/dune/microstructure/prestrain_material_geometry.hh
@@ -35,7 +35,7 @@ public:
FuncScalar getMu(ParameterTree parameters){
- std::string imp = parameters.get<std::string>("material_implementation", "analytical_Example");
+ std::string imp = parameters.get<std::string>("material_prestrain_imp", "analytical_Example");
//std::array<std::string,5> imps({"homogen_poisson" "bilayer_poisson" "chess_poisson" "3Dchess_poisson" "vertical_bilayer_poisson"});
double phi = M_PI*parameters.get<double>("material_angle", 0.0)/180; //TODO
@@ -389,7 +389,7 @@ public:
FuncScalar getLambda(ParameterTree parameters)
{
- std::string imp = parameters.get<std::string>("material_implementation", "analytical_Example");
+ std::string imp = parameters.get<std::string>("material_prestrain_imp", "analytical_Example");
//std::array<std::string,5> imps({"homogen_poisson" "bilayer_poisson" "chess_poisson" "3Dchess_poisson" "vertical_bilayer_poisson"});
//int i_imp = parameters.get<int>("impnumber");
//std::string imp = imps[i_imp];
@@ -788,7 +788,7 @@ public:
Func2Tensor getPrestrain(ParameterTree parameters)
{
- std::string imp = parameters.get<std::string>("prestrainType", "analytical_Example");
+ std::string imp = parameters.get<std::string>("material_prestrain_imp", "analytical_Example");
double width = parameters.get<double>("width", 1.0);
double height = parameters.get<double>("height", 1.0);
diff --git a/inputs/cellsolver.parset b/inputs/cellsolver.parset
index 464c4fe6..b92a7dd5 100644
--- a/inputs/cellsolver.parset
+++ b/inputs/cellsolver.parset
@@ -54,8 +54,8 @@ numLevels = 3 3 # computes all levels from first to second entry
#gamma=50.0
-#gamma=1.0
-gamma=0.01
+gamma=1.0
+#gamma=2.5
#############################################
# Material parameters
@@ -65,8 +65,8 @@ write_materialFunctions = true # VTK mu-functions , lambda-functions
beta = 2.0 # ratio between material parameters mu1 & mu2 .... beta = 1.0 corresponds to homogeneous case
-mu1 = 10.0
-lambda1 = 0.0
+mu1=10.0
+lambda1=10.0
#lambda1 = 20.0
#lambda1 = 20.0
#lambda1 = 5.0
@@ -74,14 +74,13 @@ lambda1 = 0.0
#### material_implementation("analytical_Example") ?
-material_implementation = "analytical_Example"
-#material_implementation ="isotropic_bilayer"
+#material_prestrain_imp= "analytical_Example"
+material_prestrain_imp ="isotropic_bilayer"
-#material_implementation ="matrix_material_circles"
-#material_implementation ="matrix_material_squares"
-#material_implementation = "circle_fiber" #TEST
-#material_implementation = "square_fiber" #TEST
+
+#material_prestrain_imp= "circle_fiber" #TEST
+#material_prestrain_imp= "square_fiber" #TEST
#############################################
# Prestrain parameters
@@ -96,13 +95,11 @@ alpha = 5.0 # ratio between prestrain parameters rho1 & rho2
#theta = 0.25 # volume fraction
#theta = 0.75 # volume fraction
-prestrainType = "analytical_Example"
-#prestrainType = "isotropic_bilayer"
-------------Matrix Material --------------
-#prestrainType = "matrix_material_circles"
-#prestrainType = "matrix_material_squares"
+------------Matrix Material --------------
+#material_prestrain_imp ="matrix_material_circles"
+#material_prestrain_imp ="matrix_material_squares"
nF = 8 #number of Fibers (in each Layer)
#rF = 0.05 #Fiber radius max-fiber-radius = (width/(2.0*nF)
--
GitLab