From 0ca0b9b57c26705f9f9a72796d797756a66f0e9a Mon Sep 17 00:00:00 2001 From: Christoph Lehmann <christoph.lehmann@ufz.de> Date: Thu, 16 Dec 2021 07:52:32 +0100 Subject: [PATCH] [PL] Gave two classes more descriptive names --- .../Utils/LocalAssemblerFactoryForDimGeN.h | 31 ++++++++++++------- ...calAssemblerFactoryTaylorHoodForOrderGeN.h | 26 +++++++++------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/ProcessLib/Utils/LocalAssemblerFactoryForDimGeN.h b/ProcessLib/Utils/LocalAssemblerFactoryForDimGeN.h index f77f7164d15..3778e37b517 100644 --- a/ProcessLib/Utils/LocalAssemblerFactoryForDimGeN.h +++ b/ProcessLib/Utils/LocalAssemblerFactoryForDimGeN.h @@ -15,13 +15,20 @@ namespace ProcessLib { +/** + * Creates local assemblers for mesh elements with dimension greater than or + * equal to \c MinElementDim. + * + * This local assembler factory supports a single type of shape functions, i.e., + * all primary variables are discretized with the same shape function. + */ template <int MinElementDim, typename LocalAssemblerInterface, template <typename, typename, int> class LocalAssemblerImplementation, int GlobalDim, typename... ConstructorArgs> -class LocalAssemberFactoryForDimGeN final +class LocalAssemblerFactoryForDimGreaterEqualN final : public GenericLocalAssemblerFactory<LocalAssemblerInterface, ConstructorArgs...> { @@ -43,7 +50,7 @@ class LocalAssemberFactoryForDimGeN final }; public: - explicit LocalAssemberFactoryForDimGeN( + explicit LocalAssemblerFactoryForDimGreaterEqualN( NumLib::LocalToGlobalIndexMap const& dof_table) : Base{dof_table} { @@ -73,11 +80,11 @@ template <typename LocalAssemblerInterface, int GlobalDim, typename... ConstructorArgs> using LocalAssemberFactory = - LocalAssemberFactoryForDimGeN<1, - LocalAssemblerInterface, - LocalAssemblerImplementation, - GlobalDim, - ConstructorArgs...>; + LocalAssemblerFactoryForDimGreaterEqualN<1, + LocalAssemblerInterface, + LocalAssemblerImplementation, + GlobalDim, + ConstructorArgs...>; /// Mechanics processes in OGS are defined in 2D and 3D only. template <typename LocalAssemblerInterface, @@ -86,9 +93,9 @@ template <typename LocalAssemblerInterface, int GlobalDim, typename... ConstructorArgs> using LocalAssemberFactorySD = - LocalAssemberFactoryForDimGeN<2, - LocalAssemblerInterface, - LocalAssemblerImplementation, - GlobalDim, - ConstructorArgs...>; + LocalAssemblerFactoryForDimGreaterEqualN<2, + LocalAssemblerInterface, + LocalAssemblerImplementation, + GlobalDim, + ConstructorArgs...>; } // namespace ProcessLib diff --git a/ProcessLib/Utils/LocalAssemblerFactoryTaylorHoodForOrderGeN.h b/ProcessLib/Utils/LocalAssemblerFactoryTaylorHoodForOrderGeN.h index 148e69c1a58..d3ca34e531b 100644 --- a/ProcessLib/Utils/LocalAssemblerFactoryTaylorHoodForOrderGeN.h +++ b/ProcessLib/Utils/LocalAssemblerFactoryTaylorHoodForOrderGeN.h @@ -77,7 +77,7 @@ template <int MinShapeFctOrder, class LocalAssemblerImplementation, int GlobalDim, typename... ConstructorArgs> -class LocalAssemblerFactoryTaylorHoodForOrderGeN final +class LocalAssemblerFactoryTaylorHoodForOrderGreaterEqualN final : public ProcessLib::GenericLocalAssemblerFactory<LocalAssemblerInterface, ConstructorArgs...> { @@ -115,7 +115,7 @@ class LocalAssemblerFactoryTaylorHoodForOrderGeN final }; public: - explicit LocalAssemblerFactoryTaylorHoodForOrderGeN( + explicit LocalAssemblerFactoryTaylorHoodForOrderGreaterEqualN( NumLib::LocalToGlobalIndexMap const& dof_table) : Base(dof_table) { @@ -150,11 +150,12 @@ template <typename LocalAssemblerInterface, int GlobalDim, typename... ConstructorArgs> using LocalAssemblerFactoryHM = - LocalAssemblerFactoryTaylorHoodForOrderGeN<1, - LocalAssemblerInterface, - LocalAssemblerImplementation, - GlobalDim, - ConstructorArgs...>; + LocalAssemblerFactoryTaylorHoodForOrderGreaterEqualN< + 1, + LocalAssemblerInterface, + LocalAssemblerImplementation, + GlobalDim, + ConstructorArgs...>; /// Stokes flow in OGS is defined for higher order elements only. template <typename LocalAssemblerInterface, @@ -163,10 +164,11 @@ template <typename LocalAssemblerInterface, int GlobalDim, typename... ConstructorArgs> using LocalAssemblerFactoryStokes = - LocalAssemblerFactoryTaylorHoodForOrderGeN<2, - LocalAssemblerInterface, - LocalAssemblerImplementation, - GlobalDim, - ConstructorArgs...>; + LocalAssemblerFactoryTaylorHoodForOrderGreaterEqualN< + 2, + LocalAssemblerInterface, + LocalAssemblerImplementation, + GlobalDim, + ConstructorArgs...>; } // namespace ProcessLib -- GitLab