From e161714285457185887b4fca82765bf705bc911c Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Thu, 25 Nov 2021 14:18:20 +0100
Subject: [PATCH] Revert "[NumLib] Modified TestGradShapeFunction according to
the change in computeMappingMatrices"
This reverts commit f73976db10b4e9af36ddae2bb37055b0c662d55f.
---
Tests/NumLib/TestGradShapeFunction.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Tests/NumLib/TestGradShapeFunction.cpp b/Tests/NumLib/TestGradShapeFunction.cpp
index 0da3f5a4732..f8ebb05efc9 100644
--- a/Tests/NumLib/TestGradShapeFunction.cpp
+++ b/Tests/NumLib/TestGradShapeFunction.cpp
@@ -53,12 +53,11 @@ template <class TestFeType_, template <typename, int> class ShapeMatrixPolicy_>
struct TestCase
{
using TestFeType = TestFeType_;
+ static const int GlobalDim = TestFeType::global_dim;
using ShapeMatrixTypes =
- ShapeMatrixPolicy_<typename TestFeType::ShapeFunction,
- TestFeType::ShapeFunction::DIM>;
+ ShapeMatrixPolicy_<typename TestFeType::ShapeFunction, GlobalDim>;
template <typename X>
- using ShapeMatrixPolicy =
- ShapeMatrixPolicy_<X, TestFeType::ShapeFunction::DIM>;
+ using ShapeMatrixPolicy = ShapeMatrixPolicy_<X, GlobalDim>;
};
using TestTypes =
@@ -109,7 +108,7 @@ public:
using ShapeMatrixPolicy = typename T::template ShapeMatrixPolicy<X>;
using MeshElementType = typename TestFeType::MeshElementType;
- static const unsigned dim = TestFeType::dim;
+ static const int dim = TestFeType::dim;
static const unsigned e_nnodes = TestFeType::e_nnodes;
static const unsigned n_sample_pt_order2 = TestFeType::n_sample_pt_order2;
static const unsigned n_sample_pt_order3 = TestFeType::n_sample_pt_order3;
@@ -158,7 +157,7 @@ public:
}; // NumLibFemIsoTest
template <class T>
-const unsigned GradShapeFunctionTest<T>::dim;
+const int GradShapeFunctionTest<T>::dim;
template <class T>
const unsigned GradShapeFunctionTest<T>::e_nnodes;
--
GitLab