Add support for EGADS geometry system

CMakeLists.txt

@@ -92,11 +92,16 @@ 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_EGADS "Build with EGADS support" OFF)
+message(STATUS "ENABLE_EGADS: ${ENABLE_EGADS}")
 option(ENABLE_OMEGA_H "Enable the Omega_h interface" OFF)
 message(STATUS "ENABLE_OMEGA_H: ${ENABLE_OMEGA_H}")
 if(ENABLE_SIMMETRIX)
   add_definitions(-DHAVE_SIMMETRIX)
 endif()
+if(ENABLE_EGADS)
+  add_definitions(-DHAVE_EGADS)
+endif()
 
 option(ENABLE_FPP "Build with snapping to first problem plane" OFF)
 message(STATUS "ENABLE_FPP: ${ENABLE_FPP}")
@@ -113,6 +118,10 @@ if(ENABLE_SIMMETRIX)
   find_package(SimModSuite MODULE REQUIRED)
 endif()
 
+if(ENABLE_EGADS)
+  find_package(EGADS MODULE REQUIRED)
+endif()
+
 if(ENABLE_OMEGA_H)
   # find the omega_h library
   set(SCOREC_USE_Omega_h_DEFAULT ${ENABLE_OMEGA_H})
@@ -125,6 +134,7 @@ add_subdirectory(lion)
 add_subdirectory(pcu)
 add_subdirectory(gmi)
 add_subdirectory(gmi_sim)
+add_subdirectory(gmi_egads)
 add_subdirectory(can)
 add_subdirectory(mth)
 add_subdirectory(apf)

apf/apfMesh.cc

@@ -15,6 +15,7 @@
 #include <pcu_util.h>
 #include <lionPrint.h>
 #include <algorithm>
+#include <iostream>
 
 namespace apf {
 
@@ -196,6 +197,16 @@ void Mesh::getParamOn(ModelEntity* g, MeshEntity* e, Vector3& p)
   ModelEntity* from_g = toModel(e);
   if (g == from_g)
     return getParam(e, p);
+
+  // above comparison only compares pointer address, this check's the entity's
+  // dim and tag in case it's the same entity but a different point to it 
+  int from_dim = getModelType(from_g);
+  int from_tag = getModelTag(from_g);
+  int to_dim = getModelType(g);
+  int to_tag = getModelTag(g);
+  if ((from_dim == to_dim) && (from_tag == to_tag))
+    return getParam(e, p);
+
   gmi_ent* from = (gmi_ent*)from_g;
   gmi_ent* to = (gmi_ent*)g;
   Vector3 from_p;
@@ -242,18 +253,15 @@ bool Mesh::isParamPointInsideModel(ModelEntity* g,
     gmi_free_set(adjRegions);
     return true;
   }
-  // for faces with more than 1 adj model region return true for now
-  // TODO: update for future
-  if (adjRegions->n == 2) {
-    gmi_free_set(adjRegions);
-    return true;
-  }
+  (void)param;
+  (void)x;
+  return true; /*
   PCU_ALWAYS_ASSERT(adjRegions->n <= 1);
   gmi_ent* r = (gmi_ent*)adjRegions->e[0];
   gmi_eval(getModel(), (gmi_ent*)g, &param[0], &x[0]);
   int res = gmi_is_point_in_region(getModel(), r, &x[0]);
   gmi_free_set(adjRegions);
-  return (res == 1) ? true : false;
+  return (res == 1) ? true : false; */
 }
 
 bool Mesh::isInClosureOf(ModelEntity* g, ModelEntity* target){

cmake/Dependencies.cmake

@@ -2,6 +2,7 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
   LIB_OPTIONAL_PACKAGES
     SCORECgmi_sim
     SCORECapf_sim
+    SCORECgmi_egads
   LIB_REQUIRED_PACKAGES
     SCOREClion
     SCORECpcu

cmake/FindEGADS.cmake

@@ -0,0 +1,37 @@
+# - Try to find EGADS
+# Once done this will define
+#  EGADS_FOUND - System has EGADS
+#  EGADS_INCLUDE_DIRS - The EGADS include directories
+#  EGADS_LIBRARIES - The libraries needed to use EGADS
+#  EGADS_DEFINITIONS - Compiler switches required for using EGADS
+
+#set(EGADS_PREFIX "${EGADS_PREFIX_DEFAULT}" CACHE STRING "EGADS install directory")
+#if(EGADS_PREFIX)
+#  message(STATUS "EGADS_PREFIX: ${EGADS_PREFIX}")
+#endif()
+
+find_path(EGADS_INCLUDE_DIR egads.h PATHS "${EGADS_DIR}/include")
+
+option(EGADS_LITE "Use EGADS_LITE" OFF)
+if (EGADS_LITE)
+  message(STATUS "Using EGADSlite")
+  find_library(EGADS_LIBRARY NAMES egadslite PATHS "${EGADS_DIR}/lib")
+else()
+  message(STATUS "Using EGADS")
+  find_library(EGADS_LIBRARY NAMES egads libegads.so libegads.dylib PATHS "${EGADS_DIR}/lib")
+endif()
+
+set(EGADS_LIBRARIES ${EGADS_LIBRARY} )
+set(EGADS_INCLUDE_DIRS ${EGADS_INCLUDE_DIR} )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set EGADS_FOUND to TRUE
+# if all listed variables are TRUE
+message(STATUS "beep boop: ${EGADS_LIBRARY}")
+find_package_handle_standard_args(
+    EGADS
+    DEFAULT_MSG
+    EGADS_LIBRARY EGADS_INCLUDE_DIR
+)
+
+mark_as_advanced(EGADS_INCLUDE_DIR EGADS_LIBRARY)

gmi_egads/CMakeLists.txt

@@ -0,0 +1,35 @@
+if(DEFINED TRIBITS_PACKAGE)
+  include(pkg_tribits.cmake)
+  return()
+endif()
+
+if(NOT ENABLE_EGADS)
+  return()
+endif()
+
+option(EGADS_LITE "Enable EGADSlite" OFF)
+# this file brings EGADS_LITE from CMake to C++
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gmi_egads_config.h.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/gmi_egads_config.h")
+
+#Sources & Headers
+set(SOURCES gmi_egads.c)
+set(HEADERS gmi_egads.h)
+
+add_library(gmi_egads ${SOURCES})
+
+target_include_directories(gmi_egads PUBLIC ${EGADS_INCLUDE_DIR})
+target_link_libraries(gmi_egads PUBLIC gmi pcu ${EGADS_LIBRARIES})
+
+# Include directories
+target_include_directories(gmi_egads PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include>
+    )
+# make sure the compiler can find the config header
+target_include_directories(gmi_egads PRIVATE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
+
+scorec_export_library(gmi_egads)
+
+bob_end_subdir()