From 711261b08cc553a60e9defd225e1bfebfc589d2c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 17 Sep 2013 12:49:48 +0200
Subject: [PATCH] [NL] Update from samplingLevel to integrationOrder.
---
NumLib/Fem/FiniteElement/TemplateIsoparametric.h | 14 +++++++-------
Tests/NumLib/TestFeQuad4.cpp | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
index cf93e3af538..d986d22fc1d 100644
--- a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
+++ b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
@@ -56,25 +56,25 @@ public:
/**
* Constructor without specifying a mesh element. resetMeshElement() must be called afterwards.
*
- * @param integration_points_level the sampling level (default 2)
+ * @param integration_order default 2.
*/
- explicit TemplateIsoparametric(std::size_t integration_points_level=2)
+ explicit TemplateIsoparametric(std::size_t integration_order=2)
: _ele(nullptr)
{
- this->_integration.setSamplingLevel(integration_points_level);
+ this->_integration.setIntegrationOrder(integration_order);
}
/**
* Construct this object for the given mesh element.
*
- * @param e Mesh element object
- * @param integration_points_level the sampling level (default 2)
+ * @param e Mesh element object
+ * @param integration_order default 2.
*/
- TemplateIsoparametric(const MeshElementType &e, std::size_t integration_points_level=2)
+ TemplateIsoparametric(const MeshElementType &e, std::size_t integration_order=2)
: _ele(&e)
{
this->resetMeshElement(e);
- this->_integration.setSamplingLevel(integration_points_level);
+ this->_integration.setIntegrationOrder(integration_order);
}
///
diff --git a/Tests/NumLib/TestFeQuad4.cpp b/Tests/NumLib/TestFeQuad4.cpp
index 71df5f4da78..b906e6e8d3f 100644
--- a/Tests/NumLib/TestFeQuad4.cpp
+++ b/Tests/NumLib/TestFeQuad4.cpp
@@ -279,7 +279,7 @@ TYPED_TEST(NumLibFemIsoQuad4Test, CheckGaussIntegrationLevel)
ASSERT_ARRAY_NEAR(this->expectedM.data(), M.data(), M.size(), this->eps);
// Change gauss quadrature level to 3
- q.setSamplingLevel(3);
+ q.setIntegrationOrder(3);
M *= .0;
for (std::size_t i=0; i<q.getNPoints(); i++) {
shape.setZero();
--
GitLab