WIP: add cube as struct

equinor · Jan 17, 2025 · ec581df · ec581df
1 parent 7b19b81
commit ec581df
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -40,7 +40,6 @@ pybind11_add_module(
   "${SRC}/common/geometry/polygons.cpp"
   "${SRC}/common/geometry/quadrilateral.cpp"
   "${SRC}/common/geometry/volumes.cpp"
-  "${SRC}/points/points.cpp"
   "${SRC}/grid3d/cell.cpp"
   "${SRC}/grid3d/grid.cpp"
   "${SRC}/grid3d/grid_surf_oper.cpp"

diff --git a/src/lib/include/xtgeo/points.hpp b/src/lib/include/xtgeo/points.hpp
@@ -13,8 +13,8 @@ init(py::module &m)
     py::class_<Point>(m_points, "Point")
       .def(py::init<>())
       .def_readwrite("x", &Point::x)
-      .def_readwrite("y", &Point::y);
-    .def_readwrite("z", &Point::z);
+      .def_readwrite("y", &Point::y)
+      .def_readwrite("z", &Point::z);
 }
 }  // namespace xtgeo::points
 #endif  // POINT_H_
diff --git a/src/lib/include/xtgeo/regsurf.hpp b/src/lib/include/xtgeo/regsurf.hpp
@@ -119,11 +119,6 @@ init(py::module &m)
     auto m_regsurf = m.def_submodule(
       "regsurf", "Internal functions for operations on regular surface.");
 
-    py::class_<Point>(m_regsurf, "Point")
-      .def(py::init<>())
-      .def_readwrite("x", &Point::x)
-      .def_readwrite("y", &Point::y);
-
     py::class_<RegularSurface>(m_regsurf, "RegularSurface")
       .def(py::init<>())
       .def_readwrite("ncol", &RegularSurface::ncol)
@@ -136,6 +131,12 @@ init(py::module &m)
       .def_readwrite("values", &RegularSurface::values)
       .def_readwrite("mask", &RegularSurface::mask);
 
+    py::class_<points::Point>(m_regsurf, "Point")
+      .def(py::init<>())
+      .def_readwrite("x", &points::Point::x)
+      .def_readwrite("y", &points::Point::y)
+      .def_readwrite("z", &points::Point::z);
+
     m_regsurf.def("py2cpp", &py2cpp,
                   "Convert a RegularSurface (py) to a RegularSurface (c++).");
 

diff --git a/src/lib/src/regsurf/utilities.cpp b/src/lib/src/regsurf/utilities.cpp
@@ -5,16 +5,19 @@
 #include <cstddef>
 #include <tuple>
 #include <xtgeo/geometry.hpp>
+#include <xtgeo/points.hpp>
 #include <xtgeo/regsurf.hpp>
 
 namespace py = pybind11;
 
 namespace xtgeo::regsurf {
 
+using points::Point;
+
 // Function to rotate a point (x, y) around the origin (xori, yori) by a given angle (in
 // radians)
-static points::Point
-rotate_point(const points::Point p,
+static Point
+rotate_point(const Point p,
              const double xori,
              const double yori,
              const double angle_rad)