From e5efbc3bc8de5d27728d02a2ed05c24211029ecc Mon Sep 17 00:00:00 2001
From: Laura Pfeiffer <laura.pfeiffer@kit.edu>
Date: Wed, 1 Dec 2021 14:57:50 +0100
Subject: [PATCH] fixed merge
---
cardmech/src/CardiacAssemble.hpp | 1 +
cardmech/src/elasticity/materials/Material.hpp | 2 ++
mpp | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/cardmech/src/CardiacAssemble.hpp b/cardmech/src/CardiacAssemble.hpp
index 9dd242a5d..9e0427665 100644
--- a/cardmech/src/CardiacAssemble.hpp
+++ b/cardmech/src/CardiacAssemble.hpp
@@ -9,6 +9,7 @@
#include "discretization/IDiscretization.hpp"
#include "CardiacData.hpp"
#include "ScalarElement.hpp"
+#include "LagrangeDiscretization.hpp"
const Point shift2(-exp(1.3), 0.0);
diff --git a/cardmech/src/elasticity/materials/Material.hpp b/cardmech/src/elasticity/materials/Material.hpp
index 2f2523ffd..91665fb99 100644
--- a/cardmech/src/elasticity/materials/Material.hpp
+++ b/cardmech/src/elasticity/materials/Material.hpp
@@ -4,6 +4,8 @@
#include "utility/Config.hpp"
#include "VolumetricPenalty.hpp"
#include <Tensor.hpp>
+#include <functional>
+
static Tensor DeformationGradient(const Tensor &Du) { return One + Du; }
diff --git a/mpp b/mpp
index a56c00e60..bcafb16ab 160000
--- a/mpp
+++ b/mpp
@@ -1 +1 @@
-Subproject commit a56c00e6057aeed8404df87c27ea2c6c7e5e5850
+Subproject commit bcafb16abda9c2fe4deeb7156b652b9cae1dfe80
--
GitLab