From 6fb613dae39969fd2d8c3cdf7713d1fcefa45146 Mon Sep 17 00:00:00 2001 From: Kwabena N Amponsah Date: Tue, 12 Mar 2024 20:01:54 +0000 Subject: [PATCH] #62 Remove non-standard MutableElement wrappers --- dynamic/wrapper_generators/package_info.yaml | 3 - .../wrappers/mesh/MutableElement1_2.cppwg.cpp | 132 ------------------ .../wrappers/mesh/MutableElement1_2.cppwg.hpp | 6 - .../wrappers/mesh/MutableElement2_3.cppwg.cpp | 132 ------------------ .../wrappers/mesh/MutableElement2_3.cppwg.hpp | 6 - dynamic/wrappers/mesh/mesh.main.cpp | 4 - .../wrappers/wrapper_header_collection.hpp | 4 - 7 files changed, 287 deletions(-) delete mode 100644 dynamic/wrappers/mesh/MutableElement1_2.cppwg.cpp delete mode 100644 dynamic/wrappers/mesh/MutableElement1_2.cppwg.hpp delete mode 100644 dynamic/wrappers/mesh/MutableElement2_3.cppwg.cpp delete mode 100644 dynamic/wrappers/mesh/MutableElement2_3.cppwg.hpp diff --git a/dynamic/wrapper_generators/package_info.yaml b/dynamic/wrapper_generators/package_info.yaml index 6cf12ef7..9fa750b4 100644 --- a/dynamic/wrapper_generators/package_info.yaml +++ b/dynamic/wrapper_generators/package_info.yaml @@ -126,9 +126,6 @@ modules: - signature: replacement: [[1, 2], [2, 2], [2, 3], [3, 3]] - name: MutableElement - template_substitutions: - - signature: - replacement: [[1, 2], [2, 2], [2, 3], [3, 3]] - name: NodesOnlyMesh - name: PottsElement - name: PottsMesh diff --git a/dynamic/wrappers/mesh/MutableElement1_2.cppwg.cpp b/dynamic/wrappers/mesh/MutableElement1_2.cppwg.cpp deleted file mode 100644 index 01e9c8bd..00000000 --- a/dynamic/wrappers/mesh/MutableElement1_2.cppwg.cpp +++ /dev/null @@ -1,132 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "SmartPointers.hpp" -#include "UblasIncludes.hpp" -#include "MutableElement.hpp" - -#include "MutableElement1_2.cppwg.hpp" - -namespace py = pybind11; -typedef MutableElement<1,2 > MutableElement1_2; -PYBIND11_DECLARE_HOLDER_TYPE(T, boost::shared_ptr); - -class MutableElement1_2_Overloads : public MutableElement1_2{ - public: - using MutableElement1_2::MutableElement; - void RegisterWithNodes() override { - PYBIND11_OVERRIDE( - void, - MutableElement1_2, - RegisterWithNodes, - ); - } - void MarkAsDeleted() override { - PYBIND11_OVERRIDE( - void, - MutableElement1_2, - MarkAsDeleted, - ); - } - void UpdateNode(unsigned int const & rIndex, ::Node<2> * pNode) override { - PYBIND11_OVERRIDE( - void, - MutableElement1_2, - UpdateNode, - rIndex, -pNode); - } - bool IsElementOnBoundary() const override { - PYBIND11_OVERRIDE( - bool, - MutableElement1_2, - IsElementOnBoundary, - ); - } - -}; -void register_MutableElement1_2_class(py::module &m){ -py::class_ , AbstractElement<1, 2> >(m, "MutableElement1_2") - .def(py::init(), py::arg("index")) - .def(py::init *> const & >(), py::arg("index"), py::arg("rNodes")) - .def( - "RegisterWithNodes", - (void(MutableElement1_2::*)()) &MutableElement1_2::RegisterWithNodes, - " " ) - .def( - "MarkAsDeleted", - (void(MutableElement1_2::*)()) &MutableElement1_2::MarkAsDeleted, - " " ) - .def( - "ResetIndex", - (void(MutableElement1_2::*)(unsigned int)) &MutableElement1_2::ResetIndex, - " " , py::arg("index") ) - .def( - "UpdateNode", - (void(MutableElement1_2::*)(unsigned int const &, ::Node<2> *)) &MutableElement1_2::UpdateNode, - " " , py::arg("rIndex"), py::arg("pNode") ) - .def( - "DeleteNode", - (void(MutableElement1_2::*)(unsigned int const &)) &MutableElement1_2::DeleteNode, - " " , py::arg("rIndex") ) - .def( - "AddNode", - (void(MutableElement1_2::*)(::Node<2> *, unsigned int const &)) &MutableElement1_2::AddNode, - " " , py::arg("pNode"), py::arg("rIndex") ) - .def( - "GetNodeLocalIndex", - (unsigned int(MutableElement1_2::*)(unsigned int) const ) &MutableElement1_2::GetNodeLocalIndex, - " " , py::arg("globalIndex") ) - .def( - "RegisterWithEdges", - (void(MutableElement1_2::*)()) &MutableElement1_2::RegisterWithEdges, - " " ) - .def( - "RebuildEdges", - (void(MutableElement1_2::*)()) &MutableElement1_2::RebuildEdges, - " " ) - .def( - "IsElementOnBoundary", - (bool(MutableElement1_2::*)() const ) &MutableElement1_2::IsElementOnBoundary, - " " ) - .def( - "SetEdgeHelper", - (void(MutableElement1_2::*)(::EdgeHelper<2> *)) &MutableElement1_2::SetEdgeHelper, - " " , py::arg("pEdgeHelper") ) - .def( - "ClearEdges", - (void(MutableElement1_2::*)()) &MutableElement1_2::ClearEdges, - " " ) - .def( - "BuildEdges", - (void(MutableElement1_2::*)()) &MutableElement1_2::BuildEdges, - " " ) - .def( - "GetEdgeGlobalIndex", - (unsigned int(MutableElement1_2::*)(unsigned int) const ) &MutableElement1_2::GetEdgeGlobalIndex, - " " , py::arg("localIndex") ) - .def( - "GetEdge", - (::Edge<2> *(MutableElement1_2::*)(unsigned int) const ) &MutableElement1_2::GetEdge, - " " , py::arg("localIndex") , py::return_value_policy::reference) - .def( - "GetNumEdges", - (unsigned int(MutableElement1_2::*)() const ) &MutableElement1_2::GetNumEdges, - " " ) - .def( - "GetNeighbouringElementAtEdgeIndex", - (::std::set(MutableElement1_2::*)(unsigned int)) &MutableElement1_2::GetNeighbouringElementAtEdgeIndex, - " " , py::arg("localIndex") ) - .def( - "ContainsEdge", - (bool(MutableElement1_2::*)(::Edge<2> const *) const ) &MutableElement1_2::ContainsEdge, - " " , py::arg("pEdge") ) - .def( - "GetLocalEdgeIndex", - (long int(MutableElement1_2::*)(::Edge<2> const *) const ) &MutableElement1_2::GetLocalEdgeIndex, - " " , py::arg("pEdge") ) - ; -} diff --git a/dynamic/wrappers/mesh/MutableElement1_2.cppwg.hpp b/dynamic/wrappers/mesh/MutableElement1_2.cppwg.hpp deleted file mode 100644 index 9736fd4a..00000000 --- a/dynamic/wrappers/mesh/MutableElement1_2.cppwg.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MutableElement1_2_hpp__pyplusplus_wrapper -#define MutableElement1_2_hpp__pyplusplus_wrapper - -namespace py = pybind11; -void register_MutableElement1_2_class(py::module &m); -#endif // MutableElement1_2_hpp__pyplusplus_wrapper diff --git a/dynamic/wrappers/mesh/MutableElement2_3.cppwg.cpp b/dynamic/wrappers/mesh/MutableElement2_3.cppwg.cpp deleted file mode 100644 index 38fcd9b0..00000000 --- a/dynamic/wrappers/mesh/MutableElement2_3.cppwg.cpp +++ /dev/null @@ -1,132 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "SmartPointers.hpp" -#include "UblasIncludes.hpp" -#include "MutableElement.hpp" - -#include "MutableElement2_3.cppwg.hpp" - -namespace py = pybind11; -typedef MutableElement<2,3 > MutableElement2_3; -PYBIND11_DECLARE_HOLDER_TYPE(T, boost::shared_ptr); - -class MutableElement2_3_Overloads : public MutableElement2_3{ - public: - using MutableElement2_3::MutableElement; - void RegisterWithNodes() override { - PYBIND11_OVERRIDE( - void, - MutableElement2_3, - RegisterWithNodes, - ); - } - void MarkAsDeleted() override { - PYBIND11_OVERRIDE( - void, - MutableElement2_3, - MarkAsDeleted, - ); - } - void UpdateNode(unsigned int const & rIndex, ::Node<3> * pNode) override { - PYBIND11_OVERRIDE( - void, - MutableElement2_3, - UpdateNode, - rIndex, -pNode); - } - bool IsElementOnBoundary() const override { - PYBIND11_OVERRIDE( - bool, - MutableElement2_3, - IsElementOnBoundary, - ); - } - -}; -void register_MutableElement2_3_class(py::module &m){ -py::class_ , AbstractElement<2, 3> >(m, "MutableElement2_3") - .def(py::init(), py::arg("index")) - .def(py::init *> const & >(), py::arg("index"), py::arg("rNodes")) - .def( - "RegisterWithNodes", - (void(MutableElement2_3::*)()) &MutableElement2_3::RegisterWithNodes, - " " ) - .def( - "MarkAsDeleted", - (void(MutableElement2_3::*)()) &MutableElement2_3::MarkAsDeleted, - " " ) - .def( - "ResetIndex", - (void(MutableElement2_3::*)(unsigned int)) &MutableElement2_3::ResetIndex, - " " , py::arg("index") ) - .def( - "UpdateNode", - (void(MutableElement2_3::*)(unsigned int const &, ::Node<3> *)) &MutableElement2_3::UpdateNode, - " " , py::arg("rIndex"), py::arg("pNode") ) - .def( - "DeleteNode", - (void(MutableElement2_3::*)(unsigned int const &)) &MutableElement2_3::DeleteNode, - " " , py::arg("rIndex") ) - .def( - "AddNode", - (void(MutableElement2_3::*)(::Node<3> *, unsigned int const &)) &MutableElement2_3::AddNode, - " " , py::arg("pNode"), py::arg("rIndex") ) - .def( - "GetNodeLocalIndex", - (unsigned int(MutableElement2_3::*)(unsigned int) const ) &MutableElement2_3::GetNodeLocalIndex, - " " , py::arg("globalIndex") ) - .def( - "RegisterWithEdges", - (void(MutableElement2_3::*)()) &MutableElement2_3::RegisterWithEdges, - " " ) - .def( - "RebuildEdges", - (void(MutableElement2_3::*)()) &MutableElement2_3::RebuildEdges, - " " ) - .def( - "IsElementOnBoundary", - (bool(MutableElement2_3::*)() const ) &MutableElement2_3::IsElementOnBoundary, - " " ) - .def( - "SetEdgeHelper", - (void(MutableElement2_3::*)(::EdgeHelper<3> *)) &MutableElement2_3::SetEdgeHelper, - " " , py::arg("pEdgeHelper") ) - .def( - "ClearEdges", - (void(MutableElement2_3::*)()) &MutableElement2_3::ClearEdges, - " " ) - .def( - "BuildEdges", - (void(MutableElement2_3::*)()) &MutableElement2_3::BuildEdges, - " " ) - .def( - "GetEdgeGlobalIndex", - (unsigned int(MutableElement2_3::*)(unsigned int) const ) &MutableElement2_3::GetEdgeGlobalIndex, - " " , py::arg("localIndex") ) - .def( - "GetEdge", - (::Edge<3> *(MutableElement2_3::*)(unsigned int) const ) &MutableElement2_3::GetEdge, - " " , py::arg("localIndex") , py::return_value_policy::reference) - .def( - "GetNumEdges", - (unsigned int(MutableElement2_3::*)() const ) &MutableElement2_3::GetNumEdges, - " " ) - .def( - "GetNeighbouringElementAtEdgeIndex", - (::std::set(MutableElement2_3::*)(unsigned int)) &MutableElement2_3::GetNeighbouringElementAtEdgeIndex, - " " , py::arg("localIndex") ) - .def( - "ContainsEdge", - (bool(MutableElement2_3::*)(::Edge<3> const *) const ) &MutableElement2_3::ContainsEdge, - " " , py::arg("pEdge") ) - .def( - "GetLocalEdgeIndex", - (long int(MutableElement2_3::*)(::Edge<3> const *) const ) &MutableElement2_3::GetLocalEdgeIndex, - " " , py::arg("pEdge") ) - ; -} diff --git a/dynamic/wrappers/mesh/MutableElement2_3.cppwg.hpp b/dynamic/wrappers/mesh/MutableElement2_3.cppwg.hpp deleted file mode 100644 index 32a874a4..00000000 --- a/dynamic/wrappers/mesh/MutableElement2_3.cppwg.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MutableElement2_3_hpp__pyplusplus_wrapper -#define MutableElement2_3_hpp__pyplusplus_wrapper - -namespace py = pybind11; -void register_MutableElement2_3_class(py::module &m); -#endif // MutableElement2_3_hpp__pyplusplus_wrapper diff --git a/dynamic/wrappers/mesh/mesh.main.cpp b/dynamic/wrappers/mesh/mesh.main.cpp index 235e7531..2200a25e 100644 --- a/dynamic/wrappers/mesh/mesh.main.cpp +++ b/dynamic/wrappers/mesh/mesh.main.cpp @@ -30,9 +30,7 @@ #include "AbstractElement2_2.cppwg.hpp" #include "AbstractElement2_3.cppwg.hpp" #include "AbstractElement3_3.cppwg.hpp" -#include "MutableElement1_2.cppwg.hpp" #include "MutableElement2_2.cppwg.hpp" -#include "MutableElement2_3.cppwg.hpp" #include "MutableElement3_3.cppwg.hpp" #include "NodesOnlyMesh2.cppwg.hpp" #include "NodesOnlyMesh3.cppwg.hpp" @@ -106,9 +104,7 @@ PYBIND11_MODULE(_chaste_project_PyChaste_mesh, m) register_AbstractElement2_2_class(m); register_AbstractElement2_3_class(m); register_AbstractElement3_3_class(m); - register_MutableElement1_2_class(m); register_MutableElement2_2_class(m); - register_MutableElement2_3_class(m); register_MutableElement3_3_class(m); register_NodesOnlyMesh2_class(m); register_NodesOnlyMesh3_class(m); diff --git a/dynamic/wrappers/wrapper_header_collection.hpp b/dynamic/wrappers/wrapper_header_collection.hpp index bd82d80d..bd809233 100644 --- a/dynamic/wrappers/wrapper_header_collection.hpp +++ b/dynamic/wrappers/wrapper_header_collection.hpp @@ -318,9 +318,7 @@ template class MutableMesh<2,2>; template class MutableMesh<3,3>; template class AbstractElement<2,2>; template class AbstractElement<3,3>; -template class MutableElement<1,2>; template class MutableElement<2,2>; -template class MutableElement<2,3>; template class MutableElement<3,3>; template class NodesOnlyMesh<2>; template class NodesOnlyMesh<3>; @@ -723,9 +721,7 @@ typedef AbstractElement<1,2> AbstractElement1_2; typedef AbstractElement<2,2> AbstractElement2_2; typedef AbstractElement<2,3> AbstractElement2_3; typedef AbstractElement<3,3> AbstractElement3_3; -typedef MutableElement<1,2> MutableElement1_2; typedef MutableElement<2,2> MutableElement2_2; -typedef MutableElement<2,3> MutableElement2_3; typedef MutableElement<3,3> MutableElement3_3; typedef NodesOnlyMesh<2> NodesOnlyMesh2; typedef NodesOnlyMesh<3> NodesOnlyMesh3;