Skip to content
Snippets Groups Projects
Commit 2ac977dd authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Remove name field from FixedBoundaryConditionDescriptor and plug it

parent 073fda6c
No related branches found
No related tags found
1 merge request!96Add random number engine encapsulation.
...@@ -191,6 +191,18 @@ SchemeModule::SchemeModule() ...@@ -191,6 +191,18 @@ SchemeModule::SchemeModule()
)); ));
this
->_addBuiltinFunction("fixed",
std::make_shared<BuiltinFunctionEmbedder<std::shared_ptr<const IBoundaryConditionDescriptor>(
std::shared_ptr<const IBoundaryDescriptor>)>>(
[](std::shared_ptr<const IBoundaryDescriptor> boundary)
-> std::shared_ptr<const IBoundaryConditionDescriptor> {
return std::make_shared<FixedBoundaryConditionDescriptor>(boundary);
}
));
this this
->_addBuiltinFunction("symmetry", ->_addBuiltinFunction("symmetry",
std::make_shared<BuiltinFunctionEmbedder<std::shared_ptr<const IBoundaryConditionDescriptor>( std::make_shared<BuiltinFunctionEmbedder<std::shared_ptr<const IBoundaryConditionDescriptor>(
......
...@@ -13,7 +13,7 @@ class FixedBoundaryConditionDescriptor : public IBoundaryConditionDescriptor ...@@ -13,7 +13,7 @@ class FixedBoundaryConditionDescriptor : public IBoundaryConditionDescriptor
std::ostream& std::ostream&
_write(std::ostream& os) const final _write(std::ostream& os) const final
{ {
os << "fixed(" << m_name << ',' << *m_boundary_descriptor << ")"; os << "fixed(" << *m_boundary_descriptor << ")";
return os; return os;
} }
...@@ -22,12 +22,6 @@ class FixedBoundaryConditionDescriptor : public IBoundaryConditionDescriptor ...@@ -22,12 +22,6 @@ class FixedBoundaryConditionDescriptor : public IBoundaryConditionDescriptor
std::shared_ptr<const IBoundaryDescriptor> m_boundary_descriptor; std::shared_ptr<const IBoundaryDescriptor> m_boundary_descriptor;
public: public:
std::string_view
name() const
{
return m_name;
}
const IBoundaryDescriptor& const IBoundaryDescriptor&
boundaryDescriptor() const boundaryDescriptor() const
{ {
...@@ -40,12 +34,9 @@ class FixedBoundaryConditionDescriptor : public IBoundaryConditionDescriptor ...@@ -40,12 +34,9 @@ class FixedBoundaryConditionDescriptor : public IBoundaryConditionDescriptor
return Type::fixed; return Type::fixed;
} }
FixedBoundaryConditionDescriptor(const std::string_view name, FixedBoundaryConditionDescriptor(std::shared_ptr<const IBoundaryDescriptor> boundary_descriptor)
std::shared_ptr<const IBoundaryDescriptor> boundary_descriptor) : m_boundary_descriptor(boundary_descriptor)
: m_name{name}, m_boundary_descriptor(boundary_descriptor) {}
{
;
}
FixedBoundaryConditionDescriptor(const FixedBoundaryConditionDescriptor&) = delete; FixedBoundaryConditionDescriptor(const FixedBoundaryConditionDescriptor&) = delete;
FixedBoundaryConditionDescriptor(FixedBoundaryConditionDescriptor&&) = delete; FixedBoundaryConditionDescriptor(FixedBoundaryConditionDescriptor&&) = delete;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment