Add MeshCAP implementation of Mesh2 to interface with Capstone

CMakeLists.txt

@@ -4,7 +4,7 @@ if(DEFINED TRIBITS_PACKAGE)
 endif()
 
 # This is the top level CMake file for the SCOREC build
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.8)
 
 project(SCOREC VERSION 2.2.8 LANGUAGES CXX C)
 
@@ -104,13 +104,18 @@ set(Trilinos_PREFIX "" CACHE STRING "Trilinos installation directory")
 option(SKIP_SIMMETRIX_VERSION_CHECK "enable at your own risk; it may result in undefined behavior" OFF)
 option(ENABLE_SIMMETRIX "Build with Simmetrix support" OFF)
 message(STATUS "ENABLE_SIMMETRIX: ${ENABLE_SIMMETRIX}")
+option(ENABLE_CAPSTONE "Build with Capstone support" OFF)
+message(STATUS "ENABLE_CAPSTONE: ${ENABLE_CAPSTONE}")
 option(ENABLE_OMEGA_H "Enable the Omega_h interface" OFF)
 option(PUMI_USE_OMEGA_H_VERSION "Specify the Omega_h version PUMI should use" 10.0.0)
 message(STATUS "ENABLE_OMEGA_H: ${ENABLE_OMEGA_H}")
 
 if(ENABLE_SIMMETRIX)
   add_definitions(-DHAVE_SIMMETRIX)
 endif()
+if(ENABLE_CAPSTONE)
+  add_definitions(-DHAVE_CAPSTONE)
+endif()
 
 option(ENABLE_FPP "Build with snapping to first problem plane" OFF)
 message(STATUS "ENABLE_FPP: ${ENABLE_FPP}")
@@ -127,6 +132,11 @@ if(ENABLE_SIMMETRIX)
   find_package(SimModSuite MODULE REQUIRED)
 endif()
 
+if(ENABLE_CAPSTONE)
+  set(SCOREC_USE_CreateMG_DEFAULT ${ENABLE_CAPSTONE})
+  bob_public_dep(CreateMG)
+endif()
+
 if(ENABLE_OMEGA_H)
   # find the omega_h library
   set(SCOREC_USE_Omega_h_DEFAULT ${ENABLE_OMEGA_H})
@@ -196,4 +206,10 @@ if(PUMI_PYTHON_INTERFACE)
   add_subdirectory(python_wrappers)
 endif()
 
+if(ENABLE_CAPSTONE)
+  add_subdirectory(gmi_cap)
+  add_subdirectory(apf_cap)
+  add_subdirectory(capstone_clis)
+endif()
+
 bob_end_package()

apf/apfMesh.cc

@@ -51,12 +51,22 @@ int const quad_edge_verts[4][2] =
 */
 
 int const tet_edge_verts[6][2] =
+#ifndef HAVE_CAPSTONE
 {{0,1}
 ,{1,2}
 ,{2,0}
 ,{0,3}
 ,{1,3}
 ,{2,3}};
+#else
+{{0,1}
+,{1,2}
+,{2,0}
+,{0,3}
+,{3,1}
+,{3,2}};
+#endif
+
 
 int const prism_edge_verts[9][2] =
 {{0,1},{1,2},{2,0}
@@ -68,10 +78,17 @@ int const pyramid_edge_verts[8][2] =
 ,{0,4},{1,4},{2,4},{3,4}};
 
 int const tet_tri_verts[4][3] =
+#ifndef HAVE_CAPSTONE
 {{0,1,2}
 ,{0,1,3}
 ,{1,2,3}
 ,{0,2,3}};
+#else
+{{0,1,2}
+,{1,0,3}
+,{1,3,2}
+,{3,0,2}};
+#endif
 
 int const hex_quad_verts[6][4] =
 {{0,1,2,3}

apf_cap/CMakeLists.txt

@@ -0,0 +1,26 @@
+if(DEFINED TRIBITS_PACKAGE)
+  include(pkg_tribits.cmake)
+  return()
+endif()
+
+#Sources & Headers
+set(SOURCES apfCAP.cc)
+set(HEADERS apfCAP.h)
+
+#Library
+add_library(apf_cap ${SOURCES})
+target_link_libraries(apf_cap PUBLIC apf gmi_cap)
+target_link_libraries(apf_cap PUBLIC capstone_module
+				     framework_testing)
+target_include_directories(apf_cap PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include>
+    )
+
+#directory containing apf_simConfig.h
+target_include_directories(apf_cap PRIVATE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
+
+scorec_export_library(apf_cap)
+
+bob_end_subdir()