Save also vertices and arcs when saving cavity to file

This commit fixes #41

Author: robertodr

src/cavity/Element.hpp

@@ -116,8 +116,13 @@ class Element __final {
   Eigen::Matrix3Xd arcs_;
   virtual std::ostream & printElement(std::ostream & os) {
     os << "Finite element" << std::endl;
-    os << "Number of vertices = " << nVertices_ << std::endl;
-    os << "Area = " << area_;
+    os << "Center\n" << center_.transpose() << std::endl;
+    os << "Normal\n" << normal_.transpose() << std::endl;
+    os << "Weight " << area_ << std::endl;
+    os << sphere_ << std::endl;
+    os << "Number of vertices and arcs " << nVertices_ << std::endl;
+    os << "Vertices\n" << vertices_ << std::endl;
+    os << "Arcs\n" << arcs_;
     return os;
   }
 };

src/cavity/ICavity.cpp

@@ -73,10 +73,12 @@ void ICavity::saveCavity(const std::string & fname) {
   cnpy::custom::npz_save(fname, "centers", elementCenter_);
   // Write normals
   cnpy::custom::npz_save(fname, "normals", elementNormal_);
-  // Write vertices TODO!!!!
-  // const unsigned int vertices_shape[] = {dim, 10, 3};
-  // Write arcs     TODO!!!!
-  // const unsigned int arcs_shape[] = {dim, 10, 3};
+  for (PCMSolverIndex i = 0; i < nElements_; ++i) {
+    // Write vertices
+    cnpy::custom::npz_save(fname, "vertices_" + std::to_string(i), elements_[i].vertices());
+    // Write arcs
+    cnpy::custom::npz_save(fname, "arcs_" + std::to_string(i), elements_[i].arcs());
+  }
 }
 
 void ICavity::loadCavity(const std::string & fname) {
@@ -126,10 +128,17 @@ void ICavity::loadCavity(const std::string & fname) {
     if (i < nIrrElements_)
       irr = true;
     Sphere sph(elementSphereCenter_.col(i), elementRadius_(i));
-    int nv = 3; // BOGUS!!!
     Eigen::Matrix3Xd vertices, arcs;
-    vertices.resize(Eigen::NoChange, nv); // BOGUS!!!
-    arcs.resize(Eigen::NoChange, nv);     // BOGUS!!
+    // 6. Get vertices and arcs
+    for (PCMSolverIndex i = 0; i < nElements_; ++i) {
+      cnpy::NpyArray raw_vertices = loaded_cavity["vertices_" + std::to_string(i)];
+      vertices = cnpy::custom::npy_to_eigen<double>(raw_vertices);
+      cnpy::NpyArray raw_arcs = loaded_cavity["arcs_" + std::to_string(i)];
+      arcs = cnpy::custom::npy_to_eigen<double>(raw_arcs);
+    }
+    if (arcs.cols() != vertices.cols())
+      PCMSOLVER_ERROR("Inconsistent number of vertices read from file for element " + to_string(i));
+    int nv = vertices.cols();
     // Populate vertices and arcs
     elements_.push_back(Element(nv,
                                 0,

src/utils/Sphere.cpp

@@ -35,7 +35,7 @@ using utils::Sphere;
 
 std::ostream & operator<<(std::ostream & os, Sphere & sph) {
   os << "Sphere radius " << sph.radius << std::endl;
-  os << "Sphere center\n" << sph.center;
+  os << "Sphere center\n" << sph.center.transpose();
 
   return os;
 }