diff --git a/cardmech/src/electrophysiology/MainMonodomain.cpp b/cardmech/src/electrophysiology/MainMonodomain.cpp index 82d50ac4c879f20a98548867e520a808d377c60c..863528ed402d38f79b518a8d09015e1f4bba223d 100644 --- a/cardmech/src/electrophysiology/MainMonodomain.cpp +++ b/cardmech/src/electrophysiology/MainMonodomain.cpp @@ -165,7 +165,12 @@ std::vector<double> MainMonodomain::Evaluate(const Vector &solution) { std::string elphyModelClass = "IBTElphyModel"; config.get("ElphyModelClass", elphyModelClass); string cmName = "FitzHughNagumo"; - config.get("ElphyModelName", cmName); + if (elphyModelClass== "IBTElphyModel"){ + config.get("IBTVentricleModel", cmName); + }else{ + config.get("ElphyModelName", cmName); + } + std::string IextSmooth; config.get("ExternalCurrentSmoothingInTime", IextSmooth); std::string IextSpaceSmoothing; diff --git a/cardmech/src/electrophysiology/problem/ElphyHexaCube2dProblem.cpp b/cardmech/src/electrophysiology/problem/ElphyHexaCube2dProblem.cpp index 8785cd6c58a738556f435e4e36550d06b07a94ba..42ed78d1cd31a5d40eeadcfed4ceea35a4aa6caf 100644 --- a/cardmech/src/electrophysiology/problem/ElphyHexaCube2dProblem.cpp +++ b/cardmech/src/electrophysiology/problem/ElphyHexaCube2dProblem.cpp @@ -1,12 +1,11 @@ #include "ElphyHexaCube2dProblem.hpp" -constexpr std::array<double, 2> potentialValues{12.52738402, -84.57368826}; +constexpr std::array<double, 2> potentialValues{12.5392709, -84.57368804}; std::string ElphyHexaCube2dProblem::Evaluate(const Vector &solution) const { std::string evaluation{}; auto values = getEvaluationAt(solution, {Point(0.0, 0.0), Point(5.0, 3.0)}); - evaluation += "V(0.0,0.0) = " + std::to_string(values[0]) + "\n"; evaluation += "V(5.0,3.0) = " + std::to_string(values[1]) + "\n"; diff --git a/cardmech/src/electrophysiology/problem/ElphyTetraCubeProblem.cpp b/cardmech/src/electrophysiology/problem/ElphyTetraCubeProblem.cpp index cac529c1c378636d02deedc0ba8d7f3a2274006d..4fa57e18e1e04ba2b8f2aad81e2864467ed0acb7 100644 --- a/cardmech/src/electrophysiology/problem/ElphyTetraCubeProblem.cpp +++ b/cardmech/src/electrophysiology/problem/ElphyTetraCubeProblem.cpp @@ -1,14 +1,13 @@ #include "ElphyTetraCubeProblem.hpp" -constexpr std::array<double, 2> potentialValues{22.69191409, -84.57239522}; +constexpr std::array<double, 2> potentialValues{22.29586486, -84.57236069}; std::string ElphyTetraCubeProblem::Evaluate(const Vector &solution) const { std::string evaluation{}; auto values = getEvaluationAt(solution, {Point(0.0, 0.0, 0.0), Point(5.0, 3.0, 3.0)}); - evaluation += "V(0.0,0.0,0.0) = " + std::to_string(values[0]) + "\n"; evaluation += "V(5.0,3.0,3.0) = " + std::to_string(values[1]) + "\n"; diff --git a/cardmech/test/electrophysiology/TestMonodomain.cpp b/cardmech/test/electrophysiology/TestMonodomain.cpp index 2ea2aeb33094dd869bbb8a62372a3e4665bbc899..d46d9c2a7099909423caaf882093f9010629f68c 100644 --- a/cardmech/test/electrophysiology/TestMonodomain.cpp +++ b/cardmech/test/electrophysiology/TestMonodomain.cpp @@ -77,7 +77,6 @@ protected: TEST_P(MonodomainTest, CheckValueWithoutDiffusion) { Vector &solution = cmMain->Run(); auto evalResults = cmMain->Evaluate(solution); - for (auto result: evalResults) ASSERT_NEAR(result, 0.0, TEST_TOLERANCE); }