Merge branch 'fix_warning' into 'master'

A warning fix in NormalTractionBoundaryConditionLocalAssembler

See merge request ogs/ogs!3024

ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp

@@ -123,11 +123,27 @@ std::unique_ptr<BoundaryCondition> createBoundaryCondition(
     }
     if (type == "NormalTraction")
     {
-        return ProcessLib::NormalTractionBoundaryCondition::
-            createNormalTractionBoundaryCondition(
-                config.config, config.boundary_mesh, dof_table, variable_id,
-                integration_order, shapefunction_order,
-                bulk_mesh.getDimension(), parameters);
+        switch (bulk_mesh.getDimension())
+        {
+            case 2:
+                return ProcessLib::NormalTractionBoundaryCondition::
+                    createNormalTractionBoundaryCondition<2>(
+                        config.config, config.boundary_mesh, dof_table,
+                        variable_id, integration_order, shapefunction_order,
+                        parameters);
+            case 3:
+                return ProcessLib::NormalTractionBoundaryCondition::
+                    createNormalTractionBoundaryCondition<3>(
+                        config.config, config.boundary_mesh, dof_table,
+                        variable_id, integration_order, shapefunction_order,
+                        parameters);
+            default:
+                OGS_FATAL(
+                    "NormalTractionBoundaryCondition can not be instantiated "
+                    "for mesh dimensions other than two or three. "
+                    "{}-dimensional mesh was given.",
+                    bulk_mesh.getDimension());
+        }
     }
     if (type == "PhaseFieldIrreversibleDamageOracleBoundaryCondition")
     {

ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition-impl.h

@@ -22,14 +22,13 @@ namespace ProcessLib
 {
 namespace NormalTractionBoundaryCondition
 {
-template <template <typename, typename, unsigned>
-          class LocalAssemblerImplementation>
-NormalTractionBoundaryCondition<LocalAssemblerImplementation>::
+template <int GlobalDim, template <typename, typename, unsigned>
+                         class LocalAssemblerImplementation>
+NormalTractionBoundaryCondition<GlobalDim, LocalAssemblerImplementation>::
     NormalTractionBoundaryCondition(
         unsigned const integration_order, unsigned const shapefunction_order,
         NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
-        int const variable_id, unsigned const global_dim,
-        MeshLib::Mesh const& bc_mesh,
+        int const variable_id, MeshLib::Mesh const& bc_mesh,
         ParameterLib::Parameter<double> const& pressure)
     : _bc_mesh(bc_mesh),
       _integration_order(integration_order),
@@ -53,15 +52,15 @@ NormalTractionBoundaryCondition<LocalAssemblerImplementation>::
     _dof_table_boundary.reset(dof_table_bulk.deriveBoundaryConstrainedMap(
         variable_id, component_ids, std::move(bc_mesh_subset)));
 
-    createLocalAssemblers<LocalAssemblerImplementation>(
-        global_dim, _bc_mesh.getElements(), *_dof_table_boundary,
-        shapefunction_order, _local_assemblers, _bc_mesh.isAxiallySymmetric(),
-        _integration_order, _pressure);
+    createLocalAssemblers<GlobalDim, LocalAssemblerImplementation>(
+        *_dof_table_boundary, shapefunction_order, _bc_mesh.getElements(),
+        _local_assemblers, _bc_mesh.isAxiallySymmetric(), _integration_order,
+        _pressure);
 }
 
-template <template <typename, typename, unsigned>
-          class LocalAssemblerImplementation>
-void NormalTractionBoundaryCondition<LocalAssemblerImplementation>::
+template <int GlobalDim, template <typename, typename, unsigned>
+                         class LocalAssemblerImplementation>
+void NormalTractionBoundaryCondition<GlobalDim, LocalAssemblerImplementation>::
     applyNaturalBC(const double t, std::vector<GlobalVector*> const& x,
                    int const /*process_id*/, GlobalMatrix& K, GlobalVector& b,
                    GlobalMatrix* Jac)
@@ -71,13 +70,13 @@ void NormalTractionBoundaryCondition<LocalAssemblerImplementation>::
         _local_assemblers, *_dof_table_boundary, t, x, K, b, Jac);
 }
 
+template <int GlobalDim>
 std::unique_ptr<NormalTractionBoundaryCondition<
