Fixes from Alan Dayton (Many thanks!) (#1204)

* Fixes from Alan Dayton (Many thanks!)
LLNL · Dec 11, 2023 · 9a93c36 · 9a93c36
1 parent 928ce3e
commit 9a93c36
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/axom/primal/geometry/Hexahedron.hpp b/src/axom/primal/geometry/Hexahedron.hpp
@@ -71,7 +71,7 @@ class Hexahedron
   /*!
    * \brief Default constructor. Creates a degenerate hexahedron.
    */
-  AXOM_HOST_DEVICE Hexahedron() { }
+  Hexahedron() = default;
 
   /*!
    * \brief Creates an hexahedron from the 8 points p,q,r,s,t,u,v,w.
@@ -359,7 +359,14 @@ class Hexahedron
   }
 
 private:
-  PointType m_points[NUM_HEX_VERTS];
+  PointType m_points[NUM_HEX_VERTS] {PointType {},
+                                     PointType {},
+                                     PointType {},
+                                     PointType {},
+                                     PointType {},
+                                     PointType {},
+                                     PointType {},
+                                     PointType {}};
 };
 
 //------------------------------------------------------------------------------

diff --git a/src/axom/primal/geometry/Polyhedron.hpp b/src/axom/primal/geometry/Polyhedron.hpp
@@ -52,7 +52,7 @@ class NeighborCollection
   /*!
    * \brief Constructs an empty NeighborCollection.
    */
-  AXOM_HOST_DEVICE NeighborCollection() : num_nbrs {0} { }
+  NeighborCollection() = default;
 
   /*!
    * \brief Clears the set of neighbors.
@@ -263,7 +263,7 @@ class Polyhedron
 
 public:
   /*! Default constructor for an empty polyhedron   */
-  AXOM_HOST_DEVICE Polyhedron() : m_num_vertices(0) { }
+  Polyhedron() = default;
 
   /*! Return the number of vertices in the polyhedron */
   AXOM_HOST_DEVICE int numVertices() const { return m_num_vertices; }
@@ -893,9 +893,16 @@ class Polyhedron
   }
 
 private:
-  int m_num_vertices;
-  Coords m_vertices;
-  Neighbors m_neighbors;
+  int m_num_vertices {0};
+  Coords m_vertices {PointType {}, PointType {}, PointType {}, PointType {},
+                     PointType {}, PointType {}, PointType {}, PointType {},
+                     PointType {}, PointType {}, PointType {}, PointType {},
+                     PointType {}, PointType {}, PointType {}, PointType {},
+                     PointType {}, PointType {}, PointType {}, PointType {},
+                     PointType {}, PointType {}, PointType {}, PointType {},
+                     PointType {}, PointType {}, PointType {}, PointType {},
+                     PointType {}, PointType {}, PointType {}, PointType {}};
+  Neighbors m_neighbors {};
 };
 
 //------------------------------------------------------------------------------