Skip to content

Commit

Permalink
test using Trixi v0.4 (#48)
Browse files Browse the repository at this point in the history
* test using Trixi v0.4

* update hashes

* restrict to only Trixi v0.4

* update 3D test hashes
  • Loading branch information
ranocha committed Oct 22, 2021
1 parent 1605719 commit 9e9ac0f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ HDF5 = "0.14, 0.15"
ProgressMeter = "1.3"
StaticArrays = "0.12, 1.0"
TimerOutputs = "0.5"
Trixi = "0.3.42, 0.4"
Trixi = "0.4"
WriteVTK = "1.7"
julia = "1.6"
4 changes: 2 additions & 2 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"

[compat]
Documenter = "0.26, 0.27"
Documenter = "0.27"
OrdinaryDiffEq = "5.44"
Trixi = "0.3"
Trixi = "0.4"
10 changes: 7 additions & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
include("test_2d.jl")
include("test_3d.jl")
include("test_manual.jl")
using Test

@testset "Trixi2Vtk" begin
include("test_2d.jl")
include("test_3d.jl")
include("test_manual.jl")
end
12 changes: 6 additions & 6 deletions test/test_2d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ end
test_trixi2vtk("solution_00000*.h5", outdir,
hashes=[("solution_000000.vtu", "1ec2c93c0c9c4f4992dea54afaf2a348ece0160e"),
("solution_000000_celldata.vtu", "e396c3ba63276347966d4264cf0f52d592221830"),
("solution_00000.pvd", "7ba2f8f1927e90ebd4209aab890c58a20acf63f4"),
("solution_00000_celldata.pvd", "448a7130a608ed9f7e4630033b9e1338b1403f7b")])
("solution_00000.pvd", "b9e6742dc2b397b14d8d3964e90dcfadea5d98cb"),
("solution_00000_celldata.pvd", "c12004714a980581450cd4bad16a2541c5ec8f26")])
outfiles = ("solution_000000.vtu", "solution_000000_celldata.vtu",
"solution_00000.pvd", "solution_00000_celldata.pvd")
end
Expand All @@ -56,7 +56,7 @@ end
format=:vti)
else
test_trixi2vtk("restart_000001.h5", outdir,
hashes=[("restart_000001.vti", "49525c8f798f6a388218f92f624f80474471544f"),
hashes=[("restart_000001.vti", "9ade067c71f1f6492242a8aa215bd0d633caf9bc"),
("restart_000001_celldata.vtu", "e396c3ba63276347966d4264cf0f52d592221830")],
format=:vti)
end
Expand Down Expand Up @@ -148,16 +148,16 @@ end

@testset "P4estMesh" begin
isdir(outdir) && rm(outdir, recursive=true)
run_trixi(joinpath("p4est_2d_dgsem", "elixir_euler_source_terms_nonperiodic.jl"), initial_refinement_level=1, maxiters=1)
run_trixi(joinpath("p4est_2d_dgsem", "elixir_euler_source_terms_nonconforming_unstructured_flag.jl"), initial_refinement_level=0, maxiters=1)

@timed_testset "nonperiodic" begin
if Sys.isapple()
# This file has a different hash on macOS for some reason
test_trixi2vtk("solution_000000.h5", outdir,
hashes=[("solution_000000.vtu", "9050e4d141bf4099db907ef2c55768cff98a7291")])
hashes=[("solution_000000.vtu", "476eaaa9c13c3a8dba826b614a68a9d3e7979e6b")])
else
test_trixi2vtk("solution_000000.h5", outdir,
hashes=[("solution_000000.vtu", "468b5bac95b1a1bbbfcd5e6519a8bd87763996e4")])
hashes=[("solution_000000.vtu", "a80aadb353ce6ec40baa1b94d278c480f17d0419")])
end

# Store output files as artifacts to facilitate debugging of failing tests
Expand Down
8 changes: 4 additions & 4 deletions test/test_3d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ end
if Sys.isapple()
# This file has a different hash on macOS for some reason
test_trixi2vtk("solution_000000.h5", outdir,
hashes=[("solution_000000.vtu", "0eacb4094a97b751a6123f270437749cda76025d")])
hashes=[("solution_000000.vtu", "58e07f981fd6c005ea17e47054bd509c2c66d771")])
else
test_trixi2vtk("solution_000000.h5", outdir,
hashes=[("solution_000000.vtu", "81935b295d3bf5ba706ba49f6397272de4364c2a")])
hashes=[("solution_000000.vtu", "58e07f981fd6c005ea17e47054bd509c2c66d771")])
end

# Store output files as artifacts to facilitate debugging of failing tests
Expand All @@ -72,10 +72,10 @@ end
if Sys.isapple()
# This file has a different hash on macOS for some reason
test_trixi2vtk("solution_000000.h5", outdir,
hashes=[("solution_000000.vtu", "08121c3246caf55e9fa30a2e09ca0e2d6711c16d")])
hashes=[("solution_000000.vtu", "fe0f45809ef6f3f0c1b7f5331198585f406923c9")])
else
test_trixi2vtk("solution_000000.h5", outdir,
hashes=[("solution_000000.vtu", "d1249f2839589b22774d699bda1bfabde7b8c571")])
hashes=[("solution_000000.vtu", "0fa5a099378d153aa3a1bb7dcf3559ea5d6bf9c5")])
end

# Store output files as artifacts to facilitate debugging of failing tests
Expand Down

0 comments on commit 9e9ac0f

Please sign in to comment.