Merge pull request #59 from LLNL/feature/gunderman/bezier

Feature/gunderman/bezier
LLNL · Aug 27, 2019 · 510743e · 510743e
2 parents 898c9d2 + 16c2e9b
commit 510743e
Show file tree

Hide file tree

Showing 12 changed files with 1,547 additions and 37 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -46,6 +46,7 @@ endif()
 if (NOT BLT_CXX_STD)
     set(BLT_CXX_STD "c++11" CACHE STRING "")
 endif()
+set(ENABLE_ASTYLE OFF CACHE BOOL "")
 
 include(${BLT_SOURCE_DIR}/SetupBLT.cmake)
 

diff --git a/src/axom/mint/tests/mint_mesh.cpp b/src/axom/mint/tests/mint_mesh.cpp
@@ -274,8 +274,8 @@ void check_node_fields( IndexType n_nodes, const double* vx, const double* vy )
 {
   for ( IndexType i = 0 ; i < n_nodes ; ++i )
   {
-    EXPECT_EQ( vx[ i ], std::cos( E * i ) );
-    EXPECT_EQ( vy[ i ], std::sin( E * E * i ) );
+    EXPECT_DOUBLE_EQ( vx[ i ], std::cos( E * i ) );
+    EXPECT_DOUBLE_EQ( vy[ i ], std::sin( E * E * i ) );
   }
 }
 
@@ -303,7 +303,7 @@ void check_cell_fields( IndexType n_cells, const double* p )
 {
   for ( IndexType i = 0 ; i < n_cells ; ++i )
   {
-    EXPECT_EQ( p[ i ], std::cosh( E * i ) );
+    EXPECT_DOUBLE_EQ( p[ i ], std::cosh( E * i ) );
   }
 }
 

diff --git a/src/axom/primal/CMakeLists.txt b/src/axom/primal/CMakeLists.txt
@@ -2,19 +2,23 @@
 # other Axom Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
+#------------------------------------------------------------------------------
+# Primal -- Computational geometry primitives
+#------------------------------------------------------------------------------
 
-################################
+#------------------------------------------------------------------------------
 # Check necessary dependencies
-################################
+#------------------------------------------------------------------------------
 axom_component_requires(NAME       PRIMAL
                         COMPONENTS SLIC)
 
-################################
+#------------------------------------------------------------------------------
 # Specify all headers/sources
-################################
+#------------------------------------------------------------------------------
 set( primal_headers
 
      ## geometry
+     geometry/BezierCurve.hpp
      geometry/BoundingBox.hpp
      geometry/OrientedBoundingBox.hpp
      geometry/OrientationResult.hpp
@@ -39,6 +43,7 @@ set( primal_headers
      operators/in_sphere.hpp
 
      operators/detail/clip_impl.hpp
+     operators/detail/intersect_bezier_impl.hpp
      operators/detail/intersect_impl.hpp
    )
 
@@ -48,9 +53,9 @@ set( primal_sources
      operators/detail/intersect_impl.cpp
    )
 
-################################
-# Make/Install the library
-################################
+#------------------------------------------------------------------------------
+# Build and install the library
+#------------------------------------------------------------------------------
 set( primal_dependencies
      core
      slic
@@ -72,21 +77,18 @@ axom_install_component(NAME    primal
                        HEADERS ${primal_headers}
                        )
 
-################################
-# add examples
-################################
+#------------------------------------------------------------------------------
+# Add tests and examples
+#------------------------------------------------------------------------------
 if (AXOM_ENABLE_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
-################################
-# add tests
-################################
 if (AXOM_ENABLE_TESTS)
   add_subdirectory(tests)
 endif()
 
-################################
+#------------------------------------------------------------------------------
 # Add code checks
-################################
+#------------------------------------------------------------------------------
 axom_add_code_checks(PREFIX primal)
diff --git a/src/axom/primal/examples/CMakeLists.txt b/src/axom/primal/examples/CMakeLists.txt
@@ -2,6 +2,9 @@
 # other Axom Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
+#------------------------------------------------------------------------------
+# Primal examples
+#------------------------------------------------------------------------------
 
 set(primal_example_depends
         core