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

[PL] removed duplicate ctor param

parent 2b84db3f
No related branches found
No related tags found
No related merge requests found
......@@ -21,8 +21,8 @@ template <typename Data>
GenericNonuniformNaturalBoundaryCondition<BoundaryConditionData,
LocalAssemblerImplementation>::
GenericNonuniformNaturalBoundaryCondition(
bool is_axially_symmetric, unsigned const integration_order,
unsigned const shapefunction_order, unsigned const global_dim,
unsigned const integration_order, unsigned const shapefunction_order,
unsigned const global_dim,
std::unique_ptr<MeshLib::Mesh>&& boundary_mesh, Data&& data)
: _data(std::forward<Data>(data)), _boundary_mesh(std::move(boundary_mesh))
{
......@@ -51,8 +51,8 @@ GenericNonuniformNaturalBoundaryCondition<BoundaryConditionData,
createLocalAssemblers<LocalAssemblerImplementation>(
global_dim, _boundary_mesh->getElements(), *_dof_table_boundary,
shapefunction_order, _local_assemblers, is_axially_symmetric,
integration_order, _data);
shapefunction_order, _local_assemblers,
_boundary_mesh->isAxiallySymmetric(), integration_order, _data);
}
template <typename BoundaryConditionData,
......
......@@ -27,8 +27,8 @@ public:
/// A local DOF-table, a subset of the given one, is constructed.
template <typename Data>
GenericNonuniformNaturalBoundaryCondition(
bool is_axially_symmetric, unsigned const integration_order,
unsigned const shapefunction_order, unsigned const global_dim,
unsigned const integration_order, unsigned const shapefunction_order,
unsigned const global_dim,
std::unique_ptr<MeshLib::Mesh>&& boundary_mesh, Data&& data);
/// Calls local assemblers which calculate their contributions to the global
......
......@@ -28,18 +28,18 @@ createNonuniformNeumannBoundaryCondition(
// TODO handle paths correctly
auto const mesh_file = config.getConfigParameter<std::string>("mesh");
std::unique_ptr<MeshLib::Mesh> surface_mesh(
std::unique_ptr<MeshLib::Mesh> boundary_mesh(
MeshLib::IO::readMeshFromFile(mesh_file));
// Surface mesh and bulk mesh must have equal axial symmetry flags!
surface_mesh->setAxiallySymmetric(bulk_mesh.isAxiallySymmetric());
boundary_mesh->setAxiallySymmetric(bulk_mesh.isAxiallySymmetric());
// TODO add field type?
auto const field_name =
config.getConfigParameter<std::string>("field_name");
auto const* const property =
surface_mesh->getProperties().getPropertyVector<double>(field_name);
boundary_mesh->getProperties().getPropertyVector<double>(field_name);
if (!property)
{
......@@ -61,7 +61,7 @@ createNonuniformNeumannBoundaryCondition(
}
auto const* const mapping_to_bulk_nodes =
surface_mesh->getProperties().getPropertyVector<long>(
boundary_mesh->getProperties().getPropertyVector<long>(
"bulk_mesh_node_ids");
if (!(mapping_to_bulk_nodes &&
......@@ -73,8 +73,8 @@ createNonuniformNeumannBoundaryCondition(
}
return std::make_unique<NonuniformNeumannBoundaryCondition>(
bulk_mesh.isAxiallySymmetric(), integration_order, shapefunction_order,
bulk_mesh.getDimension(), std::move(surface_mesh),
integration_order, shapefunction_order, bulk_mesh.getDimension(),
std::move(boundary_mesh),
NonuniformNeumannBoundaryConditionData{
*property, bulk_mesh.getID(), *mapping_to_bulk_nodes, dof_table,
variable_id, component_id});
......
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