diff --git a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h index 04e512b523ec085912e4df60313ec0cfea405530..f67301734edfcd2efb76a3cf8a20fd14d540830f 100644 --- a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h +++ b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h @@ -55,28 +55,22 @@ public: /** * Constructor without specifying a mesh element. resetMeshElement() must be called afterwards. - * - * @param integration_order default 2. */ - explicit TemplateIsoparametric(std::size_t integration_order=2) + explicit TemplateIsoparametric() : _ele(nullptr) { - this->_integration.setIntegrationOrder(integration_order); } /** * Construct this object for the given mesh element. * * @param e Mesh element object - * @param integration_order default 2. */ - TemplateIsoparametric(const MeshElementType &e, std::size_t integration_order=2) + TemplateIsoparametric(const MeshElementType &e) : _ele(&e) { - this->_integration.setIntegrationOrder(integration_order); } - /// ~TemplateIsoparametric() {} /// return current mesh element @@ -88,9 +82,6 @@ public: this->_ele = &e; } - /// return an integration method - const IntegrationMethod& getIntegrationMethod() const {return _integration;} - /** * compute shape functions * @@ -118,7 +109,6 @@ public: private: const MeshElementType* _ele; - IntegrationMethod _integration; }; } // NumLib diff --git a/Tests/NumLib/TestFeQuad4.cpp b/Tests/NumLib/TestFeQuad4.cpp index d07c39530cd195bc8c8c833c25003f57270c79e8..22eca4a7d8f71088682e775bb4c525bf5be1a3eb 100644 --- a/Tests/NumLib/TestFeQuad4.cpp +++ b/Tests/NumLib/TestFeQuad4.cpp @@ -197,7 +197,7 @@ TYPED_TEST(NumLibFemIsoQuad4Test, CheckMassMatrix) // evaluate a mass matrix M = int{ N^T D N }dA_e NodalMatrix M(e_nnodes, e_nnodes); ShapeMatricesType shape(dim, e_nnodes); - IntegrationMethod q = fe.getIntegrationMethod(); + IntegrationMethod q = IntegrationMethod(2); for (std::size_t i=0; i<q.getNPoints(); i++) { shape.setZero(); auto wp = q.getWeightedPoint(i); @@ -222,7 +222,7 @@ TYPED_TEST(NumLibFemIsoQuad4Test, CheckLaplaceMatrix) // evaluate a Laplace matrix K = int{ dNdx^T D dNdx }dA_e NodalMatrix K(e_nnodes, e_nnodes); ShapeMatricesType shape(dim, e_nnodes); - IntegrationMethod q = fe.getIntegrationMethod(); + IntegrationMethod q = IntegrationMethod(2); for (std::size_t i=0; i<q.getNPoints(); i++) { shape.setZero(); auto wp = q.getWeightedPoint(i); @@ -247,7 +247,7 @@ TYPED_TEST(NumLibFemIsoQuad4Test, CheckMassLaplaceMatrices) NodalMatrix M(e_nnodes, e_nnodes); NodalMatrix K(e_nnodes, e_nnodes); ShapeMatricesType shape(dim, e_nnodes); - IntegrationMethod q = fe.getIntegrationMethod(); + IntegrationMethod q = IntegrationMethod(2); for (std::size_t i=0; i<q.getNPoints(); i++) { shape.setZero(); auto wp = q.getWeightedPoint(i); @@ -268,12 +268,12 @@ TYPED_TEST(NumLibFemIsoQuad4Test, CheckGaussIntegrationLevel) typedef typename FeQUAD4Type::IntegrationMethod IntegrationMethod; // create a finite element object with gauss quadrature level 2 - FeQUAD4Type fe(*this->unitSquareQuad, 2); + FeQUAD4Type fe(*this->unitSquareQuad); // evaluate a mass matrix NodalMatrix M(e_nnodes, e_nnodes); ShapeMatricesType shape(dim, e_nnodes); - IntegrationMethod q = fe.getIntegrationMethod(); + IntegrationMethod q = IntegrationMethod(2); for (std::size_t i=0; i<q.getNPoints(); i++) { shape.setZero(); auto wp = q.getWeightedPoint(i);