Commit 8c4d6778 authored by laura.pfeiffer's avatar laura.pfeiffer
Browse files

fixed problems wiht activation test

parent 3ffb463c
......@@ -7,7 +7,7 @@ PrintMeshOnly =0;
Model = Monodomain;
#ElphyModel = Diffusion
ElphyModel = Splitting
#ElphyModel = Splitting
#ElphyModel = ImplictEuler
ElphyModel = SemiImplicit
#ElphyModel = SemiImplicitNodes
......@@ -19,8 +19,10 @@ ReassembleRHSonce=1
ElphySplittingMethod =Godunov #Strang, Stein,Godunov
#ElphyProblem: VariableMeshProblem,TetraTestProblem,HexaTestProblem, HexaFineTestProblem, HexaLinExTestProblem, OneCellProblem,Hexa2dTestProblem,WithoutDiffusion,EigenvalueProblem, EllipsoidProblem,VentricleProblem,FullHeartProblem
#ElphyProblem: VariableMeshProblem,HexaTestProblemWA,TetraTestProblem,HexaTestProblem, HexaFineTestProblem, HexaLinExTestProblem, OneCellProblem,Hexa2dTestProblem,WithoutDiffusion,EigenvalueProblem, EllipsoidProblem,VentricleProblem,FullHeartProblem
#ElphyProblem=HexaTestProblemWA
#ElphyProblem=FullHeartProblem
#ElphyProblem=TetraTestProblem
ElphyProblem=VentricleProblem
ElphyProblem=EllipsoidProblem
......@@ -55,7 +57,8 @@ ElphyPolynomialDegree = 1
StartTime = 0.0
#EndTime=0.0001
EndTime = 0.1
EndTime=0.0001
EndTime = 0.3
#EndTime = 0.02
......@@ -100,8 +103,8 @@ PlotVertexPotential = 1
PrintVSteps =1
# vtk Dateien werden erstellt
PlotVTK=100
PlottingSteps = 100
PlotVTK=1
PlottingSteps = 10
TimeSeries = uniformabaqus;
......
......@@ -34,7 +34,7 @@ GatingReduction = 1e-12;
# === Elphy Solver ================================================
ElphySolver = gmres;
#ElphyPreconditioner =GaussSeidel# WICHTIG: Mit SuperLU funktioniert die Parallelisierung nicht richtig!;
ElphyPreconditioner LIB_PS;
ElphyPreconditioner=Jacobi;
ElphyEpsilon = 1e-8;
ElphyReduction = 1e-12;
......
......@@ -3,7 +3,7 @@
//
#include "ElphyCubeWithActivationProblem.hpp"
constexpr std::array<double, 2> activationTimes{0.00123, 0.003260};
constexpr std::array<double, 2> activationTimes{1.88, 5.33};
std::string ElphyCubeWithActivationTimeProblem::Evaluate(const Vector &solution) const {
std::string evaluation{};
......@@ -22,6 +22,7 @@ ElphyCubeWithActivationTimeProblem::EvaluationResults(const Vector &solution) co
auto values = getEvaluationAt(solution, {Point(0.0, 0.0, 0.0), Point(2.5, 1.5,0.0)});
for (int i = 0; i < values.size(); ++i) {
std::cout<<"value of "<<i<<": "<<values[i] <<" activation time: "<<activationTimes[i]<<endl;
values[i] -= activationTimes[i];
}
return values;
......
......@@ -8,7 +8,7 @@
class ElphyVentricleProblem : public ElphyProblem {
std::string meshName;
public:
explicit ElphyVentricleProblem() : ElphyProblem("Ventricle", true), meshName("LeftVentricle") {
explicit ElphyVentricleProblem() : ElphyProblem("Ventricle", true), meshName("BiVentriclefine") {
Tensor SV(0.2073, 0.0, 0.0,
0.0, 0.0921, 0.0,
0.0, 0.0, 0.023);
......
......@@ -50,6 +50,7 @@ protected:
testConfig["MembraneCapacitance"] = "0.01";
testConfig["CrankNicolsonTheta"] = "0.5";
testConfig["ElphyIntegrator"] = "ExplicitEuler";
testConfig["ThresholdVForActivation"]="-40.0";
testConfig["EulerReAssemble"] = "0";
......@@ -87,9 +88,9 @@ INSTANTIATE_TEST_SUITE_P(TestMonodomain, MonodomainTest, Values(
"discrete", "Stepfunction"}),
TestMonodomainParameter(
{"WithoutDiffusion", "Splitting", "Godunov", 2, 0.00001, 0.00001, "IBTElphyModel",
"discrete", "Stepfunction"}),
"discrete", "Stepfunction"}) ,
TestMonodomainParameter(
{"HexaTestProblemWA", "Splitting", "Strang", 1, 0.00001, 0.0045, "IBTElphyModel",
{"HexaTestProblemWA", "Splitting", "Strang", 1, 0.00001, 0.006, "MElphyModel",
"discrete", "Stepfunction"}),
TestMonodomainParameter(
{"Hexa2dTestProblem", "LinearImplicit", "", 1, 0.00001, 0.01, "MElphyModel", "discrete",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment