diff --git a/conf/elasticity/benchmarks/LandBenchmarkBiVentricle.conf b/conf/elasticity/benchmarks/LandBenchmarkBiVentricle.conf index 5e4a8e97e670859dd71bdfb6b4abd6daf25996d1..94481f6d1aef185a74d23e00d83006738e98abfa 100644 --- a/conf/elasticity/benchmarks/LandBenchmarkBiVentricle.conf +++ b/conf/elasticity/benchmarks/LandBenchmarkBiVentricle.conf @@ -6,17 +6,25 @@ GeoPath = ../geo/ # ======================================================== h0=1e-4 h_min=1e-6 -#logfile = AS_T4_1_deg1_gamma07 - -activeDeformation = Quarteroni2 -g = 0.8 #gamma for updateStretch -scale_gamma = 0.8 #0.9, 1.0 -#StretchFactorNormal =1 -#activeStress = 0 #35 +#logfile = CG_DG_sig1000#AS_T4_1_deg1_gamma07 + +multiDiscs = 0 +# CAUTION: if useDifferentMeshes = 0, it will use the entry in Mesh!!! +useDifferentMeshes = 0 # possibility to change meshes isn't implemented right now +MechDiscretizationList = Conforming,DG # chosing different discs for homotopy +MechPolynomialDegreeList = 1 #if there is only one entry, it usess the same degree for all discs +MeshList = TestBiventricle #if there is only one entry, it usess the same mesh for all discs +# If |DGPenaltyList| != |MechDiscretizationList| DGPenalty = 0 für fehlende Einträge +DGPenaltyList= 0,10000 #10,100,1000,2000, 10000 (geht auch ohne scale nicht) + +activeStress = 0 #35 Model = ActiveStrainElasticity MechRuntype = Default MechDynamics = Static -MechDiscretization = Conforming +MechDiscretization = DG#Conforming + +DGSign=-1.0 +DGPenalty= 1000# Penalty for EG=200 CalculateReference = 0 ReferenceLevel = 3 @@ -30,7 +38,7 @@ ProblemDimension = 3 ProblemGeometry = Tet # Amount of pressure steps per iteration -PressureSteps = 4 +PressureSteps = 10 PressureIterations = 20 PressureDepth = 0 @@ -132,17 +140,16 @@ DynamicSolverVerbose = -1 CoupledSolverVerbose = 2 CellModelVerbose = -10 -MechVTK = 1 -# = Main Verbose = +MechVTK = 0 ElphyVerbose = -1 MechVerbose = 1 # = Plot Verbose = -PlotVTK = 1 +PlotVTK = 0 PlottingSteps = 1 ElphySolverVTK = -1 -PressureSolverVTK = 1 +PressureSolverVTK = 0 DynamicSolverVTK = -1 CoupledSolverVTK = -1 @@ -150,3 +157,4 @@ PrestressPlotVerbose = 0 PressurePlotVerbose = 1 DynamicPlotVerbose = -1 + diff --git a/conf/elasticity/m++.conf b/conf/elasticity/m++.conf index c100113caf546b637bda1b47e8eea51b50feddbe..d0f65ee24aed920d5e61caf243aa58e9f02c6723 100644 --- a/conf/elasticity/m++.conf +++ b/conf/elasticity/m++.conf @@ -11,9 +11,9 @@ ClearData = true #loadconf = elasticity/benchmarks/dg_beam.conf #loadconf = elasticity/benchmarks/eg_beam.conf #loadconf = elasticity/benchmarks/ellipsoid.conf -loadconf = elasticity/benchmarks/LandBenchmark.conf +#loadconf = elasticity/benchmarks/LandBenchmark.conf #loadconf = elasticity/benchmarks/LandBenchmarkDG.conf -#loadconf = elasticity/benchmarks/LandBenchmarkBiVentricle.conf +loadconf = elasticity/benchmarks/LandBenchmarkBiVentricle.conf #loadconf = elasticity/elasticity.conf # ====================================== # = Default Solver Configuration Files = diff --git a/conf/m++.conf b/conf/m++.conf index 9b1e075faf0bab8ab489c30706676a759682d9b9..e02b25bdaa0e9b0a9bf789d34f27ab0b1d8fd23a 100644 --- a/conf/m++.conf +++ b/conf/m++.conf @@ -1,6 +1,6 @@ #loadconf = electrophysiology/m++.conf; -#loadconf = elasticity/m++.conf; -loadconf=coupled/electroMechConPDE.conf +loadconf = elasticity/m++.conf; +#loadconf=coupled/electroMechConPDE.conf #loadconf = coupled/electroMechCon.conf; -#loadconf = coupled/gamm-paper/coarse-biventricle.conf \ No newline at end of file +#loadconf = coupled/gamm-paper/coarse-biventricle.conf diff --git a/mpp b/mpp index cfd2f66c53e10c51415ddc429e56a002ad7b97b0..68c81ffa0818e072a24a6799bb30929d9380ea76 160000 --- a/mpp +++ b/mpp @@ -1 +1 @@ -Subproject commit cfd2f66c53e10c51415ddc429e56a002ad7b97b0 +Subproject commit 68c81ffa0818e072a24a6799bb30929d9380ea76