diff --git a/cardmech/conf/elphy.conf b/cardmech/conf/elphy.conf index 1b67e7e0f597cd73e7e3337997c43e8241052c70..628b8d51cee75606998d341f5374089c24c760da 100644 --- a/cardmech/conf/elphy.conf +++ b/cardmech/conf/elphy.conf @@ -23,8 +23,8 @@ ElphySplittingMethod =Godunov #Strang, Stein,Godunov #BiVentricleProblem,BiVentricleWAProblem,EllipsoidWAProblem #ElphyProblem =FullHeartProblem -#ElphyProblem=EllipsoidProblem -ElphyProblem=BiVentricleWAProblem +ElphyProblem=BiVentricleProblem +#ElphyProblem=BiVentricleWAProblem #ElphyProblem=EllipsoidWAProblem #ElphyProblem =HexaTestProblem @@ -37,7 +37,7 @@ IextInPDE=1 #Glaettung von Anregung in Zeit: Stepfunction,Arctan,Tanh ExternalCurrentSmoothingInTime = Arctan; #Glättung Anregung im Raum: discrete, linear -ExternalCurrentSmoothingInSpace =discrete; +ExternalCurrentSmoothingInSpace =linear; diff --git a/cardmech/src/CardiacInterpolation.cpp b/cardmech/src/CardiacInterpolation.cpp index 76ca5787ee9a2966761c8ba04edeb836dbeb3bd1..e41c082ab8e7164ba2ea661529fe5cd539a5558f 100644 --- a/cardmech/src/CardiacInterpolation.cpp +++ b/cardmech/src/CardiacInterpolation.cpp @@ -431,9 +431,9 @@ void interpolateLagrangeData(Vector &vec, int degree) { const auto &meshes = vec.GetDisc().GetMeshes(); std::string interpolation{}; config.get("ExternalCurrentSmoothingInSpace", interpolation); - //if (interpolation != "discrete"){ - // smoothMeshData(meshes.coarseMesh(), vec); - //} + if (interpolation != "discrete" && meshes[0].Name()!="BiVentricle_smoothed"){ + smoothMeshData(meshes.coarseMesh(), vec); + } for (int i = 1, l = 2; i <= meshes.Level(); ++i, l *= 2) { interpolateCellData(meshes[i - 1], meshes[i]); diff --git a/mpp b/mpp index 9ba1ccaad9e26d24b17eeca22a2f7713876e45a6..5da9de89c9a3f57126881e993d9bae5fde75b798 160000 --- a/mpp +++ b/mpp @@ -1 +1 @@ -Subproject commit 9ba1ccaad9e26d24b17eeca22a2f7713876e45a6 +Subproject commit 5da9de89c9a3f57126881e993d9bae5fde75b798 diff --git a/pipeline/.cardmech-benchmark-on-horeka.yml b/pipeline/.cardmech-benchmark-on-horeka.yml index f1999ecc297f8dcffb245b845e6f4fb0a2a4b7f8..11199083cef9cbbb9b67409c354625c6fce4c987 100644 --- a/pipeline/.cardmech-benchmark-on-horeka.yml +++ b/pipeline/.cardmech-benchmark-on-horeka.yml @@ -5,10 +5,3 @@ ventricle-test: script: - salloc -p cpuonly -t 00:10:00 -n 4 mpirun Elphy-M++ BiVentricleTest/start - -ellipsoid-test: - extends: .benchmark_on_horeka - variables: - CMAKE_ARGS: '-DMPP_BUILD_TYPE=MppRelease' - script: - - salloc -p cpuonly -t 00:01:00 -n 4 mpirun Elphy-M++ TetraTest/start