Skip to content
Snippets Groups Projects
Commit 52d73400 authored by Christoph Lehmann's avatar Christoph Lehmann
Browse files

[PL] SD, Utils: Renaming local data initializer -> local asm factory

parent 7ba2e416
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@
#include "BaseLib/Logging.h"
#include "NumLib/DOF/LocalToGlobalIndexMap.h"
#include "ProcessLib/Utils/LocalDataInitializerForDimGeN.h"
#include "ProcessLib/Utils/LocalAssemblerFactoryForDimGeN.h"
namespace ProcessLib
{
......@@ -30,21 +30,19 @@ void createLocalAssemblers(
std::vector<std::unique_ptr<LocalAssemblerInterface>>& local_assemblers,
ExtraCtorArgs&&... extra_ctor_args)
{
// Shape matrices initializer
using LocalDataInitializer =
ProcessLib::LocalDataInitializerSD<LocalAssemblerInterface,
using LocAsmFactory =
ProcessLib::LocalAssemberFactorySD<LocalAssemblerInterface,
LocalAssemblerImplementation,
GlobalDim, ExtraCtorArgs...>;
DBUG("Create local assemblers.");
// Populate the vector of local assemblers.
local_assemblers.resize(mesh_elements.size());
LocalDataInitializer initializer(dof_table);
LocAsmFactory factory(dof_table);
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)...);
}
......
......@@ -12,7 +12,7 @@
#include <vector>
#include "BaseLib/Logging.h"
#include "LocalDataInitializerForDimGeN.h"
#include "LocalAssemblerFactoryForDimGeN.h"
#include "NumLib/DOF/LocalToGlobalIndexMap.h"
namespace ProcessLib
......@@ -29,21 +29,19 @@ 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 LocAsmFactory = LocalAssemberFactory<LocalAssemblerInterface,
LocalAssemblerImplementation,
GlobalDim, ExtraCtorArgs...>;
DBUG("Create local assemblers.");
// Populate the vector of local assemblers.
local_assemblers.resize(mesh_elements.size());
LocalDataInitializer initializer(dof_table);
LocAsmFactory factory(dof_table);
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)...);
}
......
......@@ -21,7 +21,7 @@ template <int MinElementDim,
class LocalAssemblerImplementation,
int GlobalDim,
typename... ConstructorArgs>
class LocalDataInitializerForDimGeN final
class LocalAssemberFactoryForDimGeN final
: public GenericLocalAssemblerFactory<LocalAssemblerInterface,
ConstructorArgs...>
{
......@@ -43,7 +43,7 @@ class LocalDataInitializerForDimGeN final
};
public:
explicit LocalDataInitializerForDimGeN(
explicit LocalAssemberFactoryForDimGeN(
NumLib::LocalToGlobalIndexMap const& dof_table)
: Base{dof_table}
{
......@@ -72,8 +72,8 @@ template <typename LocalAssemblerInterface,
class LocalAssemblerImplementation,
int GlobalDim,
typename... ConstructorArgs>
using LocalDataInitializer =
LocalDataInitializerForDimGeN<1,
using LocalAssemberFactory =
LocalAssemberFactoryForDimGeN<1,
LocalAssemblerInterface,
LocalAssemblerImplementation,
GlobalDim,
......@@ -85,8 +85,8 @@ template <typename LocalAssemblerInterface,
class LocalAssemblerImplementation,
int GlobalDim,
typename... ConstructorArgs>
using LocalDataInitializerSD =
LocalDataInitializerForDimGeN<2,
using LocalAssemberFactorySD =
LocalAssemberFactoryForDimGeN<2,
LocalAssemblerInterface,
LocalAssemblerImplementation,
GlobalDim,
......
......@@ -24,7 +24,6 @@
#include "NumLib/Function/Interpolation.h"
#include "NumLib/NumericsConfig.h"
#include "ProcessLib/Utils/CreateLocalAssemblers.h"
#include "ProcessLib/Utils/LocalDataInitializerForDimGeN.h"
#include "Tests/VectorUtils.h"
namespace ExtrapolationTest
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment