From a9bb05e32509cd84210d49bd135c9e12bfa81a19 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 18 Dec 2023 10:12:43 +0100 Subject: [PATCH 01/23] coverallsapp at v2 (#83) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0090b64..57a2b8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Coveralls Finished - uses: coverallsapp/github-action@master + uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} parallel-finished: true From 9406f85e1da7da86f9faacea44b16ba36cc07635 Mon Sep 17 00:00:00 2001 From: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com> Date: Tue, 19 Dec 2023 11:50:21 +0100 Subject: [PATCH 02/23] coverallsapp at v2 (again) (#84) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57a2b8f..8133fdc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: env: PYTHON: "" - uses: julia-actions/julia-processcoverage@v1 - - uses: coverallsapp/github-action@master + - uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} flag-name: run-${{ matrix.version }}-${{ matrix.os }}-${{ matrix.arch }} From 2abe11245d23feb908edb49f8a7632b432124f97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 07:27:47 +0100 Subject: [PATCH 03/23] Bump actions/upload-artifact from 3 to 4 (#85) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8133fdc..752a628 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: flag-name: run-${{ matrix.version }}-${{ matrix.os }}-${{ matrix.arch }} parallel: true path-to-lcov: ./lcov.info - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: success() || failure() # upload artifacts even if tests have failed with: name: test-output-files-${{ matrix.version }}-${{ matrix.os }}-${{ matrix.arch }} From eff7878cf384d06a032ded09cb5eb2a251311686 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 23 Feb 2024 14:28:21 +0100 Subject: [PATCH 04/23] bump Trixi.jl compat and set version to v0.3.13 --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 35d0b8e..6514cb1 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.13-pre" +version = "0.3.13" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" @@ -18,6 +18,6 @@ HDF5 = "0.14, 0.15, 0.16, 0.17" ProgressMeter = "1.3" StaticArrays = "0.12, 1.0" TimerOutputs = "0.5" -Trixi = "0.5, 0.6" +Trixi = "0.5, 0.6, 0.7" WriteVTK = "1.7" julia = "1.7" From 470aeeb8a430db945f492a869dd7d0887a032758 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 23 Feb 2024 14:28:39 +0100 Subject: [PATCH 05/23] set development version to v0.3.14-pre --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 6514cb1..e12fc38 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.13" +version = "0.3.14-pre" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From 35105e81639db49c2fe2b37b6967af1932138593 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 24 Feb 2024 06:08:59 +0100 Subject: [PATCH 06/23] CompatHelper: bump compat for Trixi to 0.7 for package test, (keep existing compat) (#86) Co-authored-by: CompatHelper Julia --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index 69bdf4c..5d5e50e 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -10,4 +10,4 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" Documenter = "0.27, 1" OrdinaryDiffEq = "6" ReadVTK = "0.1, 0.2" -Trixi = "0.5, 0.6" +Trixi = "0.5, 0.6, 0.7" From 0231a5ff1f0f6080c47e3d4871493841694ad814 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Sun, 24 Mar 2024 17:27:02 +0100 Subject: [PATCH 07/23] Create SECURITY.md (#89) --- SECURITY.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..42bac2a --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,30 @@ +# Security Policy + +The Trixi.jl development team takes security issues seriously. We appreciate +all efforts to responsibly disclose any security issues and will make every +effort to acknowledge contributions. + + +## Supported Versions + +The current stable release following the interpretation of +[semantic versioning (SemVer)](https://julialang.github.io/Pkg.jl/dev/compatibility/#Version-specifier-format-1) +used in the Julia ecosystem is supported with security updates. + + +## Reporting a Vulnerability + +To report a security issue, please use the GitHub Security Advisory +["Report a Vulnerability"](https://github.com/trixi-framework/Trixi2Vtk.jl/security/advisories/new) +tab. + +We will send a response indicating the next steps in handling your report. +After the initial reply to your report, we will keep you informed of the +progress towards a fix and full announcement, and may ask for additional +information or guidance. + +Please report security bugs in third-party modules directly to the person +or team maintaining the module. + +Public notifications of vulnerabilities will be shared in community channels +such as Slack. From 16f37efa0afe28696c657408776a238c383c8fdb Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 5 Apr 2024 10:59:35 +0200 Subject: [PATCH 08/23] set version to v0.3.14 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index e12fc38..444102e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.14-pre" +version = "0.3.14" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From 2ee59e27eccdd471f53a556feab2b7bbdd32d8c7 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 5 Apr 2024 10:59:51 +0200 Subject: [PATCH 09/23] set development version to v0.3.15-pre --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 444102e..450ca48 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.14" +version = "0.3.15-pre" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From 03f062c10336f4dc275ef6d58879bace7598ebc3 Mon Sep 17 00:00:00 2001 From: Patrick Ersing <114223904+patrickersing@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:02:32 +0200 Subject: [PATCH 10/23] Update commit hash to reference files (#90) Co-authored-by: Andrew Winters --- test/test_trixi2vtk.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_trixi2vtk.jl b/test/test_trixi2vtk.jl index b9aa8e6..ca667ce 100644 --- a/test/test_trixi2vtk.jl +++ b/test/test_trixi2vtk.jl @@ -38,7 +38,7 @@ end # Note: The purpose of using a specific commit hash (instead of `main`) is to be able to tie a given # version of Trixi2Vtk to a specific version of the test file repository. This way, also tests # for older Trixi2Vtk releases should continue to work. -const TEST_REFERENCE_COMMIT = "c0a966b06489f9b2ee3aefeb0a5c0dae733df36f" +const TEST_REFERENCE_COMMIT = "86a43fe8dc254130345754fb512268204cf2233c" # Local folder to store downloaded reference files. If you change this, also adapt `../.gitignore`! const TEST_REFERENCE_DIR = "reference_files" From 839958066245a9763b93ed5f24ca9cdac1fd7473 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 5 Apr 2024 11:03:04 +0200 Subject: [PATCH 11/23] set version to v0.3.14 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 450ca48..444102e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.15-pre" +version = "0.3.14" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From f78a5fe8e42b2b372c0622fa6ef69e9437e858fe Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 5 Apr 2024 11:03:14 +0200 Subject: [PATCH 12/23] set development version to v0.3.15-pre --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 444102e..450ca48 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.14" +version = "0.3.15-pre" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From 110975f84be164821e6748995a9daca2c13c809d Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 8 Apr 2024 10:11:42 +0200 Subject: [PATCH 13/23] fix reference commit for old versions of Julia/Trixi.jl (#91) --- test/test_trixi2vtk.jl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/test_trixi2vtk.jl b/test/test_trixi2vtk.jl index ca667ce..15e59ad 100644 --- a/test/test_trixi2vtk.jl +++ b/test/test_trixi2vtk.jl @@ -38,7 +38,11 @@ end # Note: The purpose of using a specific commit hash (instead of `main`) is to be able to tie a given # version of Trixi2Vtk to a specific version of the test file repository. This way, also tests # for older Trixi2Vtk releases should continue to work. -const TEST_REFERENCE_COMMIT = "86a43fe8dc254130345754fb512268204cf2233c" +if VERSION < v"1.8" + const TEST_REFERENCE_COMMIT = "c0a966b06489f9b2ee3aefeb0a5c0dae733df36f" +else + const TEST_REFERENCE_COMMIT = "86a43fe8dc254130345754fb512268204cf2233c" +end # Local folder to store downloaded reference files. If you change this, also adapt `../.gitignore`! const TEST_REFERENCE_DIR = "reference_files" From c37e9d7087bf37aac5c7b9d6d0b84388b6548404 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 8 Apr 2024 20:04:05 +0200 Subject: [PATCH 14/23] set version to v0.3.15 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 450ca48..c74c538 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.15-pre" +version = "0.3.15" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From d253c30a2f9fa8c2d7fe9adc8d79589a23095e36 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 8 Apr 2024 20:04:21 +0200 Subject: [PATCH 15/23] set development version to v0.3.16-pre --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index c74c538..f4a6db2 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.15" +version = "0.3.16-pre" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From 849f63ecb82a41277983f40f4d0f228fceb5db77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 08:27:44 +0200 Subject: [PATCH 16/23] Bump julia-actions/setup-julia from 1 to 2 (#93) Bumps [julia-actions/setup-julia](https://github.com/julia-actions/setup-julia) from 1 to 2. - [Release notes](https://github.com/julia-actions/setup-julia/releases) - [Commits](https://github.com/julia-actions/setup-julia/compare/v1...v2) --- updated-dependencies: - dependency-name: julia-actions/setup-julia dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/Invalidations.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Invalidations.yml b/.github/workflows/Invalidations.yml index 18048d2..b2d34cb 100644 --- a/.github/workflows/Invalidations.yml +++ b/.github/workflows/Invalidations.yml @@ -16,7 +16,7 @@ jobs: if: github.base_ref == github.event.repository.default_branch runs-on: ubuntu-latest steps: - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: '1' - uses: actions/checkout@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 752a628..72b6aae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: arch: x64 steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} From 179fca618f1049bb945c9aba0aa59034b9ff20d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 08:08:55 +0200 Subject: [PATCH 17/23] Bump julia-actions/cache from 1 to 2 (#94) Bumps [julia-actions/cache](https://github.com/julia-actions/cache) from 1 to 2. - [Release notes](https://github.com/julia-actions/cache/releases) - [Changelog](https://github.com/julia-actions/cache/blob/main/devdocs/making_a_new_release.md) - [Commits](https://github.com/julia-actions/cache/compare/v1...v2) --- updated-dependencies: - dependency-name: julia-actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72b6aae..45a7f91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: julia-actions/cache@v1 + - uses: julia-actions/cache@v2 - uses: julia-actions/julia-buildpkg@v1 env: PYTHON: "" From 7d3a761c87606a82be704912d977cd052fe23a92 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 1 Jul 2024 16:12:27 +0200 Subject: [PATCH 18/23] allow new nine-digit file name format of Trixi.jl v0.8 (#96) --- Project.toml | 2 +- test/Project.toml | 2 ++ test/test_2d.jl | 40 ++++++++++++++++++++-------------------- test/test_3d.jl | 26 +++++++++++++------------- test/test_manual.jl | 6 +++--- test/test_trixi2vtk.jl | 15 +++++++++++++++ 6 files changed, 54 insertions(+), 37 deletions(-) diff --git a/Project.toml b/Project.toml index f4a6db2..5548107 100644 --- a/Project.toml +++ b/Project.toml @@ -18,6 +18,6 @@ HDF5 = "0.14, 0.15, 0.16, 0.17" ProgressMeter = "1.3" StaticArrays = "0.12, 1.0" TimerOutputs = "0.5" -Trixi = "0.5, 0.6, 0.7" +Trixi = "0.5, 0.6, 0.7, 0.8" WriteVTK = "1.7" julia = "1.7" diff --git a/test/Project.toml b/test/Project.toml index 5d5e50e..94567f6 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -2,9 +2,11 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" ReadVTK = "dc215faf-f008-4882-a9f7-a79a826fadc3" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" +UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] Documenter = "0.27, 1" diff --git a/test/test_2d.jl b/test/test_2d.jl index d752644..93bf176 100644 --- a/test/test_2d.jl +++ b/test/test_2d.jl @@ -22,7 +22,7 @@ end @timed_testset "mesh data" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "mesh_000010.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "mesh_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir) outfilename = "mesh_000010_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -38,7 +38,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000010.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir) outfilename = "solution_000010_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -54,7 +54,7 @@ end @timed_testset "reinterpolate with nonuniform data with VTU format" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000010.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir) outfilename = "solution_000010.vtu" out_file = joinpath(outdir, outfilename) @@ -70,7 +70,7 @@ end @timed_testset "reinterpolate with nonuniform data with VTI format" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000010.h5"), output_directory=outdir, format=:vti) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, format=:vti) outfilename = "solution_000010.vti" out_file = joinpath(outdir, outfilename) @@ -86,7 +86,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000010.h5"), output_directory=outdir, reinterpolate=false) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=false) outfilename = "solution_000010.vtu" out_file = joinpath(outdir, outfilename) @@ -103,7 +103,7 @@ end @timed_testset "do not reinterpolate with uniform data" begin # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000010.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) outfilename = "solution_000010.vtu" out_file = joinpath(outdir, outfilename) @@ -120,7 +120,7 @@ end @timed_testset "attempt reinterpolate with uniform data" begin # Purposely request a bad configuration and check that an error message gets thrown # OBS! Only needs tested once across all mesh types and dimensions - @test_throws ArgumentError trixi2vtk(joinpath(outdir, "solution_000010.h5"), output_directory=outdir, data_is_uniform=true) + @test_throws ArgumentError trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, data_is_uniform=true) end end @@ -169,7 +169,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -185,7 +185,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir, reinterpolate=false) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -202,7 +202,7 @@ end @timed_testset "do not reinterpolate with uniform data" begin # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -219,7 +219,7 @@ end @timed_testset "attempt VTI format on unsupported mesh type" begin # Purposely request a bad configuration and check that an error message gets thrown # OBS! Only needs tested once across all mesh types and dimensions - @test_throws ArgumentError trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir, format=:vti) + @test_throws ArgumentError trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, format=:vti) end end @@ -245,7 +245,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) outfilename = "solution_000001_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -261,7 +261,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -277,7 +277,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir, reinterpolate=false) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -294,7 +294,7 @@ end @timed_testset "do not reinterpolate with uniform data" begin # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -315,7 +315,7 @@ end @timed_testset "mesh data" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "mesh_000005.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "mesh_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir) outfilename = "mesh_000005_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -331,7 +331,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000005.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir) outfilename = "solution_000005_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -347,7 +347,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000005.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir) outfilename = "solution_000005.vtu" out_file = joinpath(outdir, outfilename) @@ -363,7 +363,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000005.h5"), output_directory=outdir, reinterpolate=false) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir, reinterpolate=false) outfilename = "solution_000005.vtu" out_file = joinpath(outdir, outfilename) @@ -380,7 +380,7 @@ end @timed_testset "do not reinterpolate with uniform data" begin # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000005.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) outfilename = "solution_000005.vtu" out_file = joinpath(outdir, outfilename) diff --git a/test/test_3d.jl b/test/test_3d.jl index e7217a8..99e65a0 100644 --- a/test/test_3d.jl +++ b/test/test_3d.jl @@ -22,7 +22,7 @@ end @timed_testset "mesh data" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "mesh_000004.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "mesh_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir) outfilename = "mesh_000004_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -38,7 +38,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000004.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir) outfilename = "solution_000004_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -54,7 +54,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000004.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir) outfilename = "solution_000004.vtu" out_file = joinpath(outdir, outfilename) @@ -70,7 +70,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000004.h5"), output_directory=outdir, reinterpolate=false) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir, reinterpolate=false) outfilename = "solution_000004.vtu" out_file = joinpath(outdir, outfilename) @@ -87,7 +87,7 @@ end @timed_testset "do not reinterpolate with uniform data" begin # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000004.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) outfilename = "solution_000004.vtu" out_file = joinpath(outdir, outfilename) @@ -127,7 +127,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) outfilename = "solution_000001_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -143,7 +143,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -159,7 +159,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir, reinterpolate=false) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -176,7 +176,7 @@ end @timed_testset "do not reinterpolate with uniform data" begin # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) outfilename = "solution_000001.vtu" out_file = joinpath(outdir, outfilename) @@ -213,7 +213,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000002.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir) outfilename = "solution_000002_celldata.vtu" out_file = joinpath(outdir, outfilename) @@ -229,7 +229,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000002.h5"), output_directory=outdir) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir) outfilename = "solution_000002.vtu" out_file = joinpath(outdir, outfilename) @@ -245,7 +245,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000002.h5"), output_directory=outdir, reinterpolate=false) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir, reinterpolate=false) outfilename = "solution_000002.vtu" out_file = joinpath(outdir, outfilename) @@ -262,7 +262,7 @@ end @timed_testset "do not reinterpolate with uniform data" begin # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000002.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) outfilename = "solution_000002.vtu" out_file = joinpath(outdir, outfilename) diff --git a/test/test_manual.jl b/test/test_manual.jl index a051ee4..79f1d03 100644 --- a/test/test_manual.jl +++ b/test/test_manual.jl @@ -29,7 +29,7 @@ isdir(outdir) && rm(outdir, recursive=true) end @testset "unsupported file format" begin - @test_throws ErrorException trixi2vtk(joinpath(outdir, "solution_000000.h5"); + @test_throws ErrorException trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000000.h5"); output_directory=outdir, format=:does_not_exist) end @@ -40,9 +40,9 @@ isdir(outdir) && rm(outdir, recursive=true) end @testset "trixi2vtk set number of output nodes" begin - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000000.h5"); nvisnodes=0) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000000.h5"); nvisnodes=0) - @test_nowarn trixi2vtk(joinpath(outdir, "solution_000000.h5"); nvisnodes=5) + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000000.h5"); nvisnodes=5) end @timed_testset "pvd_filenames" begin diff --git a/test/test_trixi2vtk.jl b/test/test_trixi2vtk.jl index 15e59ad..79958bb 100644 --- a/test/test_trixi2vtk.jl +++ b/test/test_trixi2vtk.jl @@ -5,6 +5,21 @@ using Trixi2Vtk using ReadVTK +# Get the version of Trixi.jl we are testing since the output file name +# format changed in v0.8.0 +import Pkg +using UUIDs: UUID +const LEADING_ZEROS = let + trixi_uuid = UUID("a7f1ee26-1774-49b1-8366-f1abc58fbfcb") + trixi_version = Pkg.dependencies()[trixi_uuid].version + if trixi_version > v"0.7.999999999" + "000" + else + "" + end +end + + function run_trixi(elixir; kwargs...) # evaluate examples in the scope of the module they're called from trixi_include(@__MODULE__, elixir; kwargs...) From 47f3496531c37766783b97b5ad446ee9f1004af8 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 1 Jul 2024 16:13:11 +0200 Subject: [PATCH 19/23] set version to v0.3.16 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 5548107..baa8ebe 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.16-pre" +version = "0.3.16" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From da6890c16bf9834735d030aebc8601586cda5d4c Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 1 Jul 2024 16:13:29 +0200 Subject: [PATCH 20/23] set development version to v0.3.17-DEV --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index baa8ebe..2dd2317 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Trixi2Vtk" uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95" authors = ["Michael Schlottke-Lakemper ", "Hendrik Ranocha "] -version = "0.3.16" +version = "0.3.17-DEV" [deps] Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" From 470e88aa30da905ffbf620524473646a736956c4 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 1 Jul 2024 16:57:58 +0200 Subject: [PATCH 21/23] allow Trixi.jl v0.8 in tests (#97) --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index 94567f6..e0b955b 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -12,4 +12,4 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" Documenter = "0.27, 1" OrdinaryDiffEq = "6" ReadVTK = "0.1, 0.2" -Trixi = "0.5, 0.6, 0.7" +Trixi = "0.5, 0.6, 0.7, 0.8" From aed1eef2591aaa04c92d8e5f02ed846499472976 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 1 Jul 2024 18:57:49 +0200 Subject: [PATCH 22/23] more fixes for leading zeros in 3D tests --- test/test_3d.jl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/test_3d.jl b/test/test_3d.jl index 99e65a0..9a9a81d 100644 --- a/test/test_3d.jl +++ b/test/test_3d.jl @@ -23,7 +23,7 @@ end @timed_testset "mesh data" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "mesh_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir) - outfilename = "mesh_000004_celldata.vtu" + outfilename = "mesh_" * LEADING_ZEROS * "000004_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -39,7 +39,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir) - outfilename = "solution_000004_celldata.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000004_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -55,7 +55,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir) - outfilename = "solution_000004.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000004.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -71,7 +71,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_000004.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000004.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -88,7 +88,7 @@ end # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000004.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) - outfilename = "solution_000004.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000004.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -128,7 +128,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) - outfilename = "solution_000001_celldata.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -144,7 +144,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -160,7 +160,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -177,7 +177,7 @@ end # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -214,7 +214,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir) - outfilename = "solution_000002_celldata.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000002_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -230,7 +230,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir) - outfilename = "solution_000002.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000002.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -246,7 +246,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_000002.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000002.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -263,7 +263,7 @@ end # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000002.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) - outfilename = "solution_000002.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000002.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests From 7746a79b2f5959541c6857d734e0b84540a49aa2 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 1 Jul 2024 18:59:27 +0200 Subject: [PATCH 23/23] more fixes for leading zeros in 2D --- test/test_2d.jl | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/test/test_2d.jl b/test/test_2d.jl index 93bf176..d8838aa 100644 --- a/test/test_2d.jl +++ b/test/test_2d.jl @@ -23,7 +23,7 @@ end @timed_testset "mesh data" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "mesh_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir) - outfilename = "mesh_000010_celldata.vtu" + outfilename = "mesh_" * LEADING_ZEROS * "000010_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -39,7 +39,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir) - outfilename = "solution_000010_celldata.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000010_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -55,7 +55,7 @@ end @timed_testset "reinterpolate with nonuniform data with VTU format" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir) - outfilename = "solution_000010.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000010.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -71,7 +71,7 @@ end @timed_testset "reinterpolate with nonuniform data with VTI format" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, format=:vti) - outfilename = "solution_000010.vti" + outfilename = "solution_" * LEADING_ZEROS * "000010.vti" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -87,7 +87,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_000010.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000010.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -104,7 +104,7 @@ end # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) - outfilename = "solution_000010.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000010.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -154,7 +154,7 @@ end # that only needs to be tested once. @test_nowarn trixi2vtk(joinpath(outdir, "solution_00000*.h5"), output_directory=outdir) - outfilename = "solution_000001_celldata.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -170,7 +170,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -186,7 +186,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -203,7 +203,7 @@ end # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -246,7 +246,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) - outfilename = "solution_000001_celldata.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -262,7 +262,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -278,7 +278,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -295,7 +295,7 @@ end # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000001.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) - outfilename = "solution_000001.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000001.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -316,7 +316,7 @@ end @timed_testset "mesh data" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "mesh_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir) - outfilename = "mesh_000005_celldata.vtu" + outfilename = "mesh_" * LEADING_ZEROS * "000005_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -332,7 +332,7 @@ end @timed_testset "solution celldata" begin # create the output file to be tested @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir) - outfilename = "solution_000005_celldata.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000005_celldata.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -348,7 +348,7 @@ end @timed_testset "reinterpolate with nonuniform data" begin # Create and test output with reinterpolation (default options: `reinterpolate=true, data_is_uniform=false`) @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir) - outfilename = "solution_000005.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000005.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -364,7 +364,7 @@ end @timed_testset "do not reinterpolate with nonuniform data" begin # Create and test output without reinterpolation on LGL nodes @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_000005.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000005.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests @@ -381,7 +381,7 @@ end # Create and test output without reinterpolation on uniform nodes # OBS! This is a dummy test just to exercise code. The resulting plot will look weird. @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000005.h5"), output_directory=outdir, reinterpolate=false, data_is_uniform=true) - outfilename = "solution_000005.vtu" + outfilename = "solution_" * LEADING_ZEROS * "000005.vtu" out_file = joinpath(outdir, outfilename) # save output file to `artifacts` to facilitate debugging of failing tests