From 88e2a1029c34db6479698e4be32b3ca1e397a2a3 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Thu, 9 Dec 2021 12:55:27 +0100
Subject: [PATCH] [NumLib] using T_SHAPE_FUNC::DIM instead of ele_dim in
computeMappingMatrices
---
.../NaturalCoordinatesMapping.cpp | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
index b165dad5af2..958c91b2eb1 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
+++ b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
@@ -214,23 +214,26 @@ inline void computeMappingMatrices(
// J^-1, dshape/dx
shapemat.invJ.noalias() = shapemat.J.inverse();
- auto const nnodes(shapemat.dNdr.cols());
- auto const ele_dim(shapemat.dNdr.rows());
assert(shapemat.dNdr.rows() == ele.getDimension());
const unsigned global_dim = ele_local_coord.getGlobalDimension();
- if (global_dim == ele_dim)
+ if (global_dim == T_SHAPE_FUNC::DIM)
{
- shapemat.dNdx.topLeftCorner(ele_dim, nnodes).noalias() =
- shapemat.invJ * shapemat.dNdr;
+ shapemat.dNdx
+ .template topLeftCorner<T_SHAPE_FUNC::DIM,
+ T_SHAPE_FUNC::NPOINTS>()
+ .noalias() = shapemat.invJ * shapemat.dNdr;
}
else
{
auto const& matR =
- ele_local_coord.getRotationMatrixToGlobal(); // 3 x 3
- auto invJ_dNdr = shapemat.invJ * shapemat.dNdr;
- auto dshape_global =
- matR.topLeftCorner(3u, ele_dim) * invJ_dNdr; // 3 x nnodes
- shapemat.dNdx = dshape_global.topLeftCorner(global_dim, nnodes);
+ (ele_local_coord.getRotationMatrixToGlobal().topLeftCorner(
+ global_dim, T_SHAPE_FUNC::DIM))
+ .eval();
+
+ auto const invJ_dNdr = shapemat.invJ * shapemat.dNdr;
+ auto const dshape_global = matR * invJ_dNdr;
+ shapemat.dNdx =
+ dshape_global.topLeftCorner(global_dim, T_SHAPE_FUNC::NPOINTS);
}
}
}
--
GitLab