Add some range based iterators and other comment changes

Author: jcs15c

src/axom/primal/operators/winding_number.hpp

@@ -227,9 +227,9 @@ double winding_number(const Point<T, 2>& q,
 {
   bool dummy_isOnCurve = false;
   double ret_val = 0.0;
-  for(int i = 0; i < carray.size(); i++)
+  for(auto& curv : carray)
   {
-    ret_val += detail::bezier_winding_number(q, carray[i], dummy_isOnCurve, edge_tol, EPS);
+    ret_val += detail::bezier_winding_number(q, curv, dummy_isOnCurve, edge_tol, EPS);
   }
 
   return ret_val;
@@ -321,7 +321,7 @@ double winding_number(const Point<T, 2>& q,
  * \brief Computes the GWN for a 2D point wrt an array of memoized data for 2D NURBS curves
  *
  * \param [in] query The query point to test
- * \param [in] nurbs_curve_arr The array of memoized curve objects
+ * \param [in] nurbs_cache_arr The array of memoized curve objects
  * \param [out] isOnCurve Set to true is the query point is on the curve
  * \param [in] edge_tol The physical distance level at which objects are considered indistinguishable
  * \param [in] EPS Miscellaneous numerical tolerance level for nonphysical distances
@@ -330,17 +330,17 @@ double winding_number(const Point<T, 2>& q,
  */
 template <typename T>
 double winding_number(const Point<T, 2>& query,
-                      const axom::Array<detail::NURBSCurveGWNCache<T>>& nurbs_curve_arr,
+                      const axom::Array<detail::NURBSCurveGWNCache<T>>& nurbs_cache_arr,
                       bool& isOnCurve,
                       double edge_tol = 1e-8,
                       double EPS = 1e-8)
 {
   double gwn = 0;
   isOnCurve = false;
-  for(int i = 0; i < nurbs_curve_arr.size(); ++i)
+  for(auto& the_cache : nurbs_cache_arr)
   {
     bool isOnThisCurve = false;
-    gwn += winding_number(query, nurbs_curve_arr[i], isOnThisCurve, edge_tol, EPS);
+    gwn += winding_number(query, the_cache, isOnThisCurve, edge_tol, EPS);
     isOnCurve = isOnCurve || isOnThisCurve;
   }
 
@@ -383,12 +383,12 @@ axom::Array<double> winding_number(const axom::Array<Point<T, 2>>& query_arr,
   {
     ret_val[n] = 0.0;
 
-    for(int i = 0; i < nurbs_cache_arr.size(); ++i)
+    for(auto& the_cache : nurbs_cache_arr)
     {
-      for(int k = 0; k < nurbs_cache_arr[i].getNumKnotSpans(); ++k)
+      for(int k = 0; k < the_cache.getNumKnotSpans(); ++k)
       {
         ret_val[n] += detail::bezier_winding_number_memoized(query_arr[n],
-                                                             nurbs_cache_arr[i],
+                                                             the_cache,
                                                              k,
                                                              0,
                                                              0,
@@ -424,9 +424,9 @@ axom::Array<double> winding_number(const axom::Array<Point<T, 2>>& query_arr,
 {
   axom::Array<detail::NURBSCurveGWNCache<T>> cache_arr(0, curve_arr.size());
 
-  for(int i = 0; i < curve_arr.size(); ++i)
+  for(auto& curv : curve_arr)
   {
-    cache_arr.emplace_back(detail::NURBSCurveGWNCache<T>(curve_arr[i], edge_tol));
+    cache_arr.emplace_back(detail::NURBSCurveGWNCache<T>(curv, edge_tol));
   }
 
   return winding_number(query_arr, cache_arr, edge_tol, EPS);
@@ -902,9 +902,9 @@ axom::Array<double> winding_number(const axom::Array<Point<T, 3>>& query_arr,
 {
   // Precompute the expansions and cast directions for each patch
   axom::Array<detail::NURBSPatchGWNCache<T>> nurbs_cache_arr(0, surf_arr.size());
-  for(int i = 0; i < surf_arr.size(); ++i)
+  for(autp& surf : surf_arr)
   {
-    nurbs_cache_arr.emplace_back(detail::NURBSPatchGWNCache<T>(surf_arr[i]));
+    nurbs_cache_arr.emplace_back(detail::NURBSPatchGWNCache<T>(surf));
   }
 
   return winding_number(query_arr, nurbs_cache_arr, edge_tol, ls_tol, quad_tol, disk_size, EPS);

src/axom/quest/io/STEPReader.cpp

@@ -69,7 +69,7 @@ struct PatchData
   int patchIndex {-1};
   bool wasOriginallyPeriodic_u {false};
   bool wasOriginallyPeriodic_v {false};
-  bool reversed_u {false};
+  bool was_reversed_u {false};
   axom::primal::BoundingBox<double, 2> parametricBBox;
   axom::primal::BoundingBox<double, 3> physicalBBox;
   axom::Array<bool> trimmingCurves_originallyPeriodic;
@@ -701,13 +701,13 @@ class StepFileProcessor
         patchData.patchIndex = patchIndex;
         patchData.wasOriginallyPeriodic_u = patchProcessor.patchWasOriginallyPeriodic_u();
         patchData.wasOriginallyPeriodic_v = patchProcessor.patchWasOriginallyPeriodic_v();
-        patchData.reversed_u = (face.Orientation() != TopAbs_FORWARD);
+        patchData.was_reversed_u = (face.Orientation() != TopAbs_FORWARD);
         patchData.parametricBBox = faceBoundingBox(face);
         patchData.physicalBBox = patches[patchIndex].boundingBox();
 
         // Apply the face orientation to the Axom patch so that normals are
         // consistent with the original B-Rep.
-        if(patchData.reversed_u)
+        if(patchData.was_reversed_u)
         {
           patches[patchIndex].reverseOrientation_u();
         }
@@ -921,7 +921,7 @@ class StepFileProcessor
             SLIC_ASSERT(curve.isValidNURBS());
             SLIC_ASSERT(curve.getDegree() == bsplineCurve->Degree());
 
-            if(patchData.reversed_u)
+            if(patchData.was_reversed_u)
             {
               reflectCurve_u(curve, patch_umin, patch_umax);
             }

src/axom/quest/tests/quest_step_reader.cpp

@@ -45,7 +45,7 @@ std::string pjoin(const char* str, Args... args)
 
 //------------------------------------------------------------------------------
 // Use a pared-down version of the TriangleGWN3D method to directly evaluate
-//  the for a triangle mesh
+//  the winding number for a triangle mesh
 struct MiniTriangleGWN3D
 {
   using Point3D = primal::Point<double, 3>;
@@ -76,7 +76,7 @@ struct MiniTriangleGWN3D
       &mesh,
       AXOM_LAMBDA(axom::IndexType cellIdx,
                   const axom::numerics::Matrix<double>& coords,
-                  [[maybe_unused]] const axom::IndexType* nodeIds) {
+                  const axom::IndexType* /*nodeIds*/) {
         // clang-format off
         trisView[cellIdx] = Triangle3D {Point3D {(coords(0, 0) - ctr[0]) / scl, (coords(1, 0) - ctr[1]) / scl, (coords(2, 0) - ctr[2]) / scl},
                                         Point3D {(coords(0, 1) - ctr[0]) / scl, (coords(1, 1) - ctr[1]) / scl, (coords(2, 1) - ctr[2]) / scl},
@@ -170,7 +170,7 @@ void runStepFileTest(const std::string& stepFile, double deflection = 0.1)
   const auto shapeBbox = stepReader.getBRepBoundingBox().scale(1.1);
   auto bboxMin = shapeBbox.getMin();
   auto bboxMax = shapeBbox.getMax();
-  const auto bboxDiag = bboxMax.array() - bboxMin.array();
+  const auto bboxDiag = bboxMax.range();
 
   axom::Array<primal::Point<double, 3>> query_arr;
   for(const double fx : {0.11, 0.251, 0.52, 0.731, 0.91})