diff --git a/NumLib/Fem/Integration/IntegrationGaussLegendrePrism.h b/NumLib/Fem/Integration/IntegrationGaussLegendrePrism.h index e87e50baead3275754c299f7e6b65b84492e4dca..9dc77292531b5259f61c7201dcc31076ac447328 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 f02fe46e7d853b8d6e9f60c497a2e6f9b1d2d2a3..4e3aee5e1f0791ae3b421bd627e2366eff01986e 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 ab9c7e26bad2a4859c04ee43fff14ade5404b960..1f3f55991b9244624ab1f16a0679ee827578b789 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 2fd50e2457bdda409b7c7e6ff278efc882133bd4..a797e4e7cd70f87dbe88c174112ec18ff4c1ff84 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 f472b1430b7ad87d6d5135e15af02cfcd898e075..3ab76037dceb181b5662ff61b78a5317874c997a 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 fdb72ee33752047b609a03bf8c55ec209a523214..a6cd0f08fbb0f3677ac57de6fcaec99dabc9a882 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 */) {