-    NormalTractionBoundaryConditionLocalAssembler>>
+    GlobalDim, NormalTractionBoundaryConditionLocalAssembler>>
 createNormalTractionBoundaryCondition(
     BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
     NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
     unsigned const integration_order, unsigned const shapefunction_order,
-    unsigned const global_dim,
     std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
 {
     DBUG("Constructing NormalTractionBoundaryCondition from config.");
@@ -92,9 +91,9 @@ createNormalTractionBoundaryCondition(
     auto const& pressure = ParameterLib::findParameter<double>(
         parameter_name, parameters, 1, &bc_mesh);
     return std::make_unique<NormalTractionBoundaryCondition<
-        NormalTractionBoundaryConditionLocalAssembler>>(
-        integration_order, shapefunction_order, dof_table, variable_id,
-        global_dim, bc_mesh, pressure);
+        GlobalDim, NormalTractionBoundaryConditionLocalAssembler>>(
+        integration_order, shapefunction_order, dof_table, variable_id, bc_mesh,
+        pressure);
 }
 
 }  // namespace NormalTractionBoundaryCondition

ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition.h

@@ -27,8 +27,8 @@ class NormalTractionBoundaryConditionLocalAssemblerInterface;
 ///      \bar{t} := \sigma \mathbf{n} = p \mathbf{n},
 /// \f]
 /// where \f$p\f$ is the value on the boundary given by the parameter tag.
-template <template <typename, typename, unsigned>
-          class LocalAssemblerImplementation>
+template <int GlobalDim, template <typename, typename, unsigned>
+                         class LocalAssemblerImplementation>
 class NormalTractionBoundaryCondition final : public BoundaryCondition
 {
 public:
@@ -38,8 +38,7 @@ public:
     NormalTractionBoundaryCondition(
         unsigned const integration_order, unsigned const shapefunction_order,
         NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
-        int const variable_id, unsigned const global_dim,
-        MeshLib::Mesh const& bc_mesh,
+        int const variable_id, MeshLib::Mesh const& bc_mesh,
         ParameterLib::Parameter<double> const& pressure);
 
     /// Calls local assemblers which calculate their contributions to the global
@@ -72,13 +71,13 @@ private:
     ParameterLib::Parameter<double> const& _pressure;
 };
 
+template <int GlobalDim>
 std::unique_ptr<NormalTractionBoundaryCondition<
-    NormalTractionBoundaryConditionLocalAssembler>>
+    GlobalDim, NormalTractionBoundaryConditionLocalAssembler>>
 createNormalTractionBoundaryCondition(
     BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
     NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
     unsigned const integration_order, unsigned const shapefunction_order,
-    unsigned const global_dim,
     std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
         parameters);
 

ProcessLib/Utils/CreateLocalAssemblers.h

@@ -21,8 +21,6 @@
 namespace ProcessLib
 {
 
-namespace detail
-{
 template <unsigned GlobalDim, template <typename, typename, unsigned>
                               class LocalAssemblerImplementation,
           typename LocalAssemblerInterface, typename... ExtraCtorArgs>
@@ -33,6 +31,9 @@ void createLocalAssemblers(
     std::vector<std::unique_ptr<LocalAssemblerInterface>>& local_assemblers,
     ExtraCtorArgs&&... extra_ctor_args)
 {
+    static_assert(
+        GlobalDim == 1 || GlobalDim == 2 || GlobalDim == 3,
+        "Meshes with dimension greater than three are not supported.");
     // Shape matrices initializer
     using LocalDataInitializer =
         LocalDataInitializer<LocalAssemblerInterface,
@@ -51,8 +52,6 @@ void createLocalAssemblers(
         std::forward<ExtraCtorArgs>(extra_ctor_args)...);
 }
 
-}  // namespace detail
-
 /*! Creates local assemblers for each element of the given \c mesh.
  *
  * \tparam LocalAssemblerImplementation the individual local assembler type
@@ -80,17 +79,17 @@ void createLocalAssemblers(
     switch (dimension)
     {
         case 1:
-            detail::createLocalAssemblers<1, LocalAssemblerImplementation>(
+            createLocalAssemblers<1, LocalAssemblerImplementation>(
                 dof_table, shapefunction_order, mesh_elements, local_assemblers,
                 std::forward<ExtraCtorArgs>(extra_ctor_args)...);
             break;
         case 2:
-            detail::createLocalAssemblers<2, LocalAssemblerImplementation>(
+            createLocalAssemblers<2, LocalAssemblerImplementation>(
                 dof_table, shapefunction_order, mesh_elements, local_assemblers,
                 std::forward<ExtraCtorArgs>(extra_ctor_args)...);
             break;
         case 3:
-            detail::createLocalAssemblers<3, LocalAssemblerImplementation>(
+            createLocalAssemblers<3, LocalAssemblerImplementation>(
                 dof_table, shapefunction_order, mesh_elements, local_assemblers,
                 std::forward<ExtraCtorArgs>(extra_ctor_args)...);
             break;