Merge pull request #12 from ZenanH/main

🎉 Release new version v0.1.10

Author: ZenanH

Project.toml

@@ -1,7 +1,7 @@
 name = "MaterialPointVisualizer"
 uuid = "9ce2fbfb-c269-402f-8683-a675189e795c"
 authors = ["ZenanH <zenan.huo@outlook.com>"]
-version = "0.1.9"
+version = "0.1.10"
 
 [deps]
 CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"

README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/LandslideSIM/MaterialPointVisualizer.jl/actions/workflows/ci.yml/badge.svg)](https://github.com/LandslideSIM/MaterialPointVisualizer.jl/actions/workflows/ci.yml) 
 [![Stable](https://img.shields.io/badge/docs-stable-blue.svg?logo=quicklook)](https://LandslideSIM.github.io/MaterialPointVisualizer.jl/stable)
 [![Dev](https://img.shields.io/badge/docs-dev-red.svg?logo=quicklook)](https://LandslideSIM.github.io/MaterialPointVisualizer.jl/dev)
-[![Version](https://img.shields.io/badge/version-v0.1.9-pink)]()
+[![Version](https://img.shields.io/badge/version-v0.1.10-pink)]()
 
 With this package, we can convert the MPM simulation results (HDF5 files from ***[MaterialPointSolver.jl](https://github.com/LandslideSIM/MaterialPointSolver.jl)*** ) into `.vtp` files or create ParaView-compatible animations. Additionally, it includes some post-processing functionalities.
 

docs/src/usage/surfreconstruction.md

@@ -37,6 +37,7 @@ ply2surface(
     cube_size          = 0.6,
     surface_threshold  = 0.6, 
     smoothing_length   = 1.2,
+    output_format::String = "obj",
     splashsurf::String = "nothing"
 )
 ```

src/MaterialPointVisualizer.jl

@@ -20,10 +20,10 @@ import MaterialPointSolver: DeviceArgs2D, DeviceGrid2D, DeviceParticle2D, Device
 
 const trimesh = PythonCall.pynew()
 
-include(joinpath(@__DIR__, "mpm2vtp.jl"       ))
-include(joinpath(@__DIR__, "particle2vtp.jl"  ))
-include(joinpath(@__DIR__, "particle2surf.jl" ))
-include(joinpath(@__DIR__, "plot/display.jl"  ))
+include(joinpath(@__DIR__, "mpm2vtp.jl"      ))
+include(joinpath(@__DIR__, "particle2vtp.jl" ))
+include(joinpath(@__DIR__, "particle2surf.jl"))
+include(joinpath(@__DIR__, "plot/display.jl" ))
 
 function __init__()
     @info "checking environment..."

src/particle2surf.jl

@@ -127,7 +127,8 @@ end
 
 """
     ply2surface(ply_dir, splash_dir, radius, num_threads; cube_size=0.6, 
-        surface_threshold=0.6, smoothing_length=1.2, splashsurf="nothing")
+        surface_threshold=0.6, smoothing_length=1.2, output_format="obj", 
+        splashsurf="nothing")
 
 Description:
 ---
@@ -151,6 +152,7 @@ function ply2surface(
     cube_size          = 0.6,
     surface_threshold  = 0.6, 
     smoothing_length   = 1.2,
+    output_format::String = "obj",
     splashsurf::String = "nothing"
 )
     if splashsurf == "nothing"
@@ -183,13 +185,14 @@ function ply2surface(
         splashsurfcmd = splashsurf
     end
 
+    output_format = output_format ∈ ["obj", "ply"] ? output_format : "obj"
     num_threads = 1 ≤ num_threads ≤ Sys.CPU_THREADS ? num_threads : Sys.CPU_THREADS
     splash_dir ≠ ply_dir || throw(ArgumentError(
         "The splash output directory should be different from the ply input directory"))
     isdir(splash_dir) || mkpath(splash_dir)
     if isfile(ply_dir)
         inputs = ply_dir
-        outputs = joinpath(splash_dir, "surface.vtk")
+        outputs = joinpath(splash_dir, "surface.$(output_format)")
         run(`$(splashsurfcmd) reconstruct $(inputs) --output-file=$(outputs)
             --particle-radius=$(radius*1.5)
             --cube-size=$(cube_size)
@@ -204,7 +207,7 @@ function ply2surface(
         )
     elseif isdir(ply_dir)
         inputs = joinpath(ply_dir, "iteration_{}.ply")
-        outputs = joinpath(splash_dir, "iteration_{}.vtk")
+        outputs = joinpath(splash_dir, "iteration_{}.$(output_format)")
         run(`$(splashsurfcmd) reconstruct $(inputs) --output-file=$(outputs)
             --particle-radius=$(radius*1.5)
             --cube-size=$(cube_size)

src/plot/display.jl

@@ -14,7 +14,7 @@ include(joinpath(@__DIR__, "plotutils.jl"))
 
 """
     vispts(coord, colormap::Symbol=:viridis, colorby::String="-1", attr::Vector=[-1], 
-        psize::Float32=1f-2, sample_n::Int=1000000)
+        psize::Real=1f-2, sample_n::Int=1000000)
 
 Description:
 ---
@@ -42,7 +42,7 @@ vispts(rand(10, 3), colorby="random vals", attr=rand(10), psize=1f0, sample_n=5,
     colormap::Symbol=:viridis,
     colorby ::String="-1",
     attr    ::Vector=[-1],
-    psize   ::Float32=1f-2,
+    psize   ::Real=1f-2,
     sample_n::Int=1000000
 )
     # check input file