Merge branch 'main' into solver_dep_storage

kaipartmann · Oct 19, 2024 · 32efd11 · 32efd11
2 parents 6138349 + 80b7910
commit 32efd11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/auxiliary/io.jl b/src/auxiliary/io.jl
@@ -145,11 +145,11 @@ end
 end
 
 @inline function _get_filename(vtk_filebase::String, ::Symbol, n::Int)
-    return @sprintf("%s_%06d", vtk_filebase, n) #TODO: remove trailing zeros
+    return @sprintf("%s_%d", vtk_filebase, n)
 end
 
 @inline function _get_filename(vtk_filebase::Dict{Symbol,String}, body_name::Symbol, n::Int)
-    return @sprintf("%s_%06d", vtk_filebase[body_name], n) #TODO: remove trailing zeros
+    return @sprintf("%s_%d", vtk_filebase[body_name], n)
 end
 
 function export_fields!(vtk, chunk, fields::Vector{Symbol})

diff --git a/test/auxiliary/test_io.jl b/test/auxiliary/test_io.jl
@@ -267,9 +267,9 @@ end
     n_chunks = 1
     Peridynamics.export_results(dh, options, chunk_id, n, t)
 
-    pvtu_file_ref = joinpath(temp_root, "vtk", "timestep_000000.pvtu")
+    pvtu_file_ref = joinpath(temp_root, "vtk", "timestep_0.pvtu")
     @test isfile(pvtu_file_ref)
-    pvtu_file_n = joinpath(temp_root, "vtk", "timestep_000001.pvtu")
+    pvtu_file_n = joinpath(temp_root, "vtk", "timestep_1.pvtu")
     @test isfile(pvtu_file_n)
 
     r0 = read_vtk(pvtu_file_ref)
@@ -327,13 +327,13 @@ end
     Peridynamics.export_results(dh_a, options, chunk_id, n, t)
     Peridynamics.export_results(dh_b, options, chunk_id, n, t)
 
-    pvtu_file_a_ref = joinpath(temp_root, "vtk", "a_timestep_000000.pvtu")
+    pvtu_file_a_ref = joinpath(temp_root, "vtk", "a_timestep_0.pvtu")
     @test isfile(pvtu_file_a_ref)
-    pvtu_file_a_n = joinpath(temp_root, "vtk", "a_timestep_000001.pvtu")
+    pvtu_file_a_n = joinpath(temp_root, "vtk", "a_timestep_1.pvtu")
     @test isfile(pvtu_file_a_n)
-    pvtu_file_b_ref = joinpath(temp_root, "vtk", "b_timestep_000000.pvtu")
+    pvtu_file_b_ref = joinpath(temp_root, "vtk", "b_timestep_0.pvtu")
     @test isfile(pvtu_file_b_ref)
-    pvtu_file_b_n = joinpath(temp_root, "vtk", "b_timestep_000001.pvtu")
+    pvtu_file_b_n = joinpath(temp_root, "vtk", "b_timestep_1.pvtu")
     @test isfile(pvtu_file_b_n)
 
     r_a = read_vtk(pvtu_file_a_ref)