Fixed: Deleting elements when extra visualization points

Author: kmokstad

src/Utility/ElementBlock.C

@@ -20,8 +20,12 @@
 
 double ElementBlock::eps = 0.0;
 
-//! \brief List of supported number of element nodes.
-static const std::array<size_t,7> legalNENs = { 2, 3, 4, 6, 8, 9, 27 };
+
+namespace
+{
+  //! \brief List of supported number of element nodes.
+  const std::array<size_t,7> legalNENs = { 2, 3, 4, 6, 8, 9, 27 };
+}
 
 
 ElementBlock::ElementBlock (size_t nenod)
@@ -299,29 +303,32 @@ utl::Point ElementBlock::getCenter (size_t i) const
 }
 
 
-void ElementBlock::removeElement (size_t i)
+void ElementBlock::removeElement (int iel)
 {
-  if (i < 1 || i > MINEX.size())
-    return;
-
-  std::vector<int>::iterator it1 = MMNPC.end(), it2 = MMNPC.end();
-  if (nen > 0)
-  {
-    it2 = MMNPC.begin()+nen*i;
-    it1 = it2 - nen;
-  }
-  else
-  {
-    size_t elm = 0;
-    for (size_t ip = 0; ip < MMNPC.size() && it2 == MMNPC.end(); ip++)
-      if (MMNPC[ip] < 0 && ++elm == i)
-        it2 = MMNPC.begin() + ip+1;
-      else if (elm == i-1 && it1 == MMNPC.end())
-        it1 = MMNPC.begin() + ip;
-  }
+  for (size_t i = 0; i < MINEX.size();)
+    if (MINEX[i] == iel)
+    {
+      std::vector<int>::iterator it1 = MMNPC.end(), it2 = MMNPC.end();
+      if (nen > 0)
+      {
+        it1 = MMNPC.begin()+nen*i;
+        it2 = it1 + nen;
+      }
+      else
+      {
+        size_t elm = 0;
+        for (size_t ip = 0; ip < MMNPC.size() && it2 == MMNPC.end(); ip++)
+          if (MMNPC[ip] < 0 && ++elm == i+1)
+            it2 = MMNPC.begin() + ip+1;
+          else if (elm == i && it1 == MMNPC.end())
+            it1 = MMNPC.begin() + ip;
+      }
 
-  MMNPC.erase(it1,it2);
-  MINEX.erase(MINEX.begin()+i-1);
+      MMNPC.erase(it1,it2);
+      MINEX.erase(MINEX.begin()+i);
+    }
+    else
+      ++i;
 }
 
 

src/Utility/ElementBlock.h

@@ -66,9 +66,9 @@ class ElementBlock
   //! \param[in] elmId External element ID (generate if negative)
   size_t addLine(size_t i1, const Vec3& X2, int elmId = -1);
 
-  //! \brief Assigns an external id to an element.
+  //! \brief Assigns an external ID to an element.
   void setElmId(size_t i, int iel) { MINEX[i-1] = iel; }
-  //! \brief Returns the external id of an element.
+  //! \brief Returns the external ID of an element.
   int getElmId(size_t i) const { return MINEX[i-1]; }
   //! \brief Returns the internal index of an element in case of mixed types.
   size_t getElmIndex(size_t i) const { return i < elmIdx.size() ? elmIdx[i]:i; }
@@ -108,8 +108,8 @@ class ElementBlock
 
   //! \brief Returns the coordinates of the center of the given element.
   utl::Point getCenter(size_t i) const;
-  //! \brief Removes the given element.
-  void removeElement(size_t i);
+  //! \brief Removes all elements with the specified external ID.
+  void removeElement(int iel);
 
 protected:
   using Prm3 = std::array<Real,3>; //!< Convenience type
@@ -136,7 +136,7 @@ class ElementBlock
 class PlaneBlock : public ElementBlock
 {
 public:
-  //! \brief Constructor defining a plane from three points.
+  //! \brief The constructor defines a plane from three points.
   //! \param[in] X0 First corner
   //! \param[in] X1 Second corner
   //! \param[in] X2 Third corner
@@ -153,7 +153,7 @@ class PlaneBlock : public ElementBlock
 class CubeBlock : public ElementBlock
 {
 public:
-  //! \brief The constructor defines a cube centred at specified point.
+  //! \brief The constructor defines a cube centered at the specified point.
   //! \param[in] X0 Center of the cube
   //! \param[in] dX Length of each cube edge
   CubeBlock(const Vec3& X0, double dX);
@@ -169,7 +169,7 @@ class CubeBlock : public ElementBlock
 class SphereBlock : public ElementBlock
 {
 public:
-  //! \brief The constructor defines a sphere centred at specified point.
+  //! \brief The constructor defines a sphere centered at the specified point.
   //! \param[in] X0 Center of the sphere
   //! \param[in] R Sphere diameter
   //! \param[in] nTheta Number of elements around equator
@@ -181,13 +181,13 @@ class SphereBlock : public ElementBlock
 /*!
   \brief Class for cylinder geometries.
   \details This class is used to create cylinder shapes in the model,
-  for visualization of rigid contect objects, etc.
+  for visualization of rigid contact objects, etc.
 */
 
 class CylinderBlock : public ElementBlock
 {
 public:
-  //! \brief The constructor defines a sphere centred at specified point.
+  //! \brief The constructor defines a cylinder along an axis through 2 points.
   //! \param[in] X0 First end point
   //! \param[in] X1 Second end point
   //! \param[in] R Cylinder diameter