EDADSlite Cuda support

CMakeLists.txt

@@ -20,6 +20,7 @@ bob_option(Omega_h_CHECK_BOUNDS "Check array bounds when running on host (makes
 bob_option(Omega_h_THROW "Errors throw exceptions instead of abort" ${USE_XSDK_DEFAULTS})
 bob_input(Omega_h_DATA "" PATH "Path to omega_h-data test files")
 bob_option(Omega_h_USE_EGADS "Use EGADS from ESP for geometry" OFF)
+bob_option(Omega_h_USE_egadslite "Use EGADSlite from ESP for geometry" OFF)
 bob_input(EGADS_PREFIX "" PATH "EGADS (or ESP) installation directory")
 bob_option(Omega_h_USE_Kokkos "Use Kokkos as a backend" OFF)
 bob_input(Kokkos_PREFIX "" PATH "Path to Kokkos install")
@@ -62,6 +63,9 @@ if (Omega_h_USE_Kokkos)
   set_target_properties(Kokkos::kokkos PROPERTIES INTERFACE_COMPILE_OPTIONS "")
 endif()
 
+set(Omega_h_USE_egadslite_DEFAULT OFF)
+bob_add_dependency(PUBLIC NAME egadslite TARGETS egadslite::egadslite)
+
 set(libMeshb_REQUIRED_VERSION 7.24)
 set(Omega_h_USE_libMeshb_DEFAULT OFF)
 bob_add_dependency(PUBLIC NAME libMeshb TARGETS libMeshb::Meshb.7)
@@ -151,6 +155,7 @@ set(Omega_h_KEY_BOOLS
     Omega_h_USE_ZLIB
     Omega_h_USE_libMeshb
     Omega_h_USE_EGADS
+    Omega_h_USE_egadslite
     Omega_h_USE_SEACASExodus
     Omega_h_USE_SimModSuite
     Omega_h_USE_SimDiscrete

src/CMakeLists.txt

@@ -173,6 +173,10 @@ if(Omega_h_USE_ADIOS2)
   find_package(ADIOS2 REQUIRED)
 endif()
 
+if(Omega_h_USE_egadslite)
+  list(APPEND Omega_h_SOURCES Omega_h_egads_lite.cpp)
+endif()
+
 if(Omega_h_USE_SEACASExodus)
   list(APPEND Omega_h_SOURCES Omega_h_exodus.cpp)
 endif()
@@ -214,6 +218,8 @@ bob_link_dependency(omega_h PUBLIC libMeshb)
 
 bob_link_dependency(omega_h PUBLIC Gmsh)
 
+bob_link_dependency(omega_h PUBLIC egadslite)
+
 if(Omega_h_USE_EGADS)
   target_include_directories(omega_h PUBLIC "${EGADS_INCLUDE_DIR}")
   target_link_libraries(omega_h PUBLIC "${EGADS_LIBRARY}")
@@ -644,6 +650,9 @@ if(BUILD_TESTING)
   if(Omega_h_USE_EGADS)
     osh_add_exe(egads_test)
   endif()
+  if(Omega_h_USE_egadslite)
+    osh_add_exe(egads_lite_adapt_test)
+  endif()
   osh_add_exe(advect2d_test)
   if(Omega_h_DATA)
     list(APPEND TEST_EXES advect2d_test)
@@ -770,6 +779,7 @@ set(Omega_h_HEADERS
   Omega_h_dist.hpp
   Omega_h_eigen.hpp
   Omega_h_egads.hpp
+  Omega_h_egads_lite.hpp
   Omega_h_element.hpp
   Omega_h_expr.hpp
   Omega_h_fail.hpp

src/Omega_h_adapt.cpp

@@ -18,6 +18,9 @@
 #ifdef OMEGA_H_USE_EGADS
 #include "Omega_h_egads.hpp"
 #endif
+#ifdef OMEGA_H_USE_EGADSLITE
+#include "Omega_h_egads_lite.hpp"
+#endif
 
 namespace Omega_h {
 
@@ -73,11 +76,11 @@ AdaptOpts::AdaptOpts(Int dim) {
   length_histogram_max = 3.0;
   nlength_histogram_bins = 10;
   nquality_histogram_bins = 10;
-#ifdef OMEGA_H_USE_EGADS
-  egads_model = nullptr;
   should_smooth_snap = true;
   snap_smooth_tolerance = 1e-2;
   allow_snap_failure = false;
+#if defined(OMEGA_H_USE_EGADS) || defined(OMEGA_H_USE_EGADSLITE)
+  egads_model = nullptr;
 #endif
   should_refine = true;
   should_coarsen = true;
@@ -212,7 +215,7 @@ static bool satisfy_quality(Mesh* mesh, AdaptOpts const& opts) {
 }
 
 static void snap_and_satisfy_quality(Mesh* mesh, AdaptOpts const& opts) {
-#ifdef OMEGA_H_USE_EGADS
+#if defined(OMEGA_H_USE_EGADS) || defined(OMEGA_H_USE_EGADSLITE)
   if (opts.egads_model) {
     ScopedTimer snap_timer("snap");
 
@@ -222,8 +225,14 @@ static void snap_and_satisfy_quality(Mesh* mesh, AdaptOpts const& opts) {
 
     //mesh->change_all_rcFieldsToMesh();
 
+    #ifdef OMEGA_H_USE_EGADSLITE
+    auto warp = egads_lite_get_snap_warp(
+      mesh, opts.egads_model, opts.verbosity >= EACH_REBUILD);
+    #else
     auto warp = egads_get_snap_warp(
         mesh, opts.egads_model, opts.verbosity >= EACH_REBUILD);
+    #endif
+
     if (opts.should_smooth_snap) {
       if (opts.verbosity >= EACH_REBUILD) {
         std::cout << "Solving Laplacian of warp field...\n";
@@ -260,7 +269,7 @@ static void post_adapt(
     std::cout << "addressing edge lengths took " << (t2 - t1) << " seconds\n";
   }
   if (opts.verbosity > SILENT && !mesh->comm()->rank()) {
-#ifdef OMEGA_H_USE_EGADS
+#if defined(OMEGA_H_USE_EGADS) || defined(OMEGA_H_USE_EGADSLITE)
     if (opts.egads_model) std::cout << "snapping while ";
 #endif
     std::cout << "addressing element qualities took " << (t3 - t2);

src/Omega_h_adapt.hpp

@@ -149,7 +149,7 @@ struct TransferOpts {
 
 enum Verbosity { SILENT, EACH_ADAPT, EACH_REBUILD, EXTRA_STATS };
 
-#ifdef OMEGA_H_USE_EGADS
+#if defined (OMEGA_H_USE_EGADS) || defined(OMEGA_H_USE_EGADSLITE)
 struct Egads;
 #endif
 
@@ -168,11 +168,11 @@ struct AdaptOpts {
   Real length_histogram_max;
   Int nlength_histogram_bins;
   Int nquality_histogram_bins;
-#ifdef OMEGA_H_USE_EGADS
-  Egads* egads_model;
   bool should_smooth_snap;
   Real snap_smooth_tolerance;
   bool allow_snap_failure;
+#if defined(OMEGA_H_USE_EGADS) || defined(OMEGA_H_USE_EGADSLITE)
+  Egads* egads_model;
 #endif
   bool should_refine;
   bool should_coarsen;