diff --git a/Cargo.toml b/Cargo.toml index ce05100..5d5410b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["cdylib"] [dependencies] log = "0.4.22" -tucanos = {git = "https://github.com/tucanos/tucanos.git", rev = "9b01996e" } +tucanos = { git = "https://github.com/tucanos/tucanos.git", rev = "252380e" } numpy = "0.21" pyo3 = { version = "0.21", features = ["extension-module", "multiple-pymethods"] } pyo3-log = "0.11" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6f14058..0193dee 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.77.2" +channel = "1.83.0" diff --git a/src/geometry.rs b/src/geometry.rs index 88a4092..de1e786 100644 --- a/src/geometry.rs +++ b/src/geometry.rs @@ -6,8 +6,7 @@ use numpy::PyArray2; use pyo3::{exceptions::PyRuntimeError, pyclass, pymethods, Bound, PyResult, Python}; use tucanos::{ geometry::{Geometry, LinearGeometry}, - mesh_stl::orient_stl, - topo_elems::{Edge, Triangle}, + mesh::{io::orient_stl, Edge, Triangle}, }; macro_rules! create_geometry { ($name: ident, $dim: expr, $etype: ident, $mesh: ident, $geom: ident) => { diff --git a/src/mesh.rs b/src/mesh.rs index 6dc164f..d66817f 100644 --- a/src/mesh.rs +++ b/src/mesh.rs @@ -14,12 +14,8 @@ use pyo3::{ }; use std::collections::HashMap; use tucanos::{ - geom_elems::GElem, - mesh::Point, - mesh::SimplexMesh, - mesh_stl::read_stl, + mesh::{io::read_stl, Edge, Elem, GElem, Point, SimplexMesh, Tetrahedron, Triangle}, metric::Metric, - topo_elems::{Edge, Elem, Tetrahedron, Triangle}, Idx, Tag, }; diff --git a/src/parallel.rs b/src/parallel.rs index 346b439..35d8f36 100644 --- a/src/parallel.rs +++ b/src/parallel.rs @@ -13,11 +13,9 @@ use pyo3::{ Bound, PyResult, Python, }; use tucanos::{ - mesh_partition::PartitionType, + mesh::{PartitionType, Tetrahedron, Triangle}, metric::{AnisoMetric2d, AnisoMetric3d, IsoMetric, Metric}, - parallel::{ParallelRemesher, ParallelRemeshingParams}, - remesher::{RemesherParams, SmoothingType}, - topo_elems::{Tetrahedron, Triangle}, + remesher::{ParallelRemesher, ParallelRemeshingParams, RemesherParams, SmoothingType}, Idx, }; diff --git a/src/remesher.rs b/src/remesher.rs index 48763e6..8c42e95 100644 --- a/src/remesher.rs +++ b/src/remesher.rs @@ -14,9 +14,9 @@ use pyo3::{ Bound, PyResult, Python, }; use tucanos::{ + mesh::{Tetrahedron, Triangle}, metric::{AnisoMetric2d, AnisoMetric3d, IsoMetric, Metric}, remesher::{Remesher, RemesherParams, SmoothingType}, - topo_elems::{Tetrahedron, Triangle}, Idx, };