Update to vtkio 0.6

Author: w1th0utnam3

CHANGELOG.md

@@ -19,6 +19,7 @@ Otherwise this release contains just some small changes to command line paramete
  - CLI: The CLI now also prints detailed profiling/timing output when running in parallel with domain decomposition thanks to the new `profile` macro
  - CLI: Add `--domain-min` and `--domain-max` flags to the `convert` subcommand that allows to filter out particles
  - CLI: Remove the `--splash-detection-radius` flag as it did not work for a couple of releases
+ - Lib: Update to [`vtkio`](https://github.com/elrnv/vtkio) 0.6.0
 
 ## Version 0.5.1
 

Cargo.lock

@@ -11,7 +11,7 @@ use splashsurf_lib::vtkio;
 use splashsurf_lib::Real;
 
 use vtkio::model::{ByteOrder, DataSet, Version, Vtk};
-use vtkio::{export_be, import_be, IOBuffer};
+use vtkio::IOBuffer;
 
 /// Tries to read a set of particles from the VTK file at the given path
 pub fn particles_from_vtk<R: Real, P: AsRef<Path>>(
@@ -42,6 +42,7 @@ pub fn write_vtk<P: AsRef<Path>>(
     let vtk_file = Vtk {
         version: Version::new((4, 1)),
         title: title.to_string(),
+        file_path: None,
         byte_order: ByteOrder::BigEndian,
         data: data.into(),
     };
@@ -50,13 +51,15 @@ pub fn write_vtk<P: AsRef<Path>>(
     if let Some(dir) = filename.parent() {
         create_dir_all(dir).context("Failed to create parent directory of output file")?;
     }
-    export_be(vtk_file, filename).context("Error while writing VTK output to file")
+    vtk_file
+        .export_be(filename)
+        .context("Error while writing VTK output to file")
 }
 
 /// Tries to read the given file into a VTK `DataSet`
 pub fn read_vtk<P: AsRef<Path>>(filename: P) -> Result<DataSet, vtkio::Error> {
     let filename = filename.as_ref();
-    import_be(filename).map(|vtk| vtk.data)
+    Vtk::import_legacy_be(filename).map(|vtk| vtk.data)
 }
 
 /// Tries to convert a vector of consecutive coordinate triplets into a vector of `Vector3`, also converts between floating point types
@@ -85,7 +88,7 @@ pub fn particles_from_dataset<R: Real>(dataset: DataSet) -> Result<Vec<Vector3<R
     if let DataSet::UnstructuredGrid { pieces, .. } = dataset {
         if let Some(piece) = pieces.into_iter().next() {
             let points = piece
-                .load_piece_data()
+                .into_loaded_piece_data(None)
                 .context("Failed to load unstructured grid piece")?
                 .points;
 

splashsurf/src/io/vtk_format.rs

@@ -40,7 +40,7 @@ smallvec = { version = "1.6", features = ["union"] }
 arrayvec = "0.5"
 
 # VTK extras
-vtkio = { version = "0.5", optional = true }
+vtkio = { version = "0.6", optional = true }
 
 # Needed for profiling feature
 lazy_static = { version = "1.4", optional = true }

splashsurf_lib/Cargo.toml

@@ -1,9 +1,6 @@
 use criterion::{criterion_group, Criterion};
 use nalgebra::Vector3;
-use splashsurf_lib::{
-    reconstruct_surface, reconstruct_surface_inplace, Parameters, SpatialDecompositionParameters,
-    SubdivisionCriterion, SurfaceReconstruction,
-};
+use splashsurf_lib::{reconstruct_surface, reconstruct_surface_inplace, Parameters, SpatialDecompositionParameters, SubdivisionCriterion, SurfaceReconstruction, ParticleDensityComputationStrategy};
 use std::time::Duration;
 
 use super::io::vtk::particles_from_vtk;
@@ -14,7 +11,7 @@ use super::io::vtk::write_vtk;
 /*
 pub fn surface_reconstruction_canyon(c: &mut Criterion) {
     let particle_positions: &Vec<Vector3<f32>> =
-        &particles_from_xyz("../data/canyon_13353401_particles.xyz").unwrap();
+        &super::io::xyz::particles_from_xyz("../../canyon_13353401_particles.xyz").unwrap();
 
     let particle_radius = 0.011;
     let compact_support_radius = 4.0 * particle_radius;

splashsurf_lib/benches/benches/bench_full.rs

@@ -52,7 +52,7 @@ pub mod vtk {
     use anyhow::{anyhow, Context};
 
     use vtkio::model::{ByteOrder, DataSet, Version, Vtk};
-    use vtkio::{export_ascii, import_be, IOBuffer};
+    use vtkio::IOBuffer;
 
     pub fn particles_from_vtk<R: Real, P: AsRef<Path>>(
         vtk_file: P,
@@ -69,6 +69,7 @@ pub mod vtk {
         let vtk_file = Vtk {
             version: Version::new((4, 1)),
             title: title.to_string(),
+            file_path: None,
             byte_order: ByteOrder::BigEndian,
             data: data.into(),
         };
@@ -77,12 +78,12 @@ pub mod vtk {
         if let Some(dir) = filename.parent() {
             create_dir_all(dir).context("Failed to create parent directory of output file")?;
         }
-        export_ascii(vtk_file, filename).context("Error while writing VTK output to file")
+        vtk_file.export_ascii(filename).context("Error while writing VTK output to file")
     }
 
     pub fn read_vtk<P: AsRef<Path>>(filename: P) -> Result<DataSet, vtkio::Error> {
         let filename = filename.as_ref();
-        import_be(filename).map(|vtk| vtk.data)
+        Vtk::import_legacy_be(filename).map(|vtk| vtk.data)
     }
 
     pub fn particles_from_coords<RealOut: Real, RealIn: Real>(
@@ -111,7 +112,7 @@ pub mod vtk {
         if let DataSet::UnstructuredGrid { pieces, .. } = dataset {
             if let Some(piece) = pieces.into_iter().next() {
                 let points = piece
-                    .load_piece_data()
+                    .into_loaded_piece_data(None)
                     .context("Failed to load unstructured grid piece")?
                     .points;
 

splashsurf_lib/benches/benches/io.rs

@@ -9,7 +9,7 @@ pub mod vtk {
     use anyhow::{anyhow, Context};
 
     use vtkio::model::{ByteOrder, DataSet, Version, Vtk};
-    use vtkio::{export_ascii, import_be, IOBuffer};
+    use vtkio::IOBuffer;
 
     pub fn particles_from_vtk<R: Real, P: AsRef<Path>>(
         vtk_file: P,
@@ -26,6 +26,7 @@ pub mod vtk {
         let vtk_file = Vtk {
             version: Version::new((4, 1)),
             title: title.to_string(),
+            file_path: None,
             byte_order: ByteOrder::BigEndian,
             data: data.into(),
         };
@@ -34,12 +35,12 @@ pub mod vtk {
         if let Some(dir) = filename.parent() {
             create_dir_all(dir).context("Failed to create parent directory of output file")?;
         }
-        export_ascii(vtk_file, filename).context("Error while writing VTK output to file")
+        vtk_file.export_ascii(filename).context("Error while writing VTK output to file")
     }
 
     pub fn read_vtk<P: AsRef<Path>>(filename: P) -> Result<DataSet, vtkio::Error> {
         let filename = filename.as_ref();
-        import_be(filename).map(|vtk| vtk.data)
+        Vtk::import_legacy_be(filename).map(|vtk| vtk.data)
     }
 
     pub fn particles_from_coords<RealOut: Real, RealIn: Real>(
@@ -68,7 +69,7 @@ pub mod vtk {
         if let DataSet::UnstructuredGrid { pieces, .. } = dataset {
             if let Some(piece) = pieces.into_iter().next() {
                 let points = piece
-                    .load_piece_data()
+                    .into_loaded_piece_data(None)
                     .context("Failed to load unstructured grid piece")?
                     .points;