From 5d1f3ead4bd9d822effec9ebf1737e77b94a7ae1 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Fri, 8 Jul 2016 09:32:56 +0200
Subject: [PATCH] ifixed compilation errors after rebase
---
NumLib/Extrapolation/ExtrapolatableElement.h | 2 +-
NumLib/Extrapolation/ExtrapolatableElementCollection.h | 4 ++--
NumLib/Extrapolation/Extrapolator.h | 1 +
ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h | 1 +
ProcessLib/TES/TESLocalAssembler.h | 3 +--
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/NumLib/Extrapolation/ExtrapolatableElement.h b/NumLib/Extrapolation/ExtrapolatableElement.h
index 4a231fc4901..6a666abe8cb 100644
--- a/NumLib/Extrapolation/ExtrapolatableElement.h
+++ b/NumLib/Extrapolation/ExtrapolatableElement.h
@@ -24,7 +24,7 @@ class ExtrapolatableElement
{
public:
//! Provides the shape matrix at the given integration point.
- virtual Eigen::Map<const Eigen::VectorXd> getShapeMatrix(
+ virtual Eigen::Map<const Eigen::RowVectorXd> getShapeMatrix(
const unsigned integration_point) const = 0;
virtual ~ExtrapolatableElement() = default;
diff --git a/NumLib/Extrapolation/ExtrapolatableElementCollection.h b/NumLib/Extrapolation/ExtrapolatableElementCollection.h
index 7be326d3faa..ffd65289081 100644
--- a/NumLib/Extrapolation/ExtrapolatableElementCollection.h
+++ b/NumLib/Extrapolation/ExtrapolatableElementCollection.h
@@ -21,7 +21,7 @@ class ExtrapolatableElementCollection
public:
//! Returns the shape matrix of the element with the given \c id at the
//! given \c integration_point.
- virtual Eigen::Map<const Eigen::VectorXd> getShapeMatrix(
+ virtual Eigen::Map<const Eigen::RowVectorXd> getShapeMatrix(
std::size_t const id, unsigned const integration_point) const = 0;
//! Returns integration point values of some property of the element with
@@ -85,7 +85,7 @@ public:
{
}
- Eigen::Map<const Eigen::VectorXd> getShapeMatrix(
+ Eigen::Map<const Eigen::RowVectorXd> getShapeMatrix(
std::size_t const id, unsigned const integration_point) const override
{
ExtrapolatableElement const& loc_asm = *_local_assemblers[id];
diff --git a/NumLib/Extrapolation/Extrapolator.h b/NumLib/Extrapolation/Extrapolator.h
index ee21daa7784..cee424b32b9 100644
--- a/NumLib/Extrapolation/Extrapolator.h
+++ b/NumLib/Extrapolation/Extrapolator.h
@@ -14,6 +14,7 @@
#include <Eigen/Eigen>
#include "NumLib/NumericsConfig.h"
+#include "ExtrapolatableElementCollection.h"
namespace NumLib
{
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
index 425c20b8b9c..6ca58b6ae40 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
@@ -12,6 +12,7 @@
#include <vector>
+#include "NumLib/Extrapolation/ExtrapolatableElement.h"
#include "NumLib/Fem/FiniteElement/TemplateIsoparametric.h"
#include "NumLib/Fem/ShapeMatrixPolicy.h"
#include "ProcessLib/LocalAssemblerInterface.h"
diff --git a/ProcessLib/TES/TESLocalAssembler.h b/ProcessLib/TES/TESLocalAssembler.h
index 72efb4ea24e..1826b2c6f4c 100644
--- a/ProcessLib/TES/TESLocalAssembler.h
+++ b/ProcessLib/TES/TESLocalAssembler.h
@@ -14,11 +14,10 @@
#include <vector>
#include "ProcessLib/LocalAssemblerInterface.h"
+#include "NumLib/Extrapolation/ExtrapolatableElement.h"
#include "TESAssemblyParams.h"
#include "TESLocalAssemblerInner-fwd.h"
-#include "NumLib/Extrapolation/ExtrapolatableElement.h"
-
namespace ProcessLib
{
namespace TES
--
GitLab