Commit dbcb3167 authored by laura.pfeiffer's avatar laura.pfeiffer
Browse files

merge mit feature completed

parent 4204cc1b
Pipeline #219517 passed with stages
in 30 minutes and 55 seconds
......@@ -2,7 +2,7 @@ ClearData = 1 # Removes existing plots from data folder.
Distribution=RCB
Model = Monodomain;
ElphyModel = SemiImplicit
ElphyProblem =VentricleProblem
ElphyProblem =BiVentricleProblem
# Spielt für diesen Test keine Rolle, nur beim Splitting (Iext splitted in PDE =1, Iext in ODE =0)
IextInPDE=1
ReassembleRHSonce=1
......
......@@ -23,7 +23,7 @@ ElphySplittingMethod =Godunov #Strang, Stein,Godunov
#ElphyProblem =FullHeartProblem
#ElphyProblem=TetraTestProblem
ElphyProblem=VentricleProblem
ElphyProblem=BiVentricleProblem
ElphyProblem=EllipsoidProblem
#ElphyProblem =HexaTestProblem
......
......@@ -86,7 +86,7 @@ enum ProblemType {
ExactDiffusionOne, ExactDiffusionTwo,
Ellipsoid,
ChamberCube2dProblem,
Ventricle,
BiVentricle,
FullHeart,
RobinEllipsoid, DynTractionTestPol, DynDirichletTestPol, DynDirichletTestExp, DynTractionTestExp,
DynDirichletTestZero, DynNeumannTestPol, DynNeumannTestExp,
......@@ -141,7 +141,7 @@ static std::map<std::string, ProblemType> problemIndex{
{"OneCellProblem", OneCell},
{"EigenvalueProblem", EigenvaluesCellmodel},
{"EllipsoidProblem", Ellipsoid},
{"VentricleProblem", Ventricle},
{"BiVentricleProblem", BiVentricle},
{"ChamberCube2d", ChamberCube2dProblem},
{"FullHeartProblem", FullHeart},
{"DynamicDirichletTestPol", DynDirichletTestPol},
......
......@@ -10,10 +10,10 @@ add_library(ELPHY_PROBLEMS STATIC
OneCellProblem.cpp
EigenvalueProblem.cpp
ElphyEllipsoidProblem.cpp
ElphyVentricleProblem.cpp
ElphyBiVentricleProblem.cpp
ElphyFullHeartProblem.cpp
ElphyChamberCube2dProblem.cpp
DiffusionProblem.cpp
)
target_link_libraries(ELPHY_PROBLEMS CELLMODELS)
\ No newline at end of file
target_link_libraries(ELPHY_PROBLEMS CELLMODELS)
#include "ElphyVentricleProblem.hpp"
#include "ElphyBiVentricleProblem.hpp"
constexpr std::array<double, 2> potentialValues{-84.584430, -85.298003};
std::string ElphyVentricleProblem::Evaluate(const Vector &solution) const {
std::string ElphyBiVentricleProblem::Evaluate(const Vector &solution) const {
std::string evaluation{};
auto values = getEvaluationAt(solution, {Point(74.837097, -81.447998, -44.074902)});
......@@ -15,7 +15,7 @@ std::string ElphyVentricleProblem::Evaluate(const Vector &solution) const {
return evaluation;
}
std::vector<double> ElphyVentricleProblem::EvaluationResults(const Vector &solution) const {
std::vector<double> ElphyBiVentricleProblem::EvaluationResults(const Vector &solution) const {
auto values = getEvaluationAt(solution, {Point(74.837097, -81.447998, -44.074902)});
for (int i = 0; i < values.size(); ++i) {
......@@ -24,7 +24,7 @@ std::vector<double> ElphyVentricleProblem::EvaluationResults(const Vector &solut
return values;
}
void ElphyVentricleProblem::InitializeEvaluationPoints() {
void ElphyBiVentricleProblem::InitializeEvaluationPoints() {
evaluationPoints.emplace_back(Point(74.837097, -81.447998, -44.074902));// Apex excited left ventricle
evaluationPoints.emplace_back(Point(74.327103, -86.796303, -49.017601));//Apex midwall left ventricle
......
#ifndef ELPHYVENTRICLEPROBLEM_HPP
#define ELPHYVENTRICLEPROBLEM_HPP
#ifndef ELPHYBIVENTRICLEPROBLEM_HPP
#define ELPHYBIVENTRICLEPROBLEM_HPP
#include "Algebra.hpp"
#include "ElphyProblem.hpp"
class ElphyVentricleProblem : public ElphyProblem {
class ElphyBiVentricleProblem : public ElphyProblem {
std::string meshName;
public:
explicit ElphyVentricleProblem() : ElphyProblem("Ventricle", true), meshName("BiVentricle") {
explicit ElphyBiVentricleProblem() : ElphyProblem("Ventricle", true), meshName("BiVentricle") {
Tensor SV(0.2073, 0.0, 0.0,
0.0, 0.0921, 0.0,
0.0, 0.0, 0.023);
......
......@@ -13,7 +13,7 @@
#include "ElphyEllipsoidProblem.hpp"
#include "DiffusionProblem.hpp"
#include "ElphyChamberCube2dProblem.hpp"
#include "ElphyVentricleProblem.hpp"
#include "ElphyBiVentricleProblem.hpp"
std::unique_ptr<ElphyProblem> getElphyProblem() {
......@@ -55,8 +55,8 @@ std::unique_ptr<ElphyProblem> getElphyProblem(ProblemType type) {
return std::make_unique<EigenvalueProblem>();
case Ellipsoid:
return std::make_unique<ElphyEllipsoidProblem>();
case Ventricle:
return std::make_unique<ElphyVentricleProblem>();
case BiVentricle:
return std::make_unique<ElphyBiVentricleProblem>();
case ChamberCube2dProblem:
return std::make_unique<ElphyChamberCube2dProblem>();
case FullHeart:
......
Subproject commit a4d083f6dfdaa4e66c042663e61356d63ecc1df0
Subproject commit f46435d7d7f3d2feb0e7595349e283b6c4e0e4e2
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