From bc25d4134c05c47934ba407dd16b90c12595200c Mon Sep 17 00:00:00 2001 From: bbolm Date: Fri, 20 Dec 2024 12:17:20 +0100 Subject: [PATCH 1/3] Increase julia version to v1.10 --- .github/workflows/ci.yml | 7 ++--- NEWS.md | 1 + Project.toml | 2 +- README.md | 2 +- test/test_2d.jl | 62 +++++++++++++++++++--------------------- test/test_trixi2vtk.jl | 6 +--- 6 files changed, 35 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e48049..f5b67b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: version: - - '1.9' + - '1.10' # - 'nightly' os: - ubuntu-latest @@ -41,12 +41,9 @@ jobs: arch: - x64 include: - - version: '1.9' + - version: '1.10' os: macOS-latest arch: arm64 - - version: '1.7' - os: ubuntu-latest - arch: x64 steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 diff --git a/NEWS.md b/NEWS.md index 51d8031..9ebcfba 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,6 +14,7 @@ for human readability. #### Changed +- The required Julia version is updated to v1.10. #### Deprecated diff --git a/Project.toml b/Project.toml index f8a6cd2..cba7129 100644 --- a/Project.toml +++ b/Project.toml @@ -20,4 +20,4 @@ StaticArrays = "0.12, 1.0" TimerOutputs = "0.5" Trixi = "0.5, 0.6, 0.7, 0.8, 0.9" WriteVTK = "1.7" -julia = "1.7" +julia = "1.10" diff --git a/README.md b/README.md index a8c7538..41213ac 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ generate publication-quality visualizations. Trixi2Vtk is part of the ## Installation If you have not yet installed Julia, please [follow the instructions for your operating system](https://julialang.org/downloads/platform/). Trixi2Vtk works -with Julia v1.7 and newer. +with Julia v1.10 and newer. Trixi2Vtk is a registered Julia package. Hence, you can install it by executing the following commands in the Julia REPL: diff --git a/test/test_2d.jl b/test/test_2d.jl index dd397b2..bea45ce 100644 --- a/test/test_2d.jl +++ b/test/test_2d.jl @@ -396,45 +396,41 @@ end end end - if VERSION >= v"1.8" - # Julia v1.7 heavily downgrades Trixi.jl. Subcell limiting is not yet supported. - # Therefore, only perform tests with Julia v1.8 or newer. - @testset "Subcell limiting coefficients" begin - isdir(outdir) && rm(outdir, recursive=true) - run_trixi(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_sedov_blast_wave_sc_subcell.jl"), - maxiters=10, initial_refinement_level=4) + @testset "Subcell limiting coefficients" begin + isdir(outdir) && rm(outdir, recursive=true) + run_trixi(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_euler_sedov_blast_wave_sc_subcell.jl"), + maxiters=10, initial_refinement_level=4) - @timed_testset "without reinterpolation" begin - # Create and test output without reinterpolation - @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=false) - outfilename = "solution_" * LEADING_ZEROS * "000010.vtu" - out_file = joinpath(outdir, outfilename) + @timed_testset "without reinterpolation" begin + # Create and test output without reinterpolation + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=false) + outfilename = "solution_" * LEADING_ZEROS * "000010.vtu" + out_file = joinpath(outdir, outfilename) - # save output file to `artifacts` to facilitate debugging of failing tests - testname = "2d-treemesh-shockcapturing-subcell-no-reinterp" - cp(out_file, joinpath(artifacts_dir, testname * "-" * outfilename), force=true) + # save output file to `artifacts` to facilitate debugging of failing tests + testname = "2d-treemesh-shockcapturing-subcell-no-reinterp" + cp(out_file, joinpath(artifacts_dir, testname * "-" * outfilename), force=true) - # remote file path is actually a URL so it always has the same path structure - remote_filename = "2d/treemesh/dgsem_sedov_subcell_no_interp_10.vtu" - ref_file = get_test_reference_file("dgsem_sedov_subcell_no_interp_10.vtu", remote_filename) - compare_point_data(out_file, ref_file) - end + # remote file path is actually a URL so it always has the same path structure + remote_filename = "2d/treemesh/dgsem_sedov_subcell_no_interp_10.vtu" + ref_file = get_test_reference_file("dgsem_sedov_subcell_no_interp_10.vtu", remote_filename) + compare_point_data(out_file, ref_file) + end - @timed_testset "with reinterpolation" begin - # Create and test output without reinterpolation - @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=true) - outfilename = "solution_" * LEADING_ZEROS * "000010.vtu" - out_file = joinpath(outdir, outfilename) + @timed_testset "with reinterpolation" begin + # Create and test output without reinterpolation + @test_nowarn trixi2vtk(joinpath(outdir, "solution_" * LEADING_ZEROS * "000010.h5"), output_directory=outdir, reinterpolate=true) + outfilename = "solution_" * LEADING_ZEROS * "000010.vtu" + out_file = joinpath(outdir, outfilename) - # save output file to `artifacts` to facilitate debugging of failing tests - testname = "2d-treemesh-shockcapturing-subcell-reinterp" - cp(out_file, joinpath(artifacts_dir, testname * "-" * outfilename), force=true) + # save output file to `artifacts` to facilitate debugging of failing tests + testname = "2d-treemesh-shockcapturing-subcell-reinterp" + cp(out_file, joinpath(artifacts_dir, testname * "-" * outfilename), force=true) - # remote file path is actually a URL so it always has the same path structure - remote_filename = "2d/treemesh/dgsem_sedov_subcell_interp_10.vtu" - ref_file = get_test_reference_file("dgsem_sedov_subcell_interp_10.vtu", remote_filename) - compare_cell_data(out_file, ref_file) - end + # remote file path is actually a URL so it always has the same path structure + remote_filename = "2d/treemesh/dgsem_sedov_subcell_interp_10.vtu" + ref_file = get_test_reference_file("dgsem_sedov_subcell_interp_10.vtu", remote_filename) + compare_cell_data(out_file, ref_file) end end end diff --git a/test/test_trixi2vtk.jl b/test/test_trixi2vtk.jl index b940dfb..0c17ec7 100644 --- a/test/test_trixi2vtk.jl +++ b/test/test_trixi2vtk.jl @@ -53,11 +53,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. -if VERSION < v"1.8" - const TEST_REFERENCE_COMMIT = "c0a966b06489f9b2ee3aefeb0a5c0dae733df36f" -else - const TEST_REFERENCE_COMMIT = "e51f3613ac1adfcfd2bf1d74a2756034dab0579c" -end +const TEST_REFERENCE_COMMIT = "e51f3613ac1adfcfd2bf1d74a2756034dab0579c" # Local folder to store downloaded reference files. If you change this, also adapt `../.gitignore`! const TEST_REFERENCE_DIR = "reference_files" From 8d2ceb5bf38c386854b1bc629264b740ff09d465 Mon Sep 17 00:00:00 2001 From: bbolm Date: Fri, 20 Dec 2024 15:28:38 +0100 Subject: [PATCH 2/3] Update commit hash --- 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 0c17ec7..fa3e3d4 100644 --- a/test/test_trixi2vtk.jl +++ b/test/test_trixi2vtk.jl @@ -53,7 +53,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 = "e51f3613ac1adfcfd2bf1d74a2756034dab0579c" +const TEST_REFERENCE_COMMIT = "5c9a75d721d55d0ba21c5be391afe557effc2740" # Local folder to store downloaded reference files. If you change this, also adapt `../.gitignore`! const TEST_REFERENCE_DIR = "reference_files" From bce949cc94b2b3419b6971154c9cf8f1f6983f8d Mon Sep 17 00:00:00 2001 From: bbolm Date: Mon, 23 Dec 2024 11:04:30 +0100 Subject: [PATCH 3/3] Update commit hash --- 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 fa3e3d4..f77544d 100644 --- a/test/test_trixi2vtk.jl +++ b/test/test_trixi2vtk.jl @@ -53,7 +53,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 = "5c9a75d721d55d0ba21c5be391afe557effc2740" +const TEST_REFERENCE_COMMIT = "1ba4ac00a41c856d2c0aa7b51b81358d267625d6" # Local folder to store downloaded reference files. If you change this, also adapt `../.gitignore`! const TEST_REFERENCE_DIR = "reference_files"