Multiresolution Based Grid Adaptation for Triangles and Cartesian Grids

.gitignore

@@ -4,6 +4,7 @@ build/
 
 .deps/
 .libs/
+.cache/
 
 libtool
 config.log

CMakeLists.txt

@@ -29,6 +29,8 @@ project(
     VERSION "${T8CODE_VERSION_MAJOR}.${T8CODE_VERSION_MINOR}.${T8CODE_VERSION_PATCH}"
     )
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 include( GNUInstallDirs)
 include( CTest )
 include( CMakeDependentOption )
@@ -53,6 +55,7 @@ option( T8CODE_BUILD_FORTRAN_INTERFACE "Build t8code's Fortran interface" OFF )
 
 option( T8CODE_ENABLE_MPI "Enable t8code's features which rely on MPI" ON )
 option( T8CODE_ENABLE_VTK "Enable t8code's features which rely on VTK" OFF )
+option( T8CODE_ENABLE_MRA "Enable t8code's features which rely on MRA" OFF )
 option( T8CODE_ENABLE_OCC "Enable t8code's features which rely on OpenCASCADE" OFF )
 
 option( T8CODE_USE_SYSTEM_SC "Use system-installed sc library" OFF )
@@ -218,6 +221,13 @@ if( T8CODE_ENABLE_VTK )
     endif (VTK_FOUND)
 endif( T8CODE_ENABLE_VTK )
 
+if( T8CODE_ENABLE_MRA )
+  find_package(GSL REQUIRED)
+  if(GSL_FOUND)
+    message("Found GSL")
+  endif(GSL_FOUND)
+endif( T8CODE_ENABLE_MRA )
+
 if( T8CODE_ENABLE_OCC )
     find_package( OpenCASCADE REQUIRED COMPONENTS
     TKBO TKPrim TKTopAlgo

cmake/thirdparty.cmake

@@ -72,6 +72,22 @@ foreach(INDEX RANGE ${DEPS_RANGE})
         message(WARNING "Unknown thirdparty library type '${DEP_TYPE}' for ${DEP_NAME}")
     endif()
 
-    # 3. Populate the thirdparty library
-    FetchContent_MakeAvailable(${DEP_NAME})
+    # 3. Populate the thirdparty library.
+    # Build googletest statically even when t8code is a shared library: a shared
+    # libgtest.so collides at load time with a system libgtest.so of the same
+    # soname but different symbols (e.g. the DLR-SC MPI fork), causing runtime
+    # "undefined symbol" errors. A static gtest is baked into each test binary.
+    if(DEP_NAME STREQUAL "googletest")
+        set(_t8_saved_build_shared "${BUILD_SHARED_LIBS}")
+        set(_t8_saved_pic "${CMAKE_POSITION_INDEPENDENT_CODE}")
+        set(BUILD_SHARED_LIBS OFF)
+        set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+        FetchContent_MakeAvailable(${DEP_NAME})
+        set(BUILD_SHARED_LIBS "${_t8_saved_build_shared}")
+        set(CMAKE_POSITION_INDEPENDENT_CODE "${_t8_saved_pic}")
+        unset(_t8_saved_build_shared)
+        unset(_t8_saved_pic)
+    else()
+        FetchContent_MakeAvailable(${DEP_NAME})
+    endif()
 endforeach()

cmake/thirdparty.json

@@ -29,6 +29,16 @@
                 "ref": "2296a990d8b6b54731a63be0ba5bc17b08cd1f3d",
                 "shallow": "TRUE"
             }
+        },
+        {
+            "name": "unordered_dense",
+            "depends_on_cmake_option": "",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/martinus/unordered_dense.git",
+                "ref": "v4.5.0",
+                "shallow": "TRUE"
+            }
         }
     ]
 }

src/CMakeLists.txt

@@ -114,6 +114,80 @@ if( T8CODE_ENABLE_OCC )
     )
 endif()
 
+if( T8CODE_ENABLE_MRA )
+  target_compile_definitions( T8 PUBLIC T8_ENABLE_MRA )
+
+  # Add GSL library 
+  target_link_libraries( T8 PUBLIC GSL::gsl GSL::gslcblas )
+
+  # Add unordered_dense library https://github.com/martinus/unordered_dense
+  # Fetched via cmake/thirdparty.json; unordered_dense_SOURCE_DIR is set by FetchContent.
+  set( UNORDERED_DENSE_DIR "${unordered_dense_SOURCE_DIR}/include" )
+
+  target_include_directories(T8 PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
+    $<BUILD_INTERFACE:${UNORDERED_DENSE_DIR}>
+    $<INSTALL_INTERFACE:include>
+  )
+
+  target_sources( T8 PRIVATE
+    t8_mra/num/basis/dubiner.cxx
+    t8_mra/num/quadrature/dunavant.cxx
+  )
+
+  install( FILES
+    t8_mra/t8_mra.hxx
+    DESTINATION include/t8_mra )
+
+  install( FILES
+    t8_mra/core/base.hxx
+    t8_mra/core/adaptation.hxx
+    t8_mra/core/mst.hxx
+    DESTINATION include/t8_mra/core )
+
+  install( FILES
+    t8_mra/io/vtk.hxx
+    DESTINATION include/t8_mra/io )
+
+  install( FILES
+    t8_mra/shapes/triangle.hxx
+    t8_mra/shapes/cartesian.hxx
+    DESTINATION include/t8_mra/shapes )
+
+  install( FILES
+    t8_mra/criteria/coarsening_criterion.hxx
+    t8_mra/criteria/refinement_criterion.hxx
+    DESTINATION include/t8_mra/criteria )
+
+  install( FILES
+    t8_mra/data/element_data.hxx
+    t8_mra/data/levelindex_map.hxx
+    t8_mra/data/levelindex_set.hxx
+    t8_mra/data/levelmultiindex.hxx
+    t8_mra/data/triangle_order.hxx
+    DESTINATION include/t8_mra/data )
+
+  install( FILES
+    t8_mra/num/dg_basis.hxx
+    t8_mra/num/geometry.hxx
+    t8_mra/num/mask_coefficients.hxx
+    t8_mra/num/mat.hxx
+    DESTINATION include/t8_mra/num )
+
+  install( FILES
+    t8_mra/num/basis/basis.hxx
+    t8_mra/num/basis/legendre.hxx
+    t8_mra/num/basis/dubiner.hxx
+    DESTINATION include/t8_mra/num/basis )
+
+  install( FILES
+    t8_mra/num/quadrature/quadrature.hxx
+    t8_mra/num/quadrature/gauss_legendre.hxx
+    t8_mra/num/quadrature/dunavant.hxx
+    t8_mra/num/quadrature/dunavant_table.hxx
+    DESTINATION include/t8_mra/num/quadrature )
+endif()
+
 if( T8CODE_BUILD_PEDANTIC )
   target_compile_options( T8 PUBLIC -pedantic )
   set (T8_CXXFLAGS "${T8_CXXFLAGS} -Wpedantic")