[ModelPart] adding clear (#161)

* adding clear

* adding Clear in Python

* adding Clear in C

* adding tests

* fix C comment

Author: philbucher

co_sim_io/c/co_sim_io_c.cpp

@@ -353,6 +353,11 @@ CoSimIO_Element CoSimIO_ModelPart_GetElementById(CoSimIO_ModelPart I_ModelPart,
     return elem;
 }
 
+void CoSimIO_ModelPart_Clear(CoSimIO_ModelPart I_ModelPart)
+{
+    static_cast<CoSimIO::ModelPart*>(I_ModelPart.PtrCppModelPart)->Clear();
+}
+
 
 int CoSimIO_FreeModelPart(CoSimIO_ModelPart I_ModelPart)
 {

co_sim_io/c/co_sim_io_c_model_part.h

@@ -82,6 +82,7 @@ CoSimIO_Node CoSimIO_ModelPart_GetNodeByIndex(CoSimIO_ModelPart I_ModelPart, con
 CoSimIO_Node CoSimIO_ModelPart_GetNodeById(CoSimIO_ModelPart I_ModelPart, const int I_Id);
 CoSimIO_Element CoSimIO_ModelPart_GetElementByIndex(CoSimIO_ModelPart I_ModelPart, const int I_Index);
 CoSimIO_Element CoSimIO_ModelPart_GetElementById(CoSimIO_ModelPart I_ModelPart, const int I_Id);
+void CoSimIO_ModelPart_Clear(CoSimIO_ModelPart I_ModelPart);
 
 CoSimIO_Node CoSimIO_ModelPart_CreateNewNode(
     CoSimIO_ModelPart I_ModelPart,

co_sim_io/impl/model_part.hpp

@@ -254,6 +254,15 @@ class ModelPart
         rOStream << "    Number of Elements: " << NumberOfElements() << std::endl;
     }
 
+    void Clear()
+    {
+        mElements.clear();
+        mElements.shrink_to_fit();
+
+        mNodes.clear();
+        mNodes.shrink_to_fit();
+    }
+
 private:
     std::string mName;
     NodesContainerType mNodes;

co_sim_io/python/model_part_to_python.hpp

@@ -73,6 +73,7 @@ void AddCoSimIOModelPartToPython(pybind11::module& m)
         .def_property_readonly("Elements", [](CoSimIO::ModelPart& I_ModelPart) {
             return py::make_iterator(I_ModelPart.ElementsBegin(), I_ModelPart.ElementsEnd());
             }, py::keep_alive<0, 1>()) /* Keep vector alive while iterator is used */
+        .def("Clear", &CoSimIO::ModelPart::Clear)
         .def("__str__",   [](const CoSimIO::ModelPart& I_ModelPart)
             { std::stringstream ss; ss << I_ModelPart; return ss.str(); } )
         ;

tests/co_sim_io/c/model_part/test_model_part.c

@@ -53,6 +53,12 @@ int main()
     COSIMIO_CHECK_INT_EQUAL(CoSimIO_ModelPart_NumberOfNodes(model_part), 4);
     COSIMIO_CHECK_INT_EQUAL(CoSimIO_ModelPart_NumberOfElements(model_part), 2);
 
+    /* remove all Nodes and Elements */
+    CoSimIO_ModelPart_Clear(model_part);
+
+    COSIMIO_CHECK_INT_EQUAL(CoSimIO_ModelPart_NumberOfNodes(model_part), 0);
+    COSIMIO_CHECK_INT_EQUAL(CoSimIO_ModelPart_NumberOfElements(model_part), 0);
+
     CoSimIO_FreeModelPart(model_part);
 
     return 0;

tests/co_sim_io/impl/test_model_part.cpp

@@ -375,6 +375,31 @@ TEST_CASE("model_part_get_element")
     }
 }
 
+TEST_CASE("model_part_clear")
+{
+    ModelPart model_part("for_test");
+
+    const int node_ids[] = {2, 159, 61};
+    const std::array<double, 3> node_coords = {1.0, -2.7, 9.44};
+    model_part.CreateNewNode(node_ids[0], node_coords[0], node_coords[1], node_coords[2]);
+    model_part.CreateNewNode(node_ids[1], node_coords[1], node_coords[2], node_coords[0]);
+    model_part.CreateNewNode(node_ids[2], node_coords[2], node_coords[0], node_coords[1]);
+
+    model_part.CreateNewElement(15, CoSimIO::ElementType::Point2D, {node_ids[0]});
+    model_part.CreateNewElement(73, CoSimIO::ElementType::Line2D2, {node_ids[1], node_ids[2]});
+    model_part.CreateNewElement(47, CoSimIO::ElementType::Triangle3D3, {node_ids[1], node_ids[2], node_ids[0]});
+    model_part.CreateNewElement(18, CoSimIO::ElementType::Point3D, {node_ids[1]});
+
+    REQUIRE_EQ(model_part.NumberOfNodes(), 3);
+    REQUIRE_EQ(model_part.NumberOfElements(), 4);
+
+    // remove all Nodes and Elements
+    model_part.Clear();
+
+    REQUIRE_EQ(model_part.NumberOfNodes(), 0);
+    REQUIRE_EQ(model_part.NumberOfElements(), 0);
+}
+
 TEST_CASE("model_part_ostream")
 {
     ModelPart model_part("for_test");

tests/co_sim_io/python/test_model_part.py

@@ -241,6 +241,29 @@ def test_model_part_get_element(self):
             with self.assertRaisesRegex(Exception, 'Error: Element with Id 7 does not exist!'):
                 model_part.GetElement(elem_id+1)
 
+    def test_model_part_clear(self):
+        model_part = CoSimIO.ModelPart("for_test")
+
+        node_ids = [2, 159, 61]
+        node_coords = [1.0, -2.7, 9.44]
+        model_part.CreateNewNode(node_ids[0], node_coords[0], node_coords[1], node_coords[2])
+        model_part.CreateNewNode(node_ids[1], node_coords[1], node_coords[2], node_coords[0])
+        model_part.CreateNewNode(node_ids[2], node_coords[2], node_coords[0], node_coords[1])
+
+        model_part.CreateNewElement(15, CoSimIO.ElementType.Point2D, [node_ids[0]])
+        model_part.CreateNewElement(188, CoSimIO.ElementType.Line2D2, [node_ids[0], node_ids[1]])
+        model_part.CreateNewElement(161, CoSimIO.ElementType.Triangle2D3, [node_ids[0], node_ids[2], node_ids[1]])
+        model_part.CreateNewElement(16, CoSimIO.ElementType.Point3D, [node_ids[0]])
+
+        self.assertEqual(model_part.NumberOfNodes(), 3)
+        self.assertEqual(model_part.NumberOfElements(), 4)
+
+        # remove all Nodes and Elements
+        model_part.Clear()
+
+        self.assertEqual(model_part.NumberOfNodes(), 0)
+        self.assertEqual(model_part.NumberOfElements(), 0)
+
     def test_print_model_part(self):
         model_part = CoSimIO.ModelPart("for_test")