From 6550018df575c07c739a8fb2e8166b8e9cef40eb Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Tue, 20 Sep 2016 19:02:35 +0200
Subject: [PATCH] [NL] added integral measure to shapematrices
---
NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h | 1 +
NumLib/Fem/CoordinatesMapping/ShapeMatrices.h | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h b/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
index eeb5ee23787..89f010bf63e 100644
--- a/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
+++ b/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
@@ -64,6 +64,7 @@ inline void setZero(ShapeMatrices<T_N, T_DNDR, T_J, T_DNDX> &shape, ShapeDataFie
setZero(shape, ShapeDataFieldType<ShapeMatrixType::DNDR>());
setMatrixZero(shape.J);
shape.detJ = .0;
+ shape.integralMeasure = 0.0;
}
template <class T_N, class T_DNDR, class T_J, class T_DNDX>
diff --git a/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h b/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
index a1d6d5d8ca4..c1c60d3730f 100644
--- a/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
+++ b/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
@@ -54,6 +54,7 @@ struct ShapeMatrices
double detJ; ///< Determinant of the Jacobian
JacobianType invJ; ///< Inverse matrix of the Jacobian
DxShapeType dNdx; ///< Matrix of gradient of shape functions in physical coordinates, dN(r)/dx
+ double integralMeasure;
/** Not default constructible, dimensions always must be given.
*
@@ -80,7 +81,8 @@ struct ShapeMatrices
J(local_dim, local_dim),
detJ(.0),
invJ(local_dim, local_dim),
- dNdx(global_dim, n_nodes)
+ dNdx(global_dim, n_nodes),
+ integralMeasure(0.0)
{
setZero();
}
--
GitLab