diff --git a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h index a2673341111a764660ac9e11e331bc175b263ec0..ec42e64d4c8c1fd01ff14db5fb26ea80aa299926 100644 --- a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h +++ b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h @@ -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, diff --git a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h index be3a369e444c8bd07f99854e298509662f485c9e..56e2017f4b45c3fe57132b1bcd28f0ed57217ccb 100644 --- a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h +++ b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h @@ -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 diff --git a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp index 64a584bc7f2aa1774fbfc77a83745d6bec1896c8..6cc6227d4546efc93b593ef8553d0f2c47c49341 100644 --- a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp +++ b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp @@ -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});