Skip to content
Snippets Groups Projects
Commit f73976db authored by wenqing's avatar wenqing
Browse files

[NumLib] Modified TestGradShapeFunction according to the change in computeMappingMatrices

parent d0a28ac5
No related branches found
No related tags found
No related merge requests found
...@@ -53,11 +53,12 @@ template <class TestFeType_, template <typename, int> class ShapeMatrixPolicy_> ...@@ -53,11 +53,12 @@ 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, GlobalDim>; ShapeMatrixPolicy_<typename TestFeType::ShapeFunction,
TestFeType::ShapeFunction::DIM>;
template <typename X> template <typename X>
using ShapeMatrixPolicy = ShapeMatrixPolicy_<X, GlobalDim>; using ShapeMatrixPolicy =
ShapeMatrixPolicy_<X, TestFeType::ShapeFunction::DIM>;
}; };
using TestTypes = using TestTypes =
...@@ -108,7 +109,7 @@ public: ...@@ -108,7 +109,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 int dim = TestFeType::dim; static const unsigned 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;
...@@ -157,7 +158,7 @@ public: ...@@ -157,7 +158,7 @@ public:
}; // NumLibFemIsoTest }; // NumLibFemIsoTest
template <class T> template <class T>
const int GradShapeFunctionTest<T>::dim; const unsigned 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