From fe95977d77a2638bc733c30203d44b23b5432a72 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Fri, 24 Jul 2020 14:33:05 +0200
Subject: [PATCH] [NL/Fem] Expose WeightedPoint type of int. method.
The type is used as return type anyway, no advantage to
make the typedef private.
---
NumLib/Fem/Integration/IntegrationGaussLegendrePrism.h | 2 +-
NumLib/Fem/Integration/IntegrationGaussLegendrePyramid.h | 2 +-
NumLib/Fem/Integration/IntegrationGaussLegendreRegular.h | 2 +-
NumLib/Fem/Integration/IntegrationGaussLegendreTet.h | 2 +-
NumLib/Fem/Integration/IntegrationGaussLegendreTri.h | 2 +-
NumLib/Fem/Integration/IntegrationPoint.h | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/NumLib/Fem/Integration/IntegrationGaussLegendrePrism.h b/NumLib/Fem/Integration/IntegrationGaussLegendrePrism.h
index e87e50baead..9dc77292531 100644
--- a/NumLib/Fem/Integration/IntegrationGaussLegendrePrism.h
+++ b/NumLib/Fem/Integration/IntegrationGaussLegendrePrism.h
@@ -21,9 +21,9 @@ namespace NumLib
*/
class IntegrationGaussLegendrePrism
{
+public:
using WeightedPoint = MathLib::TemplateWeightedPoint<double, double, 3>;
-public:
/**
* Construct this object with the given integration order
*
diff --git a/NumLib/Fem/Integration/IntegrationGaussLegendrePyramid.h b/NumLib/Fem/Integration/IntegrationGaussLegendrePyramid.h
index f02fe46e7d8..4e3aee5e1f0 100644
--- a/NumLib/Fem/Integration/IntegrationGaussLegendrePyramid.h
+++ b/NumLib/Fem/Integration/IntegrationGaussLegendrePyramid.h
@@ -20,9 +20,9 @@ namespace NumLib
*/
class IntegrationGaussLegendrePyramid
{
+public:
using WeightedPoint = MathLib::TemplateWeightedPoint<double, double, 3>;
-public:
/**
* Construct this object with the given integration order
*
diff --git a/NumLib/Fem/Integration/IntegrationGaussLegendreRegular.h b/NumLib/Fem/Integration/IntegrationGaussLegendreRegular.h
index ab9c7e26bad..1f3f55991b9 100644
--- a/NumLib/Fem/Integration/IntegrationGaussLegendreRegular.h
+++ b/NumLib/Fem/Integration/IntegrationGaussLegendreRegular.h
@@ -27,10 +27,10 @@ namespace NumLib
template <unsigned N_DIM>
class IntegrationGaussLegendreRegular
{
+public:
using WeightedPoint =
typename MathLib::TemplateWeightedPoint<double, double, N_DIM>;
-public:
/// Create IntegrationGaussLegendreRegular of the given Gauss-Legendre
/// integration order.
///
diff --git a/NumLib/Fem/Integration/IntegrationGaussLegendreTet.h b/NumLib/Fem/Integration/IntegrationGaussLegendreTet.h
index 2fd50e2457b..a797e4e7cd7 100644
--- a/NumLib/Fem/Integration/IntegrationGaussLegendreTet.h
+++ b/NumLib/Fem/Integration/IntegrationGaussLegendreTet.h
@@ -20,9 +20,9 @@ namespace NumLib
*/
class IntegrationGaussLegendreTet
{
+public:
using WeightedPoint = MathLib::TemplateWeightedPoint<double, double, 3>;
-public:
/**
* Construct this object with the given integration order
*
diff --git a/NumLib/Fem/Integration/IntegrationGaussLegendreTri.h b/NumLib/Fem/Integration/IntegrationGaussLegendreTri.h
index f472b1430b7..3ab76037dce 100644
--- a/NumLib/Fem/Integration/IntegrationGaussLegendreTri.h
+++ b/NumLib/Fem/Integration/IntegrationGaussLegendreTri.h
@@ -35,9 +35,9 @@ namespace NumLib
*/
class IntegrationGaussLegendreTri
{
+public:
using WeightedPoint = MathLib::TemplateWeightedPoint<double, double, 2>;
-public:
/**
* Construct this object with the given integration order
*
diff --git a/NumLib/Fem/Integration/IntegrationPoint.h b/NumLib/Fem/Integration/IntegrationPoint.h
index fdb72ee3375..a6cd0f08fbb 100644
--- a/NumLib/Fem/Integration/IntegrationPoint.h
+++ b/NumLib/Fem/Integration/IntegrationPoint.h
@@ -20,9 +20,9 @@ namespace NumLib
/// It is only needed to satisfy the common integration rule concepts.
class IntegrationPoint
{
+public:
using WeightedPoint = MathLib::TemplateWeightedPoint<double, double, 1>;
-public:
/// IntegrationPoint constructor for given order.
explicit IntegrationPoint(unsigned /* order */)
{
--
GitLab