diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
index 833370313c702eba1927a76ac524e51cb16c71ec..bb934db37521969786c9e8d66afcf91c0fdf079f 100644
--- a/src/analysis/CMakeLists.txt
+++ b/src/analysis/CMakeLists.txt
@@ -2,6 +2,6 @@
add_library(
PugsAnalysis
- SimplicialGaussLegendreQuadrature.cpp
+ SimplicialGaussQuadrature.cpp
TensorialGaussLegendreQuadrature.cpp
TensorialGaussLobattoQuadrature.cpp)
diff --git a/src/analysis/QuadratureFormula.hpp b/src/analysis/QuadratureFormula.hpp
index f03d5ce9e6e10236a8e37ad60b93bd387f82f7da..ece948fe790c29b7511428cfdc9b045b5d064c61 100644
--- a/src/analysis/QuadratureFormula.hpp
+++ b/src/analysis/QuadratureFormula.hpp
@@ -10,7 +10,7 @@ template <size_t Dimension>
class QuadratureForumla
{
protected:
- size_t m_order;
+ size_t m_degree;
SmallArray<const TinyVector<Dimension>> m_point_list;
SmallArray<const double> m_weight_list;
@@ -56,7 +56,7 @@ class QuadratureForumla
QuadratureForumla(const QuadratureForumla&) = default;
protected:
- explicit QuadratureForumla(const size_t order) : m_order{order} {}
+ explicit QuadratureForumla(const size_t degree) : m_degree{degree} {}
public:
QuadratureForumla() = delete;
diff --git a/src/analysis/SimplicialGaussLegendreQuadrature.hpp b/src/analysis/SimplicialGaussLegendreQuadrature.hpp
deleted file mode 100644
index 824eb099568ec82e4ca6457feaa0f6cc603a2b7a..0000000000000000000000000000000000000000
--- a/src/analysis/SimplicialGaussLegendreQuadrature.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef SIMPLICIAL_GAUSS_LEGENDRE_QUADRATURE_HPP
-#define SIMPLICIAL_GAUSS_LEGENDRE_QUADRATURE_HPP
-
-#include <analysis/QuadratureFormula.hpp>
-
-/**
- * Defines Gauss Legendre quadrature on the reference simplex element
- * - in 1d, the segment \f$]-1,1[\f$
- * - in 2d, the triangle defined by \f$(-1,-1)\f$, \f$(1,-1)\f$ and \f$(-1,1)\f$
- * - in 3d, the tetrahedron joining \f$(-1,-1-1)\f$, \f$(1,-1,-1)\f$, \f$(-1,1,-1)\f$ and \f$(-1,1-,1)\f$
- *
- * \note formulae are extracted from High-order Finite Element Method [2004 - Chapman & Hall]
- */
-template <size_t Dimension>
-class SimplicialGaussLegendreQuadrature final : public QuadratureForumla<Dimension>
-{
- private:
- void _buildPointAndWeightLists();
-
- public:
- SimplicialGaussLegendreQuadrature(SimplicialGaussLegendreQuadrature&&) = default;
- SimplicialGaussLegendreQuadrature(const SimplicialGaussLegendreQuadrature&) = default;
-
- explicit SimplicialGaussLegendreQuadrature(const size_t order) : QuadratureForumla<Dimension>(order)
- {
- this->_buildPointAndWeightLists();
- }
-
- SimplicialGaussLegendreQuadrature() = delete;
- ~SimplicialGaussLegendreQuadrature() = default;
-};
-
-#endif // SIMPLICIAL_GAUSS_LEGENDRE_QUADRATURE_HPP
diff --git a/src/analysis/SimplicialGaussLegendreQuadrature.cpp b/src/analysis/SimplicialGaussQuadrature.cpp
similarity index 97%
rename from src/analysis/SimplicialGaussLegendreQuadrature.cpp
rename to src/analysis/SimplicialGaussQuadrature.cpp
index 48843282c27922109de9716778a8eee478883f9f..03ccc138e1071f977a28b03ed29550c034bf7cc6 100644
--- a/src/analysis/SimplicialGaussLegendreQuadrature.cpp
+++ b/src/analysis/SimplicialGaussQuadrature.cpp
@@ -1,12 +1,12 @@
-#include <analysis/SimplicialGaussLegendreQuadrature.hpp>
+#include <analysis/SimplicialGaussQuadrature.hpp>
#include <analysis/TensorialGaussLegendreQuadrature.hpp>
#include <utils/Exceptions.hpp>
template <>
void
-SimplicialGaussLegendreQuadrature<1>::_buildPointAndWeightLists()
+SimplicialGaussQuadrature<1>::_buildPointAndWeightLists()
{
- TensorialGaussLegendreQuadrature<1> gauss(m_order);
+ TensorialGaussLegendreQuadrature<1> gauss(m_degree);
m_point_list = gauss.pointList();
m_weight_list = gauss.weightList();
@@ -14,9 +14,9 @@ SimplicialGaussLegendreQuadrature<1>::_buildPointAndWeightLists()
template <>
void
-SimplicialGaussLegendreQuadrature<2>::_buildPointAndWeightLists()
+SimplicialGaussQuadrature<2>::_buildPointAndWeightLists()
{
- switch (m_order) {
+ switch (m_degree) {
case 0:
case 1: {
constexpr size_t nb_points = 1;
@@ -187,16 +187,16 @@ SimplicialGaussLegendreQuadrature<2>::_buildPointAndWeightLists()
break;
}
default: {
- throw NormalError("Gauss-Legendre quadrature formulae handle orders up to 7 on triangles");
+ throw NormalError("Gauss quadrature formulae handle degrees up to 7 on triangles");
}
}
}
template <>
void
-SimplicialGaussLegendreQuadrature<3>::_buildPointAndWeightLists()
+SimplicialGaussQuadrature<3>::_buildPointAndWeightLists()
{
- switch (m_order) {
+ switch (m_degree) {
case 0:
case 1: {
constexpr size_t nb_points = 1;
@@ -462,7 +462,7 @@ SimplicialGaussLegendreQuadrature<3>::_buildPointAndWeightLists()
break;
}
default: {
- throw NormalError("Gauss-Legendre quadrature formulae handle orders up to 7 on tetrahedra");
+ throw NormalError("Gauss quadrature formulae handle degrees up to 7 on tetrahedra");
}
}
}
diff --git a/src/analysis/SimplicialGaussQuadrature.hpp b/src/analysis/SimplicialGaussQuadrature.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e6a521a8baae3e42a30cd8f492637e81e3e3d274
--- /dev/null
+++ b/src/analysis/SimplicialGaussQuadrature.hpp
@@ -0,0 +1,33 @@
+#ifndef SIMPLICIAL_GAUSS_QUADRATURE_HPP
+#define SIMPLICIAL_GAUSS_QUADRATURE_HPP
+
+#include <analysis/QuadratureFormula.hpp>
+
+/**
+ * Defines Gauss quadrature on the reference simplex element
+ * - in 1d, the segment \f$]-1,1[\f$
+ * - in 2d, the triangle defined by \f$(-1,-1)\f$, \f$(1,-1)\f$ and \f$(-1,1)\f$
+ * - in 3d, the tetrahedron joining \f$(-1,-1-1)\f$, \f$(1,-1,-1)\f$, \f$(-1,1,-1)\f$ and \f$(-1,1-,1)\f$
+ *
+ * \note formulae are extracted from High-order Finite Element Method [2004 - Chapman & Hall]
+ */
+template <size_t Dimension>
+class SimplicialGaussQuadrature final : public QuadratureForumla<Dimension>
+{
+ private:
+ void _buildPointAndWeightLists();
+
+ public:
+ SimplicialGaussQuadrature(SimplicialGaussQuadrature&&) = default;
+ SimplicialGaussQuadrature(const SimplicialGaussQuadrature&) = default;
+
+ explicit SimplicialGaussQuadrature(const size_t degree) : QuadratureForumla<Dimension>(degree)
+ {
+ this->_buildPointAndWeightLists();
+ }
+
+ SimplicialGaussQuadrature() = delete;
+ ~SimplicialGaussQuadrature() = default;
+};
+
+#endif // SIMPLICIAL_GAUSS_QUADRATURE_HPP
diff --git a/src/analysis/TensorialGaussLegendreQuadrature.cpp b/src/analysis/TensorialGaussLegendreQuadrature.cpp
index 6b70c6a4ad3a4212190d5e5aea61596ad50bc100..ef3796f85bf45e9f369e4344abaa0130e69c28cd 100644
--- a/src/analysis/TensorialGaussLegendreQuadrature.cpp
+++ b/src/analysis/TensorialGaussLegendreQuadrature.cpp
@@ -5,12 +5,12 @@ template <>
void
TensorialGaussLegendreQuadrature<1>::_buildPointAndWeightLists()
{
- const size_t nb_points = m_order / 2 + 1;
+ const size_t nb_points = m_degree / 2 + 1;
SmallArray<TinyVector<1>> point_list(nb_points);
SmallArray<double> weight_list(nb_points);
- switch (m_order) {
+ switch (m_degree) {
case 0:
case 1: {
point_list[0] = 0;
@@ -228,7 +228,7 @@ TensorialGaussLegendreQuadrature<1>::_buildPointAndWeightLists()
break;
}
default: {
- throw NormalError("Gauss-Legendre quadrature formulae handle orders up to 23");
+ throw NormalError("Gauss-Legendre quadrature formulae handle degrees up to 23");
}
}
@@ -240,13 +240,13 @@ template <>
void
TensorialGaussLegendreQuadrature<2>::_buildPointAndWeightLists()
{
- const size_t nb_points_1d = this->m_order / 2 + 1;
+ const size_t nb_points_1d = this->m_degree / 2 + 1;
const size_t nb_points = nb_points_1d * nb_points_1d;
SmallArray<TinyVector<2>> point_list(nb_points);
SmallArray<double> weight_list(nb_points);
- TensorialGaussLegendreQuadrature<1> gauss_legendre_1d(m_order);
+ TensorialGaussLegendreQuadrature<1> gauss_legendre_1d(m_degree);
const auto& point_list_1d = gauss_legendre_1d.pointList();
const auto& weight_list_1d = gauss_legendre_1d.weightList();
@@ -266,13 +266,13 @@ template <>
void
TensorialGaussLegendreQuadrature<3>::_buildPointAndWeightLists()
{
- const size_t nb_points_1d = this->m_order / 2 + 1;
+ const size_t nb_points_1d = this->m_degree / 2 + 1;
const size_t nb_points = nb_points_1d * nb_points_1d * nb_points_1d;
SmallArray<TinyVector<3>> point_list(nb_points);
SmallArray<double> weight_list(nb_points);
- TensorialGaussLegendreQuadrature<1> gauss_legendre_1d(m_order);
+ TensorialGaussLegendreQuadrature<1> gauss_legendre_1d(m_degree);
const auto& point_list_1d = gauss_legendre_1d.pointList();
const auto& weight_list_1d = gauss_legendre_1d.weightList();
diff --git a/src/analysis/TensorialGaussLegendreQuadrature.hpp b/src/analysis/TensorialGaussLegendreQuadrature.hpp
index eaf4853569cde63b882f2e69a4325be1fed39a13..61ec916d7dba869ce47636b847b3ddfc0d48cfc7 100644
--- a/src/analysis/TensorialGaussLegendreQuadrature.hpp
+++ b/src/analysis/TensorialGaussLegendreQuadrature.hpp
@@ -19,7 +19,7 @@ class TensorialGaussLegendreQuadrature final : public QuadratureForumla<Dimensio
TensorialGaussLegendreQuadrature(TensorialGaussLegendreQuadrature&&) = default;
TensorialGaussLegendreQuadrature(const TensorialGaussLegendreQuadrature&) = default;
- explicit TensorialGaussLegendreQuadrature(const size_t order) : QuadratureForumla<Dimension>(order)
+ explicit TensorialGaussLegendreQuadrature(const size_t degree) : QuadratureForumla<Dimension>(degree)
{
this->_buildPointAndWeightLists();
}
diff --git a/src/analysis/TensorialGaussLobattoQuadrature.cpp b/src/analysis/TensorialGaussLobattoQuadrature.cpp
index 1b4ab59867f3212d5e641b306a114962c3a65379..fa1b3b5f352d757ad37ff15f9c801bad6458a74f 100644
--- a/src/analysis/TensorialGaussLobattoQuadrature.cpp
+++ b/src/analysis/TensorialGaussLobattoQuadrature.cpp
@@ -5,12 +5,12 @@ template <>
void
TensorialGaussLobattoQuadrature<1>::_buildPointAndWeightLists()
{
- const size_t nb_points = m_order / 2 + 2;
+ const size_t nb_points = m_degree / 2 + 2;
SmallArray<TinyVector<1>> point_list(nb_points);
SmallArray<double> weight_list(nb_points);
- switch (m_order) {
+ switch (m_degree) {
case 0:
case 1: {
point_list[0] = -1;
@@ -117,7 +117,7 @@ TensorialGaussLobattoQuadrature<1>::_buildPointAndWeightLists()
break;
}
default: {
- throw NormalError("Gauss-Lobatto quadrature formulae handle orders up to 13");
+ throw NormalError("Gauss-Lobatto quadrature formulae handle degrees up to 13");
}
}
@@ -129,13 +129,13 @@ template <>
void
TensorialGaussLobattoQuadrature<2>::_buildPointAndWeightLists()
{
- const size_t nb_points_1d = this->m_order / 2 + 2;
+ const size_t nb_points_1d = this->m_degree / 2 + 2;
const size_t nb_points = nb_points_1d * nb_points_1d;
SmallArray<TinyVector<2>> point_list(nb_points);
SmallArray<double> weight_list(nb_points);
- TensorialGaussLobattoQuadrature<1> gauss_lobatto_1d(m_order);
+ TensorialGaussLobattoQuadrature<1> gauss_lobatto_1d(m_degree);
const auto& point_list_1d = gauss_lobatto_1d.pointList();
const auto& weight_list_1d = gauss_lobatto_1d.weightList();
@@ -155,13 +155,13 @@ template <>
void
TensorialGaussLobattoQuadrature<3>::_buildPointAndWeightLists()
{
- const size_t nb_points_1d = this->m_order / 2 + 2;
+ const size_t nb_points_1d = this->m_degree / 2 + 2;
const size_t nb_points = nb_points_1d * nb_points_1d * nb_points_1d;
SmallArray<TinyVector<3>> point_list(nb_points);
SmallArray<double> weight_list(nb_points);
- TensorialGaussLobattoQuadrature<1> gauss_lobatto_1d(m_order);
+ TensorialGaussLobattoQuadrature<1> gauss_lobatto_1d(m_degree);
const auto& point_list_1d = gauss_lobatto_1d.pointList();
const auto& weight_list_1d = gauss_lobatto_1d.weightList();
diff --git a/src/analysis/TensorialGaussLobattoQuadrature.hpp b/src/analysis/TensorialGaussLobattoQuadrature.hpp
index d740f9c48900581119e355fa12705089c03f24a0..fe63573f8b36532b6a03d6978cae0ad6083ae107 100644
--- a/src/analysis/TensorialGaussLobattoQuadrature.hpp
+++ b/src/analysis/TensorialGaussLobattoQuadrature.hpp
@@ -19,7 +19,7 @@ class TensorialGaussLobattoQuadrature final : public QuadratureForumla<Dimension
TensorialGaussLobattoQuadrature(TensorialGaussLobattoQuadrature&&) = default;
TensorialGaussLobattoQuadrature(const TensorialGaussLobattoQuadrature&) = default;
- explicit TensorialGaussLobattoQuadrature(const size_t order) : QuadratureForumla<Dimension>(order)
+ explicit TensorialGaussLobattoQuadrature(const size_t degree) : QuadratureForumla<Dimension>(degree)
{
this->_buildPointAndWeightLists();
}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 69b85561efd036404347b6b2ec4e79068fdee469..b188acce316a12bf549f092e5054dc65c235655b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -99,7 +99,7 @@ add_executable (unit_tests
test_PugsUtils.cpp
test_Q1Transformation.cpp
test_RevisionInfo.cpp
- test_SimplicialGaussLegendreQuadrature.cpp
+ test_SimplicialGaussQuadrature.cpp
test_SmallArray.cpp
test_SmallVector.cpp
test_SymbolTable.cpp
diff --git a/tests/test_SimplicialGaussLegendreQuadrature.cpp b/tests/test_SimplicialGaussQuadrature.cpp
similarity index 93%
rename from tests/test_SimplicialGaussLegendreQuadrature.cpp
rename to tests/test_SimplicialGaussQuadrature.cpp
index f5a04257ca5a216cc56e8fd103c560b48d58e9e5..1e725e67765e2fc12cc044b6835f3efe8a6ef711 100644
--- a/tests/test_SimplicialGaussLegendreQuadrature.cpp
+++ b/tests/test_SimplicialGaussQuadrature.cpp
@@ -2,13 +2,13 @@
#include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_all.hpp>
-#include <analysis/SimplicialGaussLegendreQuadrature.hpp>
+#include <analysis/SimplicialGaussQuadrature.hpp>
#include <geometry/AffineTransformation.hpp>
#include <utils/Exceptions.hpp>
// clazy:excludeall=non-pod-global-static
-TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
+TEST_CASE("SimplicialGaussQuadrature", "[analysis]")
{
SECTION("1D")
{
@@ -182,8 +182,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 0 and 1")
{
- SimplicialGaussLegendreQuadrature<1> l0(0);
- SimplicialGaussLegendreQuadrature<1> l1(1);
+ SimplicialGaussQuadrature<1> l0(0);
+ SimplicialGaussQuadrature<1> l1(1);
REQUIRE(same_formulas(l0, l1));
REQUIRE(is_symmetric_formula(l1));
@@ -199,8 +199,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 2 and 3")
{
- SimplicialGaussLegendreQuadrature<1> l2(2);
- SimplicialGaussLegendreQuadrature<1> l3(3);
+ SimplicialGaussQuadrature<1> l2(2);
+ SimplicialGaussQuadrature<1> l3(3);
REQUIRE(same_formulas(l2, l3));
REQUIRE(is_symmetric_formula(l3));
@@ -218,8 +218,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 4 and 5")
{
- SimplicialGaussLegendreQuadrature<1> l4(4);
- SimplicialGaussLegendreQuadrature<1> l5(5);
+ SimplicialGaussQuadrature<1> l4(4);
+ SimplicialGaussQuadrature<1> l5(5);
REQUIRE(same_formulas(l4, l5));
REQUIRE(is_symmetric_formula(l5));
@@ -239,8 +239,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 6 and 7")
{
- SimplicialGaussLegendreQuadrature<1> l6(6);
- SimplicialGaussLegendreQuadrature<1> l7(7);
+ SimplicialGaussQuadrature<1> l6(6);
+ SimplicialGaussQuadrature<1> l7(7);
REQUIRE(same_formulas(l6, l7));
REQUIRE(is_symmetric_formula(l7));
@@ -262,8 +262,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 8 and 9")
{
- SimplicialGaussLegendreQuadrature<1> l8(8);
- SimplicialGaussLegendreQuadrature<1> l9(9);
+ SimplicialGaussQuadrature<1> l8(8);
+ SimplicialGaussQuadrature<1> l9(9);
REQUIRE(same_formulas(l8, l9));
REQUIRE(is_symmetric_formula(l9));
@@ -287,8 +287,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 10 and 11")
{
- SimplicialGaussLegendreQuadrature<1> l10(10);
- SimplicialGaussLegendreQuadrature<1> l11(11);
+ SimplicialGaussQuadrature<1> l10(10);
+ SimplicialGaussQuadrature<1> l11(11);
REQUIRE(same_formulas(l10, l11));
REQUIRE(is_symmetric_formula(l11));
@@ -314,8 +314,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 12 and 13")
{
- SimplicialGaussLegendreQuadrature<1> l12(12);
- SimplicialGaussLegendreQuadrature<1> l13(13);
+ SimplicialGaussQuadrature<1> l12(12);
+ SimplicialGaussQuadrature<1> l13(13);
REQUIRE(same_formulas(l12, l13));
REQUIRE(is_symmetric_formula(l13));
@@ -343,8 +343,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 14 and 15")
{
- SimplicialGaussLegendreQuadrature<1> l14(14);
- SimplicialGaussLegendreQuadrature<1> l15(15);
+ SimplicialGaussQuadrature<1> l14(14);
+ SimplicialGaussQuadrature<1> l15(15);
REQUIRE(same_formulas(l14, l15));
REQUIRE(is_symmetric_formula(l15));
@@ -374,8 +374,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 16 and 17")
{
- SimplicialGaussLegendreQuadrature<1> l16(16);
- SimplicialGaussLegendreQuadrature<1> l17(17);
+ SimplicialGaussQuadrature<1> l16(16);
+ SimplicialGaussQuadrature<1> l17(17);
REQUIRE(same_formulas(l16, l17));
REQUIRE(is_symmetric_formula(l17));
@@ -407,8 +407,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 18 and 19")
{
- SimplicialGaussLegendreQuadrature<1> l18(18);
- SimplicialGaussLegendreQuadrature<1> l19(19);
+ SimplicialGaussQuadrature<1> l18(18);
+ SimplicialGaussQuadrature<1> l19(19);
REQUIRE(same_formulas(l18, l19));
REQUIRE(is_symmetric_formula(l19));
@@ -442,8 +442,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 20 and 21")
{
- SimplicialGaussLegendreQuadrature<1> l20(20);
- SimplicialGaussLegendreQuadrature<1> l21(21);
+ SimplicialGaussQuadrature<1> l20(20);
+ SimplicialGaussQuadrature<1> l21(21);
REQUIRE(same_formulas(l20, l21));
REQUIRE(is_symmetric_formula(l21));
@@ -479,8 +479,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 22 and 23")
{
- SimplicialGaussLegendreQuadrature<1> l22(22);
- SimplicialGaussLegendreQuadrature<1> l23(23);
+ SimplicialGaussQuadrature<1> l22(22);
+ SimplicialGaussQuadrature<1> l23(23);
REQUIRE(same_formulas(l22, l23));
REQUIRE(is_symmetric_formula(l23));
@@ -518,8 +518,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("not implemented formulae")
{
- REQUIRE_THROWS_WITH(SimplicialGaussLegendreQuadrature<1>(24),
- "error: Gauss-Legendre quadrature formulae handle orders up to 23");
+ REQUIRE_THROWS_WITH(SimplicialGaussQuadrature<1>(24),
+ "error: Gauss-Legendre quadrature formulae handle degrees up to 23");
}
}
@@ -607,7 +607,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 1")
{
- SimplicialGaussLegendreQuadrature<2> l1(1);
+ SimplicialGaussQuadrature<2> l1(1);
REQUIRE(l1.numberOfPoints() == 1);
@@ -620,7 +620,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 2")
{
- SimplicialGaussLegendreQuadrature<2> l2(2);
+ SimplicialGaussQuadrature<2> l2(2);
REQUIRE(l2.numberOfPoints() == 3);
@@ -635,7 +635,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 3")
{
- SimplicialGaussLegendreQuadrature<2> l3(3);
+ SimplicialGaussQuadrature<2> l3(3);
REQUIRE(l3.numberOfPoints() == 4);
@@ -650,7 +650,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 4")
{
- SimplicialGaussLegendreQuadrature<2> l4(4);
+ SimplicialGaussQuadrature<2> l4(4);
REQUIRE(l4.numberOfPoints() == 6);
@@ -667,7 +667,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 5")
{
- SimplicialGaussLegendreQuadrature<2> l5(5);
+ SimplicialGaussQuadrature<2> l5(5);
REQUIRE(l5.numberOfPoints() == 7);
@@ -684,7 +684,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 6")
{
- SimplicialGaussLegendreQuadrature<2> l6(6);
+ SimplicialGaussQuadrature<2> l6(6);
REQUIRE(l6.numberOfPoints() == 12);
@@ -702,7 +702,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 7")
{
- SimplicialGaussLegendreQuadrature<2> l7(7);
+ SimplicialGaussQuadrature<2> l7(7);
REQUIRE(l7.numberOfPoints() == 13);
@@ -721,8 +721,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("not implemented formulae")
{
- REQUIRE_THROWS_WITH(SimplicialGaussLegendreQuadrature<2>(8),
- "error: Gauss-Legendre quadrature formulae handle orders up to 7 on triangles");
+ REQUIRE_THROWS_WITH(SimplicialGaussQuadrature<2>(8),
+ "error: Gauss quadrature formulae handle degrees up to 7 on triangles");
}
}
@@ -835,7 +835,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 1")
{
- SimplicialGaussLegendreQuadrature<3> l1(1);
+ SimplicialGaussQuadrature<3> l1(1);
REQUIRE(l1.numberOfPoints() == 1);
@@ -848,7 +848,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 2")
{
- SimplicialGaussLegendreQuadrature<3> l2(2);
+ SimplicialGaussQuadrature<3> l2(2);
REQUIRE(l2.numberOfPoints() == 4);
@@ -862,7 +862,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 3")
{
- SimplicialGaussLegendreQuadrature<3> l3(3);
+ SimplicialGaussQuadrature<3> l3(3);
REQUIRE(l3.numberOfPoints() == 5);
@@ -875,7 +875,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 4")
{
- SimplicialGaussLegendreQuadrature<3> l4(4);
+ SimplicialGaussQuadrature<3> l4(4);
REQUIRE(l4.numberOfPoints() == 11);
@@ -891,7 +891,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 5")
{
- SimplicialGaussLegendreQuadrature<3> l5(5);
+ SimplicialGaussQuadrature<3> l5(5);
REQUIRE(l5.numberOfPoints() == 14);
@@ -906,7 +906,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 6")
{
- SimplicialGaussLegendreQuadrature<3> l6(6);
+ SimplicialGaussQuadrature<3> l6(6);
REQUIRE(l6.numberOfPoints() == 24);
@@ -924,7 +924,7 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("degree 7")
{
- SimplicialGaussLegendreQuadrature<3> l7(7);
+ SimplicialGaussQuadrature<3> l7(7);
REQUIRE(l7.numberOfPoints() == 31);
@@ -942,8 +942,8 @@ TEST_CASE("SimplicialGaussLegendreQuadrature", "[analysis]")
SECTION("not implemented formulae")
{
- REQUIRE_THROWS_WITH(SimplicialGaussLegendreQuadrature<3>(8),
- "error: Gauss-Legendre quadrature formulae handle orders up to 7 on tetrahedra");
+ REQUIRE_THROWS_WITH(SimplicialGaussQuadrature<3>(8),
+ "error: Gauss quadrature formulae handle degrees up to 7 on tetrahedra");
}
}
}
diff --git a/tests/test_TensorialGaussLegendreQuadrature.cpp b/tests/test_TensorialGaussLegendreQuadrature.cpp
index e8ea8c1249462492659c35c0de82f984f59f4bbd..8fc97fdae479a13eb3625f6dc1629089bd667222 100644
--- a/tests/test_TensorialGaussLegendreQuadrature.cpp
+++ b/tests/test_TensorialGaussLegendreQuadrature.cpp
@@ -518,7 +518,7 @@ TEST_CASE("TensorialGaussLegendreQuadrature", "[analysis]")
SECTION("not implemented formulae")
{
REQUIRE_THROWS_WITH(TensorialGaussLegendreQuadrature<1>(24),
- "error: Gauss-Legendre quadrature formulae handle orders up to 23");
+ "error: Gauss-Legendre quadrature formulae handle degrees up to 23");
}
}
diff --git a/tests/test_TensorialGaussLobattoQuadrature.cpp b/tests/test_TensorialGaussLobattoQuadrature.cpp
index 6afd49d02afe3db276046daca9a8835ce1e1d864..069073eea67a67c815b935188ed9142752033539 100644
--- a/tests/test_TensorialGaussLobattoQuadrature.cpp
+++ b/tests/test_TensorialGaussLobattoQuadrature.cpp
@@ -303,7 +303,7 @@ TEST_CASE("TensorialGaussLobattoQuadrature", "[analysis]")
SECTION("not implemented formulae")
{
REQUIRE_THROWS_WITH(TensorialGaussLobattoQuadrature<1>(14),
- "error: Gauss-Lobatto quadrature formulae handle orders up to 13");
+ "error: Gauss-Lobatto quadrature formulae handle degrees up to 13");
}
}