Skip to content
Snippets Groups Projects
Commit 318cdbd1 authored by Norihiro Watanabe's avatar Norihiro Watanabe
Browse files

[PCS/LIE] support the shape function order in BC

parent 45fbe1bd
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ BoundaryConditionBuilder::createNeumannBoundaryCondition( ...@@ -23,6 +23,7 @@ BoundaryConditionBuilder::createNeumannBoundaryCondition(
const BoundaryConditionConfig& config, const BoundaryConditionConfig& config,
const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh, const NumLib::LocalToGlobalIndexMap& dof_table, const MeshLib::Mesh& mesh,
const int variable_id, const unsigned integration_order, const int variable_id, const unsigned integration_order,
const unsigned shapefunction_order,
const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>& parameters, const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>& parameters,
MeshGeoToolsLib::MeshNodeSearcher& /*mesh_node_searcher*/, MeshGeoToolsLib::MeshNodeSearcher& /*mesh_node_searcher*/,
MeshGeoToolsLib::BoundaryElementsSearcher& boundary_element_searcher) MeshGeoToolsLib::BoundaryElementsSearcher& boundary_element_searcher)
...@@ -31,7 +32,7 @@ BoundaryConditionBuilder::createNeumannBoundaryCondition( ...@@ -31,7 +32,7 @@ BoundaryConditionBuilder::createNeumannBoundaryCondition(
config.config, config.config,
getClonedElements(boundary_element_searcher, config.geometry), getClonedElements(boundary_element_searcher, config.geometry),
dof_table, variable_id, config.component_id, dof_table, variable_id, config.component_id,
mesh.isAxiallySymmetric(), integration_order, mesh.getDimension(), mesh.isAxiallySymmetric(), integration_order, shapefunction_order, mesh.getDimension(),
parameters, _fracture_prop); parameters, _fracture_prop);
} }
......
...@@ -45,6 +45,7 @@ private: ...@@ -45,6 +45,7 @@ private:
const NumLib::LocalToGlobalIndexMap& dof_table, const NumLib::LocalToGlobalIndexMap& dof_table,
const MeshLib::Mesh& mesh, const int variable_id, const MeshLib::Mesh& mesh, const int variable_id,
const unsigned integration_order, const unsigned integration_order,
const unsigned shapefunction_order,
const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>& const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>&
parameters, parameters,
MeshGeoToolsLib::MeshNodeSearcher& mesh_node_searcher, MeshGeoToolsLib::MeshNodeSearcher& mesh_node_searcher,
......
...@@ -33,6 +33,7 @@ GenericNaturalBoundaryCondition<BoundaryConditionData, ...@@ -33,6 +33,7 @@ GenericNaturalBoundaryCondition<BoundaryConditionData,
typename std::decay<Data>::type>::value, typename std::decay<Data>::type>::value,
bool>::type is_axially_symmetric, bool>::type is_axially_symmetric,
unsigned const integration_order, unsigned const integration_order,
unsigned const shapefunction_order,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk, NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, int const component_id, int const variable_id, int const component_id,
unsigned const global_dim, unsigned const global_dim,
...@@ -63,7 +64,7 @@ GenericNaturalBoundaryCondition<BoundaryConditionData, ...@@ -63,7 +64,7 @@ GenericNaturalBoundaryCondition<BoundaryConditionData,
variable_id, component_id, std::move(all_mesh_subsets), _elements)); variable_id, component_id, std::move(all_mesh_subsets), _elements));
createLocalAssemblers<LocalAssemblerImplementation>( createLocalAssemblers<LocalAssemblerImplementation>(
global_dim, _elements, *_dof_table_boundary, _local_assemblers, global_dim, _elements, *_dof_table_boundary, shapefunction_order, _local_assemblers,
is_axially_symmetric, _integration_order, _data, fracture_prop, variable_id); is_axially_symmetric, _integration_order, _data, fracture_prop, variable_id);
} }
......
...@@ -37,6 +37,7 @@ public: ...@@ -37,6 +37,7 @@ public:
typename std::decay<Data>::type>::value, typename std::decay<Data>::type>::value,
bool>::type is_axially_symmetric, bool>::type is_axially_symmetric,
unsigned const integration_order, unsigned const integration_order,
unsigned const shapefunction_order,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk, NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, int const component_id, int const variable_id, int const component_id,
unsigned const global_dim, unsigned const global_dim,
......
...@@ -22,13 +22,13 @@ namespace SmallDeformationWithLIE ...@@ -22,13 +22,13 @@ namespace SmallDeformationWithLIE
using NeumannBoundaryCondition = GenericNaturalBoundaryCondition< using NeumannBoundaryCondition = GenericNaturalBoundaryCondition<
Parameter<double> const&, NeumannBoundaryConditionLocalAssembler>; Parameter<double> const&, NeumannBoundaryConditionLocalAssembler>;
std::unique_ptr<BoundaryCondition> std::unique_ptr<BoundaryCondition> createNeumannBoundaryCondition(
createNeumannBoundaryCondition(
BaseLib::ConfigTree const& config, BaseLib::ConfigTree const& config,
std::vector<MeshLib::Element*>&& elements, std::vector<MeshLib::Element*>&& elements,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id, NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
int const component_id, bool is_axially_symmetric, int const component_id, bool is_axially_symmetric,
unsigned const integration_order, unsigned const global_dim, unsigned const integration_order, unsigned const shapefunction_order,
unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters, std::vector<std::unique_ptr<ParameterBase>> const& parameters,
FractureProperty const& fracture_prop) FractureProperty const& fracture_prop)
{ {
...@@ -44,7 +44,7 @@ createNeumannBoundaryCondition( ...@@ -44,7 +44,7 @@ createNeumannBoundaryCondition(
return std::unique_ptr<BoundaryCondition>( return std::unique_ptr<BoundaryCondition>(
new NeumannBoundaryCondition( new NeumannBoundaryCondition(
is_axially_symmetric, integration_order, is_axially_symmetric, integration_order, shapefunction_order,
dof_table, variable_id, component_id, dof_table, variable_id, component_id,
global_dim, std::move(elements), param, fracture_prop)); global_dim, std::move(elements), param, fracture_prop));
} }
......
...@@ -32,7 +32,9 @@ createNeumannBoundaryCondition( ...@@ -32,7 +32,9 @@ createNeumannBoundaryCondition(
std::vector<MeshLib::Element*>&& elements, std::vector<MeshLib::Element*>&& elements,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id, NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
int const component_id, bool is_axially_symmetric, int const component_id, bool is_axially_symmetric,
unsigned const integration_order, unsigned const global_dim, unsigned const integration_order,
unsigned const shapefunction_order,
unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters, std::vector<std::unique_ptr<ParameterBase>> const& parameters,
FractureProperty const& fracture_prop); FractureProperty const& fracture_prop);
......
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