Skip to content
Snippets Groups Projects
Commit e1617142 authored by wenqing's avatar wenqing Committed by Dmitri Naumov
Browse files

Revert "[NumLib] Modified TestGradShapeFunction according to the change in computeMappingMatrices"

This reverts commit f73976db.
parent 21474525
No related branches found
No related tags found
No related merge requests found
...@@ -53,12 +53,11 @@ template <class TestFeType_, template <typename, int> class ShapeMatrixPolicy_> ...@@ -53,12 +53,11 @@ template <class TestFeType_, template <typename, int> class ShapeMatrixPolicy_>
struct TestCase struct TestCase
{ {
using TestFeType = TestFeType_; using TestFeType = TestFeType_;
static const int GlobalDim = TestFeType::global_dim;
using ShapeMatrixTypes = using ShapeMatrixTypes =
ShapeMatrixPolicy_<typename TestFeType::ShapeFunction, ShapeMatrixPolicy_<typename TestFeType::ShapeFunction, GlobalDim>;
TestFeType::ShapeFunction::DIM>;
template <typename X> template <typename X>
using ShapeMatrixPolicy = using ShapeMatrixPolicy = ShapeMatrixPolicy_<X, GlobalDim>;
ShapeMatrixPolicy_<X, TestFeType::ShapeFunction::DIM>;
}; };
using TestTypes = using TestTypes =
...@@ -109,7 +108,7 @@ public: ...@@ -109,7 +108,7 @@ public:
using ShapeMatrixPolicy = typename T::template ShapeMatrixPolicy<X>; using ShapeMatrixPolicy = typename T::template ShapeMatrixPolicy<X>;
using MeshElementType = typename TestFeType::MeshElementType; 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 e_nnodes = TestFeType::e_nnodes;
static const unsigned n_sample_pt_order2 = TestFeType::n_sample_pt_order2; static const unsigned n_sample_pt_order2 = TestFeType::n_sample_pt_order2;
static const unsigned n_sample_pt_order3 = TestFeType::n_sample_pt_order3; static const unsigned n_sample_pt_order3 = TestFeType::n_sample_pt_order3;
...@@ -158,7 +157,7 @@ public: ...@@ -158,7 +157,7 @@ public:
}; // NumLibFemIsoTest }; // NumLibFemIsoTest
template <class T> template <class T>
const unsigned GradShapeFunctionTest<T>::dim; const int GradShapeFunctionTest<T>::dim;
template <class T> template <class T>
const unsigned GradShapeFunctionTest<T>::e_nnodes; const unsigned GradShapeFunctionTest<T>::e_nnodes;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment