[PL] BCs, HM, Utils: Renamed local data initializer -> local asm factory

ProcessLib/BoundaryConditionAndSourceTerm/Utils/CreateLocalAssemblers.h

@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "BaseLib/Logging.h"
-#include "LocalDataInitializer.h"
+#include "LocalAssemblerFactory.h"
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
 namespace ProcessLib
@@ -34,21 +34,20 @@ void createLocalAssemblers(
     static_assert(
         GlobalDim == 1 || GlobalDim == 2 || GlobalDim == 3,
         "Meshes with dimension greater than three are not supported.");
-    // Shape matrices initializer
-    using LocalDataInitializer =
-        LocalDataInitializer<LocalAssemblerInterface,
-                             LocalAssemblerImplementation, GlobalDim,
-                             ExtraCtorArgs...>;
+
+    using LocalAssemblerFactory =
+        LocalAssemblerFactory<LocalAssemblerInterface,
+                              LocalAssemblerImplementation, GlobalDim,
+                              ExtraCtorArgs...>;
 
     DBUG("Create local assemblers.");
-    // Populate the vector of local assemblers.
-    local_assemblers.resize(mesh_elements.size());
 
-    LocalDataInitializer initializer(dof_table, shapefunction_order);
+    LocalAssemblerFactory factory(dof_table, shapefunction_order);
+    local_assemblers.resize(mesh_elements.size());
 
     DBUG("Calling local assembler builder for all mesh elements.");
     GlobalExecutor::transformDereferenced(
-        initializer, mesh_elements, local_assemblers,
+        factory, mesh_elements, local_assemblers,
         std::forward<ExtraCtorArgs>(extra_ctor_args)...);
 }
 }  // namespace detail

ProcessLib/BoundaryConditionAndSourceTerm/Utils/LocalDataInitializer.h → ProcessLib/BoundaryConditionAndSourceTerm/Utils/LocalAssemblerFactory.h

@@ -11,7 +11,7 @@
 #pragma once
 
 #include "ProcessLib/Utils/EnabledElements.h"
-#include "ProcessLib/Utils/GenericLocalDataInitializer.h"
+#include "ProcessLib/Utils/GenericLocalAssemblerFactory.h"
 
 namespace ProcessLib
 {
@@ -22,13 +22,13 @@ template <typename LocalAssemblerInterface,
           class LocalAssemblerImplementation,
           int GlobalDim,
           typename... ConstructorArgs>
-class LocalDataInitializer final
-    : public ProcessLib::GenericLocalDataInitializer<LocalAssemblerInterface,
-                                                     ConstructorArgs...>
+class LocalAssemblerFactory final
+    : public ProcessLib::GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                                      ConstructorArgs...>
 {
     using Base =
-        ProcessLib::GenericLocalDataInitializer<LocalAssemblerInterface,
-                                                ConstructorArgs...>;
+        ProcessLib::GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                                 ConstructorArgs...>;
 
     template <typename ShapeFunction>
     using LocAsmBuilderFactory =
@@ -64,8 +64,8 @@ class LocalDataInitializer final
     };
 
 public:
-    LocalDataInitializer(NumLib::LocalToGlobalIndexMap const& dof_table,
-                         const unsigned shapefunction_order)
+    LocalAssemblerFactory(NumLib::LocalToGlobalIndexMap const& dof_table,
+                          const unsigned shapefunction_order)
         : Base(dof_table)
     {
         if (shapefunction_order < 1 || 2 < shapefunction_order)

ProcessLib/HydroMechanics/CreateLocalAssemblers.h

@@ -36,10 +36,9 @@ void createLocalAssemblers(
                                                   GlobalDim, ExtraCtorArgs...>;
 
     DBUG("Create local assemblers.");
-    // Populate the vector of local assemblers.
-    local_assemblers.resize(mesh_elements.size());
 
     LocAsmFactory factory(dof_table);
+    local_assemblers.resize(mesh_elements.size());
 
     DBUG("Calling local assembler builder for all mesh elements.");
     GlobalExecutor::transformDereferenced(

ProcessLib/Utils/GenericLocalDataInitializer.h → ProcessLib/Utils/GenericLocalAssemblerFactory.h

@@ -23,7 +23,7 @@ namespace ProcessLib
 /// A functor creating a local assembler with shape functions corresponding to
 /// the mesh element type.
 template <typename LocalAssemblerInterface, typename... ConstructorArgs>
-struct GenericLocalDataInitializer
+struct GenericLocalAssemblerFactory
 {
     using LocAsmIntfPtr = std::unique_ptr<LocalAssemblerInterface>;
     using LocAsmBuilder =
@@ -32,7 +32,7 @@ struct GenericLocalDataInitializer
                                     ConstructorArgs&&...)>;
 
 protected:  // only allow instances of subclasses
-    explicit GenericLocalDataInitializer(
+    explicit GenericLocalAssemblerFactory(
         NumLib::LocalToGlobalIndexMap const& dof_table)
         : _dof_table(dof_table)
     {
@@ -81,8 +81,8 @@ template <typename ShapeFunction, typename LocalAssemblerInterface,
           int GlobalDim, typename... ConstructorArgs>
 class LocalAssemblerBuilderFactory
 {
-    using GLDI = GenericLocalDataInitializer<LocalAssemblerInterface,
-                                             ConstructorArgs...>;
+    using GLDI = GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                              ConstructorArgs...>;
     using LocAsmIntfPtr = typename GLDI::LocAsmIntfPtr;
     using LocAsmBuilder = typename GLDI::LocAsmBuilder;
 

ProcessLib/Utils/LocalAssemblerFactoryTaylorHoodForOrderGeN.h

@@ -11,7 +11,7 @@
 #pragma once
 
 #include "EnabledElements.h"
-#include "GenericLocalDataInitializer.h"
+#include "GenericLocalAssemblerFactory.h"
 
 namespace ProcessLib
 {
@@ -27,10 +27,10 @@ template <typename ShapeFunction,
           typename... ConstructorArgs>
 class LocalAssemblerBuilderFactoryTaylorHood
 {
-    using GLDI = GenericLocalDataInitializer<LocalAssemblerInterface,
-                                             ConstructorArgs...>;
-    using LocAsmIntfPtr = typename GLDI::LocAsmIntfPtr;
-    using LocAsmBuilder = typename GLDI::LocAsmBuilder;
+    using GLAF = GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                              ConstructorArgs...>;
+    using LocAsmIntfPtr = typename GLAF::LocAsmIntfPtr;
+    using LocAsmBuilder = typename GLAF::LocAsmBuilder;
 
     using IntegrationMethod = typename NumLib::GaussLegendreIntegrationPolicy<
         typename ShapeFunction::MeshElement>::IntegrationMethod;
@@ -78,12 +78,12 @@ template <int MinShapeFctOrder,
           int GlobalDim,
           typename... ConstructorArgs>
 class LocalAssemblerFactoryTaylorHoodForOrderGeN final
-    : public ProcessLib::GenericLocalDataInitializer<LocalAssemblerInterface,
-                                                     ConstructorArgs...>
+    : public ProcessLib::GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                                      ConstructorArgs...>
 {
     using Base =
-        ProcessLib::GenericLocalDataInitializer<LocalAssemblerInterface,
-                                                ConstructorArgs...>;
+        ProcessLib::GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                                 ConstructorArgs...>;
 
     template <typename ShapeFunction, typename LowerOrderShapeFunction>
     using LocAsmBuilderFactory =

ProcessLib/Utils/LocalDataInitializerForDimGeN.h

@@ -11,7 +11,7 @@
 #pragma once
 
 #include "EnabledElements.h"
-#include "GenericLocalDataInitializer.h"
+#include "GenericLocalAssemblerFactory.h"
 
 namespace ProcessLib
 {
@@ -22,11 +22,11 @@ template <int MinElementDim,
           int GlobalDim,
           typename... ConstructorArgs>
 class LocalDataInitializerForDimGeN final
-    : public GenericLocalDataInitializer<LocalAssemblerInterface,
-                                         ConstructorArgs...>
+    : public GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                          ConstructorArgs...>
 {
-    using Base = GenericLocalDataInitializer<LocalAssemblerInterface,
-                                             ConstructorArgs...>;
+    using Base = GenericLocalAssemblerFactory<LocalAssemblerInterface,
+                                              ConstructorArgs...>;
 
     struct IsElementEnabled
     {