From 426a057affe2e904ccbf887f4333c71d07adf89a Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Sat, 4 May 2024 16:23:44 +0200 Subject: [PATCH 1/3] fix spacing in convergence_test --- src/util.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util.jl b/src/util.jl index 52adb42a..629ce4ab 100644 --- a/src/util.jl +++ b/src/util.jl @@ -152,7 +152,7 @@ function analyze_convergence(errors, iterations, mean_values = zeros(nvariables) for v in 1:nvariables mean_values[v] = sum(eocs[kind][:, v]) ./ length(eocs[kind][:, v]) - @printf("%-10s", "mean") + @printf("%-15s", "mean") @printf("%-10.2f", mean_values[v]) end eoc_mean_values[kind] = mean_values From 9b6122560e064d96852cd0e4f9aa9b18d8889dbe Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Sat, 4 May 2024 18:09:11 +0200 Subject: [PATCH 2/3] soften tolerance --- test/test_bbm_bbm_variable_bathymetry_1d.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_bbm_bbm_variable_bathymetry_1d.jl b/test/test_bbm_bbm_variable_bathymetry_1d.jl index 03f2abf2..d65aa623 100644 --- a/test/test_bbm_bbm_variable_bathymetry_1d.jl +++ b/test/test_bbm_bbm_variable_bathymetry_1d.jl @@ -69,7 +69,7 @@ EXAMPLES_DIR = joinpath(examples_dir(), "bbm_bbm_variable_bathymetry_1d") change_velocity=-3.8711139735371144e-13, change_entropy=17.81701226932122, atol=1e-10, - atol_ints=1e-11) # in order to make CI pass + atol_ints=1e-10) # in order to make CI pass end @trixi_testset "bbm_bbm_variable_bathymetry_1d_well_balanced" begin From 8b0cfbc242f293ce9de13fc5df5cd87a8a1508d0 Mon Sep 17 00:00:00 2001 From: Joshua Lampert Date: Sat, 4 May 2024 18:22:56 +0200 Subject: [PATCH 3/3] test on macos-13 instead of macos-latest --- .github/workflows/CI.yml | 2 +- test/test_bbm_bbm_variable_bathymetry_1d.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 07ecb7ae..dea1256b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: - '1.9' os: - ubuntu-latest - - macOS-latest + - macos-13 - windows-latest arch: - x64 diff --git a/test/test_bbm_bbm_variable_bathymetry_1d.jl b/test/test_bbm_bbm_variable_bathymetry_1d.jl index d65aa623..03f2abf2 100644 --- a/test/test_bbm_bbm_variable_bathymetry_1d.jl +++ b/test/test_bbm_bbm_variable_bathymetry_1d.jl @@ -69,7 +69,7 @@ EXAMPLES_DIR = joinpath(examples_dir(), "bbm_bbm_variable_bathymetry_1d") change_velocity=-3.8711139735371144e-13, change_entropy=17.81701226932122, atol=1e-10, - atol_ints=1e-10) # in order to make CI pass + atol_ints=1e-11) # in order to make CI pass end @trixi_testset "bbm_bbm_variable_bathymetry_1d_well_balanced" begin