CLN: refactor C++ backend and grid operations

Author: jcrivenaes

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     name: Python ${{ matrix.python[0] }} on ${{ matrix.os_arch[0] }}-${{ matrix.os_arch[1] }}
     runs-on: ${{ matrix.os_arch[0] }}
-    timeout-minutes: 15
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:

.github/workflows/test.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
+    timeout-minutes: 25
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]

CMakeLists.txt

@@ -1,8 +1,17 @@
 cmake_minimum_required(VERSION 3.15.3)
 project(${SKBUILD_PROJECT_NAME} LANGUAGES C CXX)
 
+set(EIGEN_TEST_CXX11
+    ON
+    CACHE BOOL "" FORCE)
+set(EIGEN_CXX_STANDARD
+    17
+    CACHE STRING "C++ standard for Eigen" FORCE)
+
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(NOT SKBUILD)
   message(

pyproject.toml

@@ -116,6 +116,8 @@ test-command = [
 convention = "google"
 match = '(?!(test_|_)).*\.py'
 
+# reminder if pytest on the command line:
+# -o log_cli=true -o log_cli_format="%(levelname)8s (%(relativeCreated)6.0fms) %(filename)44s [%(funcName)40s()] %(lineno)4d >>   %(message)s" -o log_cli_level=debug
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "--verbose"

src/lib/CMakeLists.txt

@@ -1,6 +1,12 @@
 include_directories(include)
 set(SRC "${CMAKE_CURRENT_LIST_DIR}/src")
 
+# Due to issues with WIN32 and Eigen installation, skip debug on Win32
+if(WIN32)
+  set(Python_FIND_DEBUG FALSE)
+  set(Python_FIND_RELEASE TRUE)
+endif()
+
 find_package(
   Python
   COMPONENTS Interpreter Development.Module NumPy
@@ -12,9 +18,7 @@ find_package(
 include(UseSWIG)
 find_package(pybind11 REQUIRED)
 
-if(UNIX AND NOT APPLE)
-  find_package(OpenMP REQUIRED)
-endif()
+find_package(OpenMP)
 
 message(STATUS "Python executable     : ${Python_EXECUTABLE}")
 message(STATUS "Python include dirs   : ${Python_INCLUDE_DIRS}")
@@ -25,6 +29,7 @@ message(STATUS "pybind11 include path : ${pybind11_INCLUDE_DIRS}")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # Use FetchContent for fmt library
+
 include(FetchContent)
 FetchContent_Declare(
   fmt
@@ -36,6 +41,24 @@ set(FMT_MASTER_PROJECT OFF)
 set(BUILD_SHARED_LIBS OFF)
 FetchContent_MakeAvailable(fmt)
 
+# Add Eigen using FetchContent
+set(EIGEN_BUILD_DOC OFF)
+set(BUILD_TESTING OFF)
+set(EIGEN_BUILD_PKGCONFIG OFF)
+set(EIGEN_BUILD_FORTRAN
+    OFF
+    CACHE BOOL "Disable Fortran features in Eigen" FORCE)
+set(EIGEN_TEST_FORTRAN
+    OFF
+    CACHE BOOL "Disable Fortran tests in Eigen" FORCE)
+
+FetchContent_Declare(
+  eigen
+  GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
+  GIT_TAG 3.4.0) # or whatever version you prefer
+
+FetchContent_MakeAvailable(eigen)
+
 # TODO: replace globbing with unique list, as globbing is bad practice
 file(GLOB SOURCES ${SRC}/*.c)
 add_library(xtgeo STATIC ${SOURCES})
@@ -66,6 +89,7 @@ pybind11_add_module(
   "${SRC}/grid3d/cell.cpp"
   "${SRC}/grid3d/cell_xyz.cpp"
   "${SRC}/grid3d/grid.cpp"
+  "${SRC}/grid3d/grid_fence_extract.cpp"
   "${SRC}/grid3d/grid_xyz_in.cpp"
   "${SRC}/grid3d/grid_reorganize.cpp"
   "${SRC}/grid3d/grid_surf_oper.cpp"
@@ -76,13 +100,13 @@ pybind11_add_module(
 target_include_directories(_internal PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include)
 # Link OpenMP
 
-if(UNIX
-   AND NOT APPLE
-   AND OpenMP_CXX_FOUND)
+if(OpenMP_CXX_FOUND)
   target_link_libraries(_internal PRIVATE OpenMP::OpenMP_CXX)
+  target_compile_definitions(_internal PRIVATE XTGEO_USE_OPENMP)
 endif()
 
 target_link_libraries(_internal PRIVATE fmt::fmt)
+target_include_directories(_internal PRIVATE ${eigen_SOURCE_DIR})
 
 message(STATUS "Compiling swig bindings")
 

src/lib/include/xtgeo/geometry.hpp

@@ -109,8 +109,8 @@ is_point_in_tetrahedron_legacy(const xyz::Point &point,
 inline double
 triangle_area(const xyz::Point &p1, const xyz::Point &p2, const xyz::Point &p3)
 {
-    return 0.5 *
-           std::abs(p1.x * (p2.y - p3.y) + p2.x * (p3.y - p1.y) + p3.x * (p1.y - p2.y));
+    return 0.5 * std::abs(p1.x() * (p2.y() - p3.y()) + p2.x() * (p3.y() - p1.y()) +
+                          p3.x() * (p1.y() - p2.y()));
 }
 
 /**
@@ -258,10 +258,10 @@ inline double
 hexahedron_dz(const HexahedronCorners &corners)
 {
     double dzsum = 0.0;
-    dzsum += std::abs(corners.upper_sw.z - corners.lower_sw.z);
-    dzsum += std::abs(corners.upper_se.z - corners.lower_se.z);
-    dzsum += std::abs(corners.upper_nw.z - corners.lower_nw.z);
-    dzsum += std::abs(corners.upper_ne.z - corners.lower_ne.z);
+    dzsum += std::abs(corners.upper_sw.z() - corners.lower_sw.z());
+    dzsum += std::abs(corners.upper_se.z() - corners.lower_se.z());
+    dzsum += std::abs(corners.upper_nw.z() - corners.lower_nw.z());
+    dzsum += std::abs(corners.upper_ne.z() - corners.lower_ne.z());
     return dzsum / 4.0;
 }