Remove zero-threshold checks from intersection shaper and in-memory example

Author: bmhan12

src/axom/quest/IntersectionShaper.hpp

@@ -1231,7 +1231,6 @@ class IntersectionShaper : public Shaper
     const int device_allocator = m_allocatorId;
 
     constexpr int NUM_TETS_PER_HEX = 24;
-    constexpr double ZERO_THRESHOLD = 1.e-10;
 
     SLIC_INFO(axom::fmt::format("{:-^80}",
                                 " Inserting shapes' bounding boxes into BVH "));
@@ -1260,11 +1259,6 @@ class IntersectionShaper : public Shaper
 
     axom::ArrayView<const BoundingBox3D> hex_bbs_device_view = m_hex_bbs.view();
 
-    // Set shape components to zero if within threshold
-    snapShapeVerticesToZero<ExecSpace, ShapeType>(shapes,
-                                                  shape_count,
-                                                  ZERO_THRESHOLD);
-
     // Find which shape bounding boxes intersect hexahedron bounding boxes
     SLIC_INFO(axom::fmt::format(
       "{:-^80}",
@@ -2782,7 +2776,6 @@ class IntersectionShaper : public Shaper
 
     m_hexes = axom::Array<HexahedronType>(m_cellCount, m_cellCount, allocId);
     axom::ArrayView<HexahedronType> hexes_device_view = m_hexes.view();
-    constexpr double ZERO_THRESHOLD = 1.e-10;
     axom::for_all<ExecSpace>(
       m_cellCount,
       AXOM_LAMBDA(axom::IndexType i) {
@@ -2796,63 +2789,10 @@ class IntersectionShaper : public Shaper
             Point3D({vertCoords_device_view[vertIndex],
                      vertCoords_device_view[vertIndex + 1],
                      vertCoords_device_view[vertIndex + 2]});
-
-          // Set hexahedra components to zero if within threshold
-          if(axom::utilities::isNearlyEqual(hexes_device_view[i][j][0],
-                                            0.0,
-                                            ZERO_THRESHOLD))
-          {
-            hexes_device_view[i][j][0] = 0.0;
-          }
-
-          if(axom::utilities::isNearlyEqual(hexes_device_view[i][j][1],
-                                            0.0,
-                                            ZERO_THRESHOLD))
-          {
-            hexes_device_view[i][j][1] = 0.0;
-          }
-
-          if(axom::utilities::isNearlyEqual(hexes_device_view[i][j][2],
-                                            0.0,
-                                            ZERO_THRESHOLD))
-          {
-            hexes_device_view[i][j][2] = 0.0;
-          }
         }
       });  // end of loop to initialize hexahedral elements and bounding boxes
   }
 
-  //!\brief Set shape vertices to zero of within threshold.
-  template <typename ExecSpace, typename ShapeType>
-  void snapShapeVerticesToZero(axom::Array<ShapeType>& shapes,
-                               axom::IndexType shapeCount,
-                               double zeroThreshold)
-  {
-    AXOM_ANNOTATE_SCOPE("snapShapeVerticesToZero");
-    axom::ArrayView<ShapeType> shapesView = shapes.view();
-    axom::for_all<ExecSpace>(
-      shapeCount,
-      AXOM_LAMBDA(axom::IndexType i) {
-        for(int j = 0; j < ShapeType::NUM_VERTS; j++)
-        {
-          if(axom::utilities::isNearlyEqual(shapesView[i][j][0], 0.0, zeroThreshold))
-          {
-            shapesView[i][j][0] = 0.0;
-          }
-
-          if(axom::utilities::isNearlyEqual(shapesView[i][j][1], 0.0, zeroThreshold))
-          {
-            shapesView[i][j][1] = 0.0;
-          }
-
-          if(axom::utilities::isNearlyEqual(shapesView[i][j][2], 0.0, zeroThreshold))
-          {
-            shapesView[i][j][2] = 0.0;
-          }
-        }
-      });
-  }
-
   #if defined(AXOM_USE_CONDUIT)
   template <typename ExecSpace>
   void populateVertCoordsFromBlueprintMesh2D(axom::Array<double>& vertCoords)

src/axom/quest/examples/quest_shape_in_memory.cpp

@@ -1078,7 +1078,6 @@ axom::sidre::View* getElementVolumes(
 
       constexpr int NUM_VERTS_PER_HEX = 8;
       constexpr int NUM_COMPS_PER_VERT = 3;
-      constexpr double ZERO_THRESHOLD = 1.e-10;
 
       axom::Array<Point3D> vertCoords(cellCount * NUM_VERTS_PER_HEX,
                                       cellCount * NUM_VERTS_PER_HEX);
@@ -1103,21 +1102,6 @@ axom::sidre::View* getElementVolumes(
         }
       }
 
-      // Set vertex coords to zero if within threshold.
-      // (I don't know why we do this.  I'm following examples.)
-      axom::ArrayView<double> flatCoordsView(
-        (double*)vertCoords.data(),
-        vertCoords.size() * Point3D::dimension());
-      assert(flatCoordsView.size() == cellCount * NUM_VERTS_PER_HEX * 3);
-      axom::for_all<ExecSpace>(
-        cellCount * 3,
-        AXOM_LAMBDA(axom::IndexType i) {
-          if(axom::utilities::isNearlyEqual(flatCoordsView[i], 0.0, ZERO_THRESHOLD))
-          {
-            flatCoordsView[i] = 0.0;
-          }
-        });
-
       // Initialize hexahedral elements.
       axom::Array<HexahedronType> hexes(cellCount, cellCount);
       auto hexesView = hexes.view();
@@ -1308,7 +1292,6 @@ axom::sidre::View* getElementVolumes(
 
       constexpr int NUM_VERTS_PER_HEX = 8;
       constexpr int NUM_COMPS_PER_VERT = 3;
-      constexpr double ZERO_THRESHOLD = 1.e-10;
 
       /*
           Get vertex coordinates.  We use UnstructuredMesh for this,
@@ -1369,21 +1352,6 @@ axom::sidre::View* getElementVolumes(
           }
         });
 
-      // Set vertex coords to zero if within threshold.
-      // (I don't know why we do this.  I'm following examples.)
-      axom::ArrayView<double> flatCoordsView(
-        (double*)vertCoords.data(),
-        vertCoords.size() * Point3D::dimension());
-      assert(flatCoordsView.size() == cellCount * NUM_VERTS_PER_HEX * 3);
-      axom::for_all<ExecSpace>(
-        cellCount * 3,
-        AXOM_LAMBDA(axom::IndexType i) {
-          if(axom::utilities::isNearlyEqual(flatCoordsView[i], 0.0, ZERO_THRESHOLD))
-          {
-            flatCoordsView[i] = 0.0;
-          }
-        });
-
       // Initialize hexahedral elements.
       axom::Array<HexahedronType> hexes(cellCount,
                                         cellCount,