From 740500e8949202bebc575fa9cfc1ab4792c2687c Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 12:58:33 +0100 Subject: [PATCH 01/23] Add new elixir which works in general but still produces differences of O(1e-9) --- examples/3d/elixir_euler_amr.jl | 67 +++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 examples/3d/elixir_euler_amr.jl diff --git a/examples/3d/elixir_euler_amr.jl b/examples/3d/elixir_euler_amr.jl new file mode 100644 index 0000000000..2a5ddfbc1b --- /dev/null +++ b/examples/3d/elixir_euler_amr.jl @@ -0,0 +1,67 @@ + +using OrdinaryDiffEq +using Trixi + +############################################################################### +# semidiscretization of the linear advection equation + +equations = CompressibleEulerEquations3D(1.4) + +initial_condition = Trixi.initial_condition_density_pulse + +solver = DGSEM(3) + +coordinates_min = (-5, -5, -5) +coordinates_max = ( 5, 5, 5) +mesh = TreeMesh(coordinates_min, coordinates_max, + initial_refinement_level=4, + n_cells_max=10_000) + + +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + + +############################################################################### +# ODE solvers, callbacks etc. + +tspan = (0.0, 10.0) +ode = semidiscretize(semi, tspan) + +summary_callback = SummaryCallback() + +amr_controller = ControllerThreeLevel(semi, IndicatorMax(semi, variable=first), + base_level=4, + med_level=5, med_threshold=1.05, + max_level=6, max_threshold=1.3) +amr_callback = AMRCallback(semi, amr_controller, + interval=5, + adapt_initial_condition=true, + adapt_initial_condition_only_refine=true) + +stepsize_callback = StepsizeCallback(cfl=0.4) + +save_solution = SaveSolutionCallback(interval=100, + save_initial_solution=true, + save_final_solution=true, + solution_variables=:primitive) + +save_restart = SaveRestartCallback(interval=100, + save_final_restart=true) + +analysis_interval = 100 +alive_callback = AliveCallback(analysis_interval=analysis_interval) +analysis_callback = AnalysisCallback(semi, interval=analysis_interval, + extra_analysis_integrals=(entropy,)) + +# TODO: Taal decide, first AMR or save solution etc. +callbacks = CallbackSet(summary_callback, amr_callback, stepsize_callback, + save_restart, save_solution, + analysis_callback, alive_callback); + + +############################################################################### +# run the simulation + +sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback + save_everystep=false, callback=callbacks); +summary_callback() # print the timer summary From 0fa4e894a802e914cdcb4333a0eb02c5209a7610 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 13:06:37 +0100 Subject: [PATCH 02/23] Port MHD Orszag-Tang 3D --- examples/3d/elixir_mhd_orszag_tang.jl | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 examples/3d/elixir_mhd_orszag_tang.jl diff --git a/examples/3d/elixir_mhd_orszag_tang.jl b/examples/3d/elixir_mhd_orszag_tang.jl new file mode 100644 index 0000000000..0efc9f1fda --- /dev/null +++ b/examples/3d/elixir_mhd_orszag_tang.jl @@ -0,0 +1,54 @@ + +using OrdinaryDiffEq +using Trixi + +############################################################################### +# semidiscretization of the compressible ideal GLM-MHD equations + +equations = IdealGlmMhdEquations3D(5/3) + +initial_condition = initial_condition_orszag_tang + +surface_flux = flux_hll +volume_flux = flux_central +solver = DGSEM(3, surface_flux, VolumeIntegralFluxDifferencing(volume_flux)) + +coordinates_min = (0, 0, 0) +coordinates_max = (1, 1, 1) +mesh = TreeMesh(coordinates_min, coordinates_max, + initial_refinement_level=3, + n_cells_max=10_000) + +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + +############################################################################### +# ODE solvers, callbacks etc. + +tspan = (0.0, 0.5) +ode = semidiscretize(semi, tspan) + +summary_callback = SummaryCallback() + +# FIXME Taal restore after Taam sync to something better +stepsize_callback = StepsizeCallback(cfl=0.5) + +save_solution = SaveSolutionCallback(interval=10, + save_initial_solution=true, + save_final_solution=true, + solution_variables=:primitive) + +analysis_interval = 100 +alive_callback = AliveCallback(analysis_interval=analysis_interval) +analysis_callback = AnalysisCallback(semi, interval=analysis_interval) + +callbacks = CallbackSet(summary_callback, stepsize_callback, + save_solution, + analysis_callback, alive_callback) + + +############################################################################### +# run the simulation + +sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback + save_everystep=false, callback=callbacks); +summary_callback() # print the timer summary From 129d4cdbe704acc3c3ecc08574de0b125040f69c Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 13:18:05 +0100 Subject: [PATCH 03/23] Add Alfven wave mortar test 3D + fix calc_mortar_fluxes for noncons terms --- examples/3d/elixir_mhd_alfven_wave_mortar.jl | 59 ++++++++++++++++++++ src/solvers/dg/dg_3d.jl | 2 +- test/test_examples_3d.jl | 23 ++++++-- test/test_examples_3d_old.jl | 4 +- 4 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 examples/3d/elixir_mhd_alfven_wave_mortar.jl diff --git a/examples/3d/elixir_mhd_alfven_wave_mortar.jl b/examples/3d/elixir_mhd_alfven_wave_mortar.jl new file mode 100644 index 0000000000..b3585ce6e3 --- /dev/null +++ b/examples/3d/elixir_mhd_alfven_wave_mortar.jl @@ -0,0 +1,59 @@ + +using OrdinaryDiffEq +using Trixi + +############################################################################### +# semidiscretization of the compressible ideal GLM-MHD equations + +equations = IdealGlmMhdEquations3D(5/3) + +initial_condition = initial_condition_convergence_test + +surface_flux = flux_hll +volume_flux = flux_derigs_etal +solver = DGSEM(3, surface_flux, VolumeIntegralFluxDifferencing(volume_flux)) + +coordinates_min = (-1, -1, -1) +coordinates_max = ( 1, 1, 1) +refinement_patches = ( + (type="box", coordinates_min=(-0.5, -0.5, -0.5), + coordinates_max=( 0.5, 0.5, 0.5)), +) +mesh = TreeMesh(coordinates_min, coordinates_max, + initial_refinement_level=2, + refinement_patches=refinement_patches, + n_cells_max=10_000) + +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + +############################################################################### +# ODE solvers, callbacks etc. + +tspan = (0.0, 1.0) +ode = semidiscretize(semi, tspan) + +summary_callback = SummaryCallback() + +# FIXME Taal restore after Taam sync to something better +stepsize_callback = StepsizeCallback(cfl=0.5) + +save_solution = SaveSolutionCallback(interval=10, + save_initial_solution=true, + save_final_solution=true, + solution_variables=:primitive) + +analysis_interval = 100 +alive_callback = AliveCallback(analysis_interval=analysis_interval) +analysis_callback = AnalysisCallback(semi, interval=analysis_interval) + +callbacks = CallbackSet(summary_callback, stepsize_callback, + save_solution, + analysis_callback, alive_callback) + + +############################################################################### +# run the simulation + +sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback + save_everystep=false, callback=callbacks); +summary_callback() # print the timer summary diff --git a/src/solvers/dg/dg_3d.jl b/src/solvers/dg/dg_3d.jl index 566d79bd7d..38aec2edf3 100644 --- a/src/solvers/dg/dg_3d.jl +++ b/src/solvers/dg/dg_3d.jl @@ -1010,7 +1010,7 @@ function calc_mortar_flux!(surface_flux_values::AbstractArray{<:Any,5}, for j in eachnode(dg), i in eachnode(dg), v in eachvariable(equations) fstar_lower_right[v, i, j] += noncons_diamond_lower_right[v, i, j] end - mortar_fluxes_to_elements!(surface_flux_values, dg, mortar_type, mortar, + mortar_fluxes_to_elements!(surface_flux_values, equations, mortar_l2, dg, cache, mortar, fstar_upper_left, fstar_upper_right, fstar_lower_left, fstar_lower_right, fstar_tmp1) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index 82a8097944..693b0da0f3 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -136,16 +136,31 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.43498932208478724, 0.2821813924028202, 0.28218139240282025, 0.2838043627560838, 1.5002293438086647]) end + @testset "taal-confirmed elixir_mhd_ec.jl" begin + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), + l2 = [0.01921453037426997, 0.01924853398980921, 0.01924853398980923, 0.019247118340533328, 0.08310482412935676, 0.010362656540935251, 0.010362656540935237, 0.010364587080559528, 0.00020760700572485828], + linf = [0.2645851360519166, 0.33611482816103344, 0.33611482816103466, 0.36952265576762666, 1.230825809630423, 0.09818527443798974, 0.09818527443798908, 0.10507242371450054, 0.008456471524217968]) + end + @testset "taal-confirmed elixir_mhd_alfven_wave.jl" begin test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), l2 = [0.0038729054515012624, 0.00903693761037057, 0.0041729297273898815, 0.01160504558506348, 0.006241548790045999, 0.009227641613254402, 0.0034580608435846143, 0.011684993365513006, 0.0022068452165023645], linf = [0.012628629484152443, 0.03265276295369954, 0.012907838374176334, 0.044746702024108326, 0.02796611265824822, 0.03453054781110626, 0.010261557301859958, 0.044762592434299864, 0.010012319622784436]) end - @testset "taal-confirmed elixir_mhd_ec.jl" begin - test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), - l2 = [0.01921453037426997, 0.01924853398980921, 0.01924853398980923, 0.019247118340533328, 0.08310482412935676, 0.010362656540935251, 0.010362656540935237, 0.010364587080559528, 0.00020760700572485828], - linf = [0.2645851360519166, 0.33611482816103344, 0.33611482816103466, 0.36952265576762666, 1.230825809630423, 0.09818527443798974, 0.09818527443798908, 0.10507242371450054, 0.008456471524217968]) + @testset "taal-confirmed elixir_mhd_alfven_wave_mortar.jl" begin + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave_mortar.jl"), + l2 = [0.0021484102061835623, 0.006826504155492453, 0.0030653111370061784, 0.008735898256361025, 0.0051601878379492335, 0.007157480202233399, 0.0028291977973972948, 0.008815052614117018, 0.0022321821323698257], + linf = [0.012956870409227328, 0.05529249146399706, 0.020854504834048836, 0.05898012498637771, 0.03162799656904003, 0.05512773554440975, 0.017941374395225362, 0.060061114374191496, 0.013036070296136178], + tspan = (0.0, 0.25)) + end + + # 3D Orszag-Tang included to exercise all terms in the HLL flux + @testset "taal-confirmed elixir_mhd_orszag_tang.jl" begin + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_orszag_tang.jl"), + l2 = [0.0043911605751115424, 0.04144735653371165, 0.04150129965650717, 0.04150353600000829, 0.036931197750736805, 0.021125598820694595, 0.032956068087418154, 0.03296235602392588, 6.318083915607208e-6], + linf = [0.01789383976134809, 0.08496187610572214, 0.08909116075943745, 0.08505952838326755, 0.10443373959204932, 0.05387852204182135, 0.08812990990777562, 0.07804874749131957, 8.138512446081734e-5], + tspan = (0.0, 0.06)) end end diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index d7094e2687..56d8bceded 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -198,14 +198,14 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [0.0038729054515012624, 0.00903693761037057, 0.0041729297273898815, 0.01160504558506348, 0.006241548790045999, 0.009227641613254402, 0.0034580608435846143, 0.011684993365513006, 0.0022068452165023645], linf = [0.012628629484152443, 0.03265276295369954, 0.012907838374176334, 0.044746702024108326, 0.02796611265824822, 0.03453054781110626, 0.010261557301859958, 0.044762592434299864, 0.010012319622784436]) end - @testset "taal-check-me parameters_mhd_alfven_wave_mortar.toml" begin + @testset "taal-confirmed parameters_mhd_alfven_wave_mortar.toml" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_mhd_alfven_wave_mortar.toml"), l2 = [0.0021484102061835623, 0.006826504155492453, 0.0030653111370061784, 0.008735898256361025, 0.0051601878379492335, 0.007157480202233399, 0.0028291977973972948, 0.008815052614117018, 0.0022321821323698257], linf = [0.012956870409227328, 0.05529249146399706, 0.020854504834048836, 0.05898012498637771, 0.03162799656904003, 0.05512773554440975, 0.017941374395225362, 0.060061114374191496, 0.013036070296136178], t_end = 0.25) end # 3D Orszag-Tang included to exercise all terms in the HLL flux - @testset "taal-check-me parameters_mhd_orszag_tang.toml" begin + @testset "taal-confirmed parameters_mhd_orszag_tang.toml" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_mhd_orszag_tang.toml"), l2 = [0.0043911605751115424, 0.04144735653371165, 0.04150129965650717, 0.04150353600000829, 0.036931197750736805, 0.021125598820694595, 0.032956068087418154, 0.03296235602392588, 6.318083915607208e-6], linf = [0.01789383976134809, 0.08496187610572214, 0.08909116075943745, 0.08505952838326755, 0.10443373959204932, 0.05387852204182135, 0.08812990990777562, 0.07804874749131957, 8.138512446081734e-5], From 5d5beaf3378d1e586307141ec78297582e2d23b6 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 13:25:41 +0100 Subject: [PATCH 04/23] Add 3D Euler Sedov blast (without test yet) --- ...ler_sedov_blast_wave_shockcapturing_amr.jl | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl diff --git a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl new file mode 100644 index 0000000000..8b300fb59f --- /dev/null +++ b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl @@ -0,0 +1,84 @@ + +using OrdinaryDiffEq +using Trixi + +############################################################################### +# semidiscretization of the compressible Euler equations + +equations = CompressibleEulerEquations3D(1.4) + +initial_condition = Trixi.initial_condition_sedov_self_gravity +boundary_conditions = Trixi.boundary_condition_sedov_self_gravity + +surface_flux = flux_hll +volume_flux = flux_ranocha +polydeg = 3 +basis = LobattoLegendreBasis(polydeg) +indicator_sc = IndicatorHennemannGassner(equations, basis, + alpha_max=0.7, + alpha_min=0.001, + alpha_smooth=true, + variable=density_pressure) +volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; + volume_flux_dg=volume_flux, + volume_flux_fv=surface_flux) +solver = DGSEM(basis, surface_flux, volume_integral) + +coordinates_min = (-4, -4, -4) +coordinates_max = ( 4, 4, 4) +mesh = TreeMesh(coordinates_min, coordinates_max, + initial_refinement_level=2, + n_cells_max=1_000_000) + + +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, + boundary_conditions=boundary_conditions) + + +############################################################################### +# ODE solvers, callbacks etc. + +tspan = (0.0, 0.4) +ode = semidiscretize(semi, tspan) + +summary_callback = SummaryCallback() + +amr_indicator = IndicatorHennemannGassner(semi, + alpha_max=1.0, + alpha_min=0.0, + variable=density_pressure) + +amr_controller = ControllerThreeLevel(semi, amr_indicator, + base_level=4, + max_level =6, max_threshold=0.01) + +amr_callback = AMRCallback(semi, amr_controller, + interval=1, + adapt_initial_condition=true, + adapt_initial_condition_only_refine=true) + +stepsize_callback = StepsizeCallback(cfl=0.35) + +save_solution = SaveSolutionCallback(interval=100, + save_initial_solution=true, + save_final_solution=true, + solution_variables=:primitive) + +save_restart = SaveRestartCallback(interval=10, + save_final_restart=true) + +analysis_interval = 100 +alive_callback = AliveCallback(analysis_interval=analysis_interval) +analysis_callback = AnalysisCallback(semi, interval=analysis_interval) + +callbacks = CallbackSet(summary_callback, amr_callback, stepsize_callback, + save_restart, save_solution, + analysis_callback, alive_callback) + + +############################################################################### +# run the simulation + +sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback + save_everystep=false, callback=callbacks, maxiters=1e5); +summary_callback() # print the timer summary From 6ef9632ff4d2a39160126c550616da7f1e56395f Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 15:02:18 +0100 Subject: [PATCH 05/23] Fix Euler AMR elixir --- examples/3d/elixir_euler_amr.jl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/3d/elixir_euler_amr.jl b/examples/3d/elixir_euler_amr.jl index 2a5ddfbc1b..bcf3e61795 100644 --- a/examples/3d/elixir_euler_amr.jl +++ b/examples/3d/elixir_euler_amr.jl @@ -9,7 +9,8 @@ equations = CompressibleEulerEquations3D(1.4) initial_condition = Trixi.initial_condition_density_pulse -solver = DGSEM(3) +surface_flux = flux_lax_friedrichs +solver = DGSEM(3, surface_flux) coordinates_min = (-5, -5, -5) coordinates_max = ( 5, 5, 5) @@ -55,8 +56,8 @@ analysis_callback = AnalysisCallback(semi, interval=analysis_interval, # TODO: Taal decide, first AMR or save solution etc. callbacks = CallbackSet(summary_callback, amr_callback, stepsize_callback, - save_restart, save_solution, - analysis_callback, alive_callback); + save_restart, save_solution, analysis_callback, + alive_callback); ############################################################################### From fcbe7ce3eec2313f896e42afc290086b2f445232 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 15:03:45 +0100 Subject: [PATCH 06/23] Confirm new test --- test/test_examples_3d.jl | 6 ++++++ test/test_examples_3d_old.jl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index 693b0da0f3..5e82d0cf8d 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -89,6 +89,12 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.0005853874124926092]) end + @testset "taal-confirmed elixir_euler_amr.jl" begin + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_amr.jl"), + l2 = [0.00382819196730758, 0.0038281919673075725, 0.0038281919673075746, 0.0038281919673075738, 0.0057422879509614905], + linf = [0.07390560349428554, 0.07390560349428577, 0.07390560349428621, 0.07390560349428643, 0.11085840524143098], + tspan=(0.0, 0.1)) + end @testset "taal-confirmed elixir_hyp_diff_llf.jl" begin test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_hyp_diff_llf.jl"), diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index 56d8bceded..900a7141f1 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -82,7 +82,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [9.773858425669403e-6], linf = [0.0005853874124926092]) end - @testset "taal-check-me parameters_euler_amr.toml" begin + @testset "taal-confirmed parameters_euler_amr.toml" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_amr.toml"), l2 = [0.00382819196730758, 0.0038281919673075725, 0.0038281919673075746, 0.0038281919673075738, 0.0057422879509614905], linf = [0.07390560349428554, 0.07390560349428577, 0.07390560349428621, 0.07390560349428643, 0.11085840524143098], From a4ac1f8ead5e0316c889db5bc385518347e16864 Mon Sep 17 00:00:00 2001 From: Christof Czernik Date: Mon, 9 Nov 2020 16:25:15 +0100 Subject: [PATCH 07/23] euler_ec tests now taal-confirmed --- test/test_examples_3d.jl | 28 ++++++++++++++++++++++++++++ test/test_examples_3d_old.jl | 8 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index 5e82d0cf8d..71cdb0ff37 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -142,6 +142,34 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.43498932208478724, 0.2821813924028202, 0.28218139240282025, 0.2838043627560838, 1.5002293438086647]) end + @testset "taal-confirmed elixir_euler_ec.toml with initial_condition=Trixi.initial_condition_constant" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + l2 = [5.717218008425079e-16, 6.088971423170968e-16, 6.23130776282275e-16, 7.29884557381127e-16, 5.167198077601542e-15], + linf = [3.885780586188048e-15, 4.454769886308441e-15, 3.219646771412954e-15, 4.884981308350689e-15, 4.440892098500626e-14], + initial_condition=Trixi.initial_condition_constant) + end + + @testset "taal-confirmed elixir_euler_ec.toml with flux_chandrashekar" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + l2 = [0.025105743648126774, 0.016571417754430256, 0.01657141775443023, 0.016565202090289916, 0.09077232065771225], + linf = [0.4349225166034201, 0.27945714200874, 0.2794571420087401, 0.28021366413271664, 1.5240679700745954], + surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) + end + + @testset "taal-confirmed elixir_euler_ec.toml with flux_kennedy_gruber" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + l2 = [0.025120431810845507, 0.016599310737401483, 0.01659931073740148, 0.016592567464138185, 0.090856457771812], + linf = [0.43120500632996794, 0.28419288751363336, 0.2841928875136334, 0.28583515705222146, 1.515485025725378], + surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) + end + + @testset "taal-confirmed elixir_euler_ec.toml with flux_shima_etal" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + l2 = [0.025099944530993942, 0.016561611274319134, 0.016561611274319127, 0.01655478190136039, 0.09076538812894279], + linf = [0.43472962954165273, 0.2824065323711477, 0.2824065323711474, 0.28409419760015847, 1.4995295774522692], + surface_flux=flux_shima_etal, volume_flux=flux_shima_etal) + end + @testset "taal-confirmed elixir_mhd_ec.jl" begin test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), l2 = [0.01921453037426997, 0.01924853398980921, 0.01924853398980923, 0.019247118340533328, 0.08310482412935676, 0.010362656540935251, 0.010362656540935237, 0.010364587080559528, 0.00020760700572485828], diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index 900a7141f1..42d66e1410 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -99,25 +99,25 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [0.025101741317688664, 0.01655620530022176, 0.016556205300221737, 0.016549388264402515, 0.09075092792976944], linf = [0.43498932208478724, 0.2821813924028202, 0.28218139240282025, 0.2838043627560838, 1.5002293438086647]) end - @testset "taal-check-me parameters_euler_ec.toml with initial_condition=Trixi.initial_condition_constant" begin + @testset "taal-confirmed parameters_euler_ec.toml with initial_condition=Trixi.initial_condition_constant" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_ec.toml"), l2 = [5.717218008425079e-16, 6.088971423170968e-16, 6.23130776282275e-16, 7.29884557381127e-16, 5.167198077601542e-15], linf = [3.885780586188048e-15, 4.454769886308441e-15, 3.219646771412954e-15, 4.884981308350689e-15, 4.440892098500626e-14], initial_condition=Trixi.initial_condition_constant) end - @testset "taal-check-me parameters_euler_ec.toml with flux_chandrashekar" begin + @testset "taal-confirmed parameters_euler_ec.toml with flux_chandrashekar" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_ec.toml"), l2 = [0.025105743648126774, 0.016571417754430256, 0.01657141775443023, 0.016565202090289916, 0.09077232065771225], linf = [0.4349225166034201, 0.27945714200874, 0.2794571420087401, 0.28021366413271664, 1.5240679700745954], surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) end - @testset "taal-check-me parameters_euler_ec.toml with flux_kennedry_gruber" begin + @testset "taal-confirmed parameters_euler_ec.toml with flux_kennedy_gruber" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_ec.toml"), l2 = [0.025120431810845507, 0.016599310737401483, 0.01659931073740148, 0.016592567464138185, 0.090856457771812], linf = [0.43120500632996794, 0.28419288751363336, 0.2841928875136334, 0.28583515705222146, 1.515485025725378], surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) end - @testset "taal-check-me parameters_euler_ec.toml with flux_shima_etal" begin + @testset "taal-confirmed parameters_euler_ec.toml with flux_shima_etal" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_ec.toml"), l2 = [0.025099944530993942, 0.016561611274319134, 0.016561611274319127, 0.01655478190136039, 0.09076538812894279], linf = [0.43472962954165273, 0.2824065323711477, 0.2824065323711474, 0.28409419760015847, 1.4995295774522692], From 1dad9cb8a847070666571e494652bd9af0ba8a10 Mon Sep 17 00:00:00 2001 From: Christof Czernik Date: Mon, 9 Nov 2020 16:29:49 +0100 Subject: [PATCH 08/23] euler shockcapturing tests taal-confirmed --- test/test_examples_3d.jl | 16 ++++++++++++++++ test/test_examples_3d_old.jl | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index 71cdb0ff37..758fcde756 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -129,6 +129,22 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.3950327737713353, 0.26324766244272796, 0.2632476624427279, 0.2634129727753079, 1.371321006006725]) end + @testset "taal-confirmed elixir_euler_shockcapturing.toml with initial_condition_sedov_blast_wave" begin + # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.toml"), + l2 = [0.03627060784392582, 0.05178777376859809, 0.05178777376859804, 0.05178777376859802, 0.23043996953698023], + linf = [0.9307998233177583, 1.4326649193439467, 1.4326649193439467, 1.4326649193439467, 12.80585041235138], + initial_condition=Trixi.initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + end + + @testset "taal-confirmed elixir_euler_shockcapturing.toml with initial_condition_sedov_self_gravity" begin + # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.toml"), + l2 = [0.04846527000320781, 0.051787773760055514, 0.051787773760055486, 0.05178777376005548, 0.23043996953467236], + linf = [0.9307979866990295, 1.4326649193456429, 1.4326649193456429, 1.4326649193456429, 12.805850412386896], + initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + end + @testset "taal-confirmed elixir_euler_density_pulse.jl with source_terms_harmonic" begin test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_pulse.jl"), l2 = [0.05719652660597408, 0.0571965266059741, 0.05719652660597407, 0.05719652660597409, 0.08579478990896279], diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index 42d66e1410..a9c6f82ad5 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -141,14 +141,14 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [0.025558219399128387, 0.01612806446620796, 0.016128064466207948, 0.016120400619198158, 0.09208276987000782], linf = [0.3950327737713353, 0.26324766244272796, 0.2632476624427279, 0.2634129727753079, 1.371321006006725]) end - @testset "taal-check-me parameters_euler_shockcapturing.toml with initial_condition_sedov_blast_wave" begin + @testset "taal-confirmed parameters_euler_shockcapturing.toml with initial_condition_sedov_blast_wave" begin # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_shockcapturing.toml"), l2 = [0.03627060784392582, 0.05178777376859809, 0.05178777376859804, 0.05178777376859802, 0.23043996953698023], linf = [0.9307998233177583, 1.4326649193439467, 1.4326649193439467, 1.4326649193439467, 12.80585041235138], initial_condition=Trixi.initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end - @testset "taal-check-me parameters_euler_shockcapturing.toml with initial_condition_sedov_self_gravity" begin + @testset "taal-confirmed parameters_euler_shockcapturing.toml with initial_condition_sedov_self_gravity" begin # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_shockcapturing.toml"), l2 = [0.04846527000320781, 0.051787773760055514, 0.051787773760055486, 0.05178777376005548, 0.23043996953467236], From c3e7226ec7e10f52edb7a9624c5159511d167a7d Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 16:34:07 +0100 Subject: [PATCH 09/23] Fix Hennemann & Gassner indicator 3D --- src/solvers/dg/indicators_3d.jl | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/solvers/dg/indicators_3d.jl b/src/solvers/dg/indicators_3d.jl index 919b6ce00b..60e2037bd3 100644 --- a/src/solvers/dg/indicators_3d.jl +++ b/src/solvers/dg/indicators_3d.jl @@ -106,26 +106,22 @@ function (indicator_hg::IndicatorHennemannGassner)(u::AbstractArray{<:Any,5}, # Loop over L2 mortars for mortar in eachmortar(dg, cache) # Get neighboring element ids - lower_left = dg.l2mortars.neighbor_ids[1, l2mortar_id] - lower_right = dg.l2mortars.neighbor_ids[2, l2mortar_id] - upper_left = dg.l2mortars.neighbor_ids[3, l2mortar_id] - upper_right = dg.l2mortars.neighbor_ids[4, l2mortar_id] - large = dg.l2mortars.neighbor_ids[5, l2mortar_id] + lower_left = cache.mortars.neighbor_ids[1, mortar] + lower_right = cache.mortars.neighbor_ids[2, mortar] + upper_left = cache.mortars.neighbor_ids[3, mortar] + upper_right = cache.mortars.neighbor_ids[4, mortar] + large = cache.mortars.neighbor_ids[5, mortar] # Apply smoothing - alpha[lower_left] = max(alpha_pre_smooth[lower_left], - 0.5 * alpha_pre_smooth[large], alpha[lower_left]) - alpha[lower_right] = max(alpha_pre_smooth[lower_right], - 0.5 * alpha_pre_smooth[large], alpha[lower_right]) - alpha[upper_left] = max(alpha_pre_smooth[upper_left], - 0.5 * alpha_pre_smooth[large], alpha[upper_left]) - alpha[upper_right] = max(alpha_pre_smooth[upper_right], - 0.5 * alpha_pre_smooth[large], alpha[upper_right]) - - alpha[large] = max(alpha_pre_smooth[large], 0.5 * alpha_pre_smooth[lower_left], alpha[large]) - alpha[large] = max(alpha_pre_smooth[large], 0.5 * alpha_pre_smooth[lower_right], alpha[large]) - alpha[large] = max(alpha_pre_smooth[large], 0.5 * alpha_pre_smooth[upper_left], alpha[large]) - alpha[large] = max(alpha_pre_smooth[large], 0.5 * alpha_pre_smooth[upper_right], alpha[large]) + alpha[lower_left] = max(alpha_tmp[lower_left], 0.5 * alpha_tmp[large], alpha[lower_left]) + alpha[lower_right] = max(alpha_tmp[lower_right], 0.5 * alpha_tmp[large], alpha[lower_right]) + alpha[upper_left] = max(alpha_tmp[upper_left], 0.5 * alpha_tmp[large], alpha[upper_left]) + alpha[upper_right] = max(alpha_tmp[upper_right], 0.5 * alpha_tmp[large], alpha[upper_right]) + + alpha[large] = max(alpha_tmp[large], 0.5 * alpha_tmp[lower_left], alpha[large]) + alpha[large] = max(alpha_tmp[large], 0.5 * alpha_tmp[lower_right], alpha[large]) + alpha[large] = max(alpha_tmp[large], 0.5 * alpha_tmp[upper_left], alpha[large]) + alpha[large] = max(alpha_tmp[large], 0.5 * alpha_tmp[upper_right], alpha[large]) end end From 98d551d7d72a8aa854f95a9f8222ee3517d86bee Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 9 Nov 2020 16:45:30 +0100 Subject: [PATCH 10/23] Further improve 3D Sedov elixir (not yet working) --- .../3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl index 8b300fb59f..1b99053370 100644 --- a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl +++ b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl @@ -28,7 +28,8 @@ coordinates_min = (-4, -4, -4) coordinates_max = ( 4, 4, 4) mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level=2, - n_cells_max=1_000_000) + n_cells_max=1_000_000, + periodicity=false) semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver, @@ -49,8 +50,8 @@ amr_indicator = IndicatorHennemannGassner(semi, variable=density_pressure) amr_controller = ControllerThreeLevel(semi, amr_indicator, - base_level=4, - max_level =6, max_threshold=0.01) + base_level=2, + max_level =7, max_threshold=0.0003) amr_callback = AMRCallback(semi, amr_controller, interval=1, From 31a2aa671f7c777a55d82a87c98b86f4eb39f933 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 05:20:00 +0100 Subject: [PATCH 11/23] Fix elixir --- examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl index 1b99053370..546e78fe72 100644 --- a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl +++ b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl @@ -47,6 +47,7 @@ summary_callback = SummaryCallback() amr_indicator = IndicatorHennemannGassner(semi, alpha_max=1.0, alpha_min=0.0, + alpha_smooth=false, variable=density_pressure) amr_controller = ControllerThreeLevel(semi, amr_indicator, From f8b830df8a2c5e7593b4e6d7ee607e08f1e23e45 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 05:34:58 +0100 Subject: [PATCH 12/23] Mark Taam as confirmed --- test/test_examples_3d_old.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index a9c6f82ad5..676214f1d2 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -212,7 +212,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " t_end = 0.06) end # too expensive for CI - # @testset "taal-check-me parameters_euler_sedov_blast_wave_shockcapturing_amr.toml with n_steps_max = 2" begin + # @testset "taal-confirmed parameters_euler_sedov_blast_wave_shockcapturing_amr.toml with n_steps_max = 2" begin # test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_sedov_blast_wave_shockcapturing_amr.toml"), # l2 = [0.00015213881280510253, 0.001481110249423103, 0.0014811102494231387, 0.001481110249423187, 0.002940437008367858], # linf = [0.03254534843490764, 0.38932044051654113, 0.38932044051654097, 0.38932044051654097, 1.050399588579145], From a99a19ad08612db7fcd664e4afe6730bbeda993b Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 05:40:53 +0100 Subject: [PATCH 13/23] Add #DOF and #elements to default analysis output --- src/callbacks/analysis.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/callbacks/analysis.jl b/src/callbacks/analysis.jl index 09e199b29b..3dc44e4f06 100644 --- a/src/callbacks/analysis.jl +++ b/src/callbacks/analysis.jl @@ -164,6 +164,8 @@ function (analysis_callback::AnalysisCallback)(integrator) " " * " Time/DOF/rhs!: " * @sprintf("%10.8e s", runtime_relative)) println(" sim. time: " * @sprintf("%10.8e", t)) + println(" #DOF: " * @sprintf("% 14d", ndofs(semi))) + println(" #elements: " * @sprintf("% 14d", nelements(solver, cache))) # Level information (only show for AMR) uses_amr = false @@ -187,7 +189,6 @@ function (analysis_callback::AnalysisCallback)(integrator) max_level = max(max_level, current_level) end - println(" #elements: " * @sprintf("% 14d", nelements(solver, cache))) for level = max_level:-1:min_level+1 println(" ├── level $level: " * @sprintf("% 14d", count(isequal(level), levels))) end From 82391a12e5c4d6695d990ca5fde5ae44e0dbda54 Mon Sep 17 00:00:00 2001 From: Christof Czernik Date: Tue, 10 Nov 2020 09:54:53 +0100 Subject: [PATCH 14/23] euler-shockcapturing_amr elixir/parameter build, but not identical yet, last file standing! --- .../3d/elixir_euler_shockcapturing_amr.jl | 85 +++++++++++++++++++ .../parameters_euler_shockcapturing_amr.toml | 55 ++++++++++++ test/test_examples_3d.jl | 39 ++++++--- test/test_examples_3d_old.jl | 4 +- 4 files changed, 169 insertions(+), 14 deletions(-) create mode 100644 examples/3d/elixir_euler_shockcapturing_amr.jl create mode 100644 examples/3d/parameters_euler_shockcapturing_amr.toml diff --git a/examples/3d/elixir_euler_shockcapturing_amr.jl b/examples/3d/elixir_euler_shockcapturing_amr.jl new file mode 100644 index 0000000000..582c9076d7 --- /dev/null +++ b/examples/3d/elixir_euler_shockcapturing_amr.jl @@ -0,0 +1,85 @@ + +using OrdinaryDiffEq +using Trixi + +############################################################################### +# semidiscretization of the compressible Euler equations + +equations = CompressibleEulerEquations3D(1.4) + +initial_condition = initial_condition_weak_blast_wave + +surface_flux = flux_ranocha # OBS! Using a non-dissipative flux is only sensible to test EC, + # but not for real shock simulations +volume_flux = flux_ranocha +polydeg = 3 +basis = LobattoLegendreBasis(polydeg) +indicator_sc = IndicatorHennemannGassner(equations, basis, + alpha_max=0.5, + alpha_min=0.001, + alpha_smooth=true, + variable=density_pressure) +volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; + volume_flux_dg=volume_flux, + volume_flux_fv=surface_flux) +solver = DGSEM(basis, surface_flux, volume_integral) + +coordinates_min = (-2, -2, -2) +coordinates_max = ( 2, 2, 2) +mesh = TreeMesh(coordinates_min, coordinates_max, + initial_refinement_level=3, + n_cells_max=100_000) + + +semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver) + + +############################################################################### +# ODE solvers, callbacks etc. + +tspan = (0.0, 0.4) +ode = semidiscretize(semi, tspan) + +summary_callback = SummaryCallback() + + +amr_indicator = IndicatorHennemannGassner(semi, + alpha_smooth=false, + variable=density_pressure) + +amr_controller = ControllerThreeLevel(semi, amr_indicator, + base_level=2, + max_level =7, max_threshold=0.0003) + +amr_callback = AMRCallback(semi, amr_controller, + interval=1, + adapt_initial_condition=true, + adapt_initial_condition_only_refine=true) + +# FIXME Taal restore after Taam sync to something better +stepsize_callback = StepsizeCallback(cfl=0.5) + +save_solution = SaveSolutionCallback(interval=100, + save_initial_solution=true, + save_final_solution=true, + solution_variables=:primitive) + +save_restart = SaveRestartCallback(interval=100, + save_final_restart=true) + +analysis_interval = 100 +alive_callback = AliveCallback(analysis_interval=analysis_interval) +analysis_callback = AnalysisCallback(semi, interval=analysis_interval) + +callbacks = CallbackSet(summary_callback, stepsize_callback, + save_restart, save_solution, + analysis_callback, alive_callback) + + +############################################################################### +# run the simulation + +sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback + save_everystep=false, callback=callbacks); +summary_callback() # print the timer summary + diff --git a/examples/3d/parameters_euler_shockcapturing_amr.toml b/examples/3d/parameters_euler_shockcapturing_amr.toml new file mode 100644 index 0000000000..10b654ae4f --- /dev/null +++ b/examples/3d/parameters_euler_shockcapturing_amr.toml @@ -0,0 +1,55 @@ +#################################################################################################### +# Simulation +ndims = 3 +equations = "CompressibleEulerEquations" + +initial_condition = "initial_condition_weak_blast_wave" +t_start = 0.0 +t_end = 0.4 + +# restart = true +# restart_filename = "out/restart_000100.h5" + + +#################################################################################################### +# Solver +solver = "dg" +polydeg = 3 +cfl = 0.5 +n_steps_max = 10 +analysis_interval = 100 +volume_integral_type = "shock_capturing" +surface_flux = "flux_ranocha" # OBS! Using a non-dissipative flux is only sensible to test EC, + # but not for real shock simulations +volume_flux = "flux_ranocha" + +shock_indicator_variable = "density_pressure" +shock_alpha_min = 0.001 +shock_alpha_max = 0.5 +shock_alpha_smooth = true + + +#################################################################################################### +# Mesh +n_cells_max = 100000 +coordinates_min = [-2, -2, -2] +coordinates_max = [2, 2, 2] +initial_refinement_level = 3 +max_refinement_level = 4 +# refinement_patches = [ +# {type = "box", coordinates_min = [0.0, -10.0], coordinates_max = [10.0, 10.0]}, +# ] +# AMR +amr_indicator = "sedov_self_gravity" +amr_interval = 1 +#amr_alpha_max = 1.0 +#amr_alpha_min = 0.0 + + +#################################################################################################### +# I/O +# save_initial_solution = false +solution_interval = 100 +solution_variables = "primitive" +restart_interval = 10 +output_format = "hdf5" diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index 758fcde756..c8eab57f92 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -109,6 +109,13 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.0016329580288680923, 0.0029870270738030775, 0.009177053066089513, 0.009177053066084184]) end + @testset "taal-confirmed elixir_hyp_diff_llf.jl with initial_refinement_level=2, surface_flux=Trixi.flux_upwind)" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_hyp_diff_llf.jl"), + l2 = [0.0015377708559180534, 0.011376842329542572, 0.011376842329542624, 0.0113768423295426], + linf = [0.02271542063004106, 0.10191067906109286, 0.10191067906109552, 0.10191067906109286], + initial_refinement_level=2, surface_flux=Trixi.flux_upwind) + end + @testset "taal-confirmed elixir_euler_mortar.jl" begin test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_mortar.jl"), l2 = [0.0019011097431965655, 0.0018289464087588392, 0.0018289464087585998, 0.0018289464087588862, 0.003354766311541738], @@ -129,17 +136,17 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.3950327737713353, 0.26324766244272796, 0.2632476624427279, 0.2634129727753079, 1.371321006006725]) end - @testset "taal-confirmed elixir_euler_shockcapturing.toml with initial_condition_sedov_blast_wave" begin + @testset "taal-confirmed elixir_euler_shockcapturing.jl with initial_condition_sedov_blast_wave" begin # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.toml"), + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), l2 = [0.03627060784392582, 0.05178777376859809, 0.05178777376859804, 0.05178777376859802, 0.23043996953698023], linf = [0.9307998233177583, 1.4326649193439467, 1.4326649193439467, 1.4326649193439467, 12.80585041235138], initial_condition=Trixi.initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end - @testset "taal-confirmed elixir_euler_shockcapturing.toml with initial_condition_sedov_self_gravity" begin + @testset "taal-confirmed elixir_euler_shockcapturing.jl with initial_condition_sedov_self_gravity" begin # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.toml"), + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), l2 = [0.04846527000320781, 0.051787773760055514, 0.051787773760055486, 0.05178777376005548, 0.23043996953467236], linf = [0.9307979866990295, 1.4326649193456429, 1.4326649193456429, 1.4326649193456429, 12.805850412386896], initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) @@ -158,29 +165,29 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.43498932208478724, 0.2821813924028202, 0.28218139240282025, 0.2838043627560838, 1.5002293438086647]) end - @testset "taal-confirmed elixir_euler_ec.toml with initial_condition=Trixi.initial_condition_constant" begin - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + @testset "taal-confirmed elixir_euler_ec.jl with initial_condition=Trixi.initial_condition_constant" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2 = [5.717218008425079e-16, 6.088971423170968e-16, 6.23130776282275e-16, 7.29884557381127e-16, 5.167198077601542e-15], linf = [3.885780586188048e-15, 4.454769886308441e-15, 3.219646771412954e-15, 4.884981308350689e-15, 4.440892098500626e-14], initial_condition=Trixi.initial_condition_constant) end - @testset "taal-confirmed elixir_euler_ec.toml with flux_chandrashekar" begin - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + @testset "taal-confirmed elixir_euler_ec.jl with flux_chandrashekar" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2 = [0.025105743648126774, 0.016571417754430256, 0.01657141775443023, 0.016565202090289916, 0.09077232065771225], linf = [0.4349225166034201, 0.27945714200874, 0.2794571420087401, 0.28021366413271664, 1.5240679700745954], surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) end - @testset "taal-confirmed elixir_euler_ec.toml with flux_kennedy_gruber" begin - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + @testset "taal-confirmed elixir_euler_ec.jl with flux_kennedy_gruber" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2 = [0.025120431810845507, 0.016599310737401483, 0.01659931073740148, 0.016592567464138185, 0.090856457771812], linf = [0.43120500632996794, 0.28419288751363336, 0.2841928875136334, 0.28583515705222146, 1.515485025725378], surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) end - @testset "taal-confirmed elixir_euler_ec.toml with flux_shima_etal" begin - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.toml"), + @testset "taal-confirmed elixir_euler_ec.jl with flux_shima_etal" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2 = [0.025099944530993942, 0.016561611274319134, 0.016561611274319127, 0.01655478190136039, 0.09076538812894279], linf = [0.43472962954165273, 0.2824065323711477, 0.2824065323711474, 0.28409419760015847, 1.4995295774522692], surface_flux=flux_shima_etal, volume_flux=flux_shima_etal) @@ -192,6 +199,14 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.2645851360519166, 0.33611482816103344, 0.33611482816103466, 0.36952265576762666, 1.230825809630423, 0.09818527443798974, 0.09818527443798908, 0.10507242371450054, 0.008456471524217968]) end + @testset "taal-confirmed elixir_mhd_ec.jl with initial_condition=Trixi.initial_condition_constant" begin + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), + l2 = [4.850506049646793e-16, 2.4804155700127237e-15, 3.579471462379534e-15, 2.7395862184339726e-15, 2.4916602560342516e-14, 1.669368799061149e-15, 1.4052897861706032e-15, 1.0685989093080367e-15, 1.1611070325375158e-15], + linf = [3.552713678800501e-15, 1.4710455076283324e-14, 2.3814283878209608e-14, 2.6423307986078726e-14, 1.6342482922482304e-13, 1.1546319456101628e-14, 1.0880185641326534e-14, 1.4099832412739488e-14, 1.1483287543575534e-14], + atol = 1000*eps(), + initial_condition=Trixi.initial_condition_constant) + end + @testset "taal-confirmed elixir_mhd_alfven_wave.jl" begin test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), l2 = [0.0038729054515012624, 0.00903693761037057, 0.0041729297273898815, 0.01160504558506348, 0.006241548790045999, 0.009227641613254402, 0.0034580608435846143, 0.011684993365513006, 0.0022068452165023645], diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index 676214f1d2..691ce2d910 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -170,7 +170,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.022634590339093097, 0.10150613595329361, 0.10150613595329361, 0.10150613595329361], initial_refinement_level=2) end - @testset "taal-check-me parameters_hyp_diff_llf.toml with initial_refinement_level=2, surface_flux=Trixi.flux_upwind)" begin + @testset "taal-confirmed parameters_hyp_diff_llf.toml with initial_refinement_level=2, surface_flux=Trixi.flux_upwind)" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_hyp_diff_llf.toml"), l2 = [0.0015377708559180534, 0.011376842329542572, 0.011376842329542624, 0.0113768423295426], linf = [0.02271542063004106, 0.10191067906109286, 0.10191067906109552, 0.10191067906109286], @@ -186,7 +186,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [0.01921453037426997, 0.01924853398980921, 0.01924853398980923, 0.019247118340533328, 0.08310482412935676, 0.010362656540935251, 0.010362656540935237, 0.010364587080559528, 0.00020760700572485828], linf = [0.2645851360519166, 0.33611482816103344, 0.33611482816103466, 0.36952265576762666, 1.230825809630423, 0.09818527443798974, 0.09818527443798908, 0.10507242371450054, 0.008456471524217968]) end - @testset "taal-check-me parameters_mhd_ec.toml with initial_condition=Trixi.initial_condition_constant" begin + @testset "taal-confirmed parameters_mhd_ec.toml with initial_condition=Trixi.initial_condition_constant" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_mhd_ec.toml"), l2 = [4.850506049646793e-16, 2.4804155700127237e-15, 3.579471462379534e-15, 2.7395862184339726e-15, 2.4916602560342516e-14, 1.669368799061149e-15, 1.4052897861706032e-15, 1.0685989093080367e-15, 1.1611070325375158e-15], linf = [3.552713678800501e-15, 1.4710455076283324e-14, 2.3814283878209608e-14, 2.6423307986078726e-14, 1.6342482922482304e-13, 1.1546319456101628e-14, 1.0880185641326534e-14, 1.4099832412739488e-14, 1.1483287543575534e-14], From 6d8eac2f797083e874be9555da401909b60bc31c Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 10:38:56 +0100 Subject: [PATCH 15/23] Adapt elixir --- examples/3d/elixir_euler_shockcapturing_amr.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/3d/elixir_euler_shockcapturing_amr.jl b/examples/3d/elixir_euler_shockcapturing_amr.jl index 582c9076d7..b1b4a407da 100644 --- a/examples/3d/elixir_euler_shockcapturing_amr.jl +++ b/examples/3d/elixir_euler_shockcapturing_amr.jl @@ -49,7 +49,7 @@ amr_indicator = IndicatorHennemannGassner(semi, amr_controller = ControllerThreeLevel(semi, amr_indicator, base_level=2, - max_level =7, max_threshold=0.0003) + max_level =4, max_threshold=0.0003) amr_callback = AMRCallback(semi, amr_controller, interval=1, @@ -71,7 +71,7 @@ analysis_interval = 100 alive_callback = AliveCallback(analysis_interval=analysis_interval) analysis_callback = AnalysisCallback(semi, interval=analysis_interval) -callbacks = CallbackSet(summary_callback, stepsize_callback, +callbacks = CallbackSet(summary_callback, amr_callback, stepsize_callback, save_restart, save_solution, analysis_callback, alive_callback) @@ -80,6 +80,6 @@ callbacks = CallbackSet(summary_callback, stepsize_callback, # run the simulation sol = solve(ode, CarpenterKennedy2N54(williamson_condition=false), dt=1.0, # solve needs some value here but it will be overwritten by the stepsize_callback - save_everystep=false, callback=callbacks); + save_everystep=false, callback=callbacks, maxiters=1e5); summary_callback() # print the timer summary From 5d0941caeb2afa3acd226c43366622a7d7a980c3 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 10:39:19 +0100 Subject: [PATCH 16/23] Remove unnecessary TOML file --- .../parameters_euler_shockcapturing_amr.toml | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 examples/3d/parameters_euler_shockcapturing_amr.toml diff --git a/examples/3d/parameters_euler_shockcapturing_amr.toml b/examples/3d/parameters_euler_shockcapturing_amr.toml deleted file mode 100644 index 10b654ae4f..0000000000 --- a/examples/3d/parameters_euler_shockcapturing_amr.toml +++ /dev/null @@ -1,55 +0,0 @@ -#################################################################################################### -# Simulation -ndims = 3 -equations = "CompressibleEulerEquations" - -initial_condition = "initial_condition_weak_blast_wave" -t_start = 0.0 -t_end = 0.4 - -# restart = true -# restart_filename = "out/restart_000100.h5" - - -#################################################################################################### -# Solver -solver = "dg" -polydeg = 3 -cfl = 0.5 -n_steps_max = 10 -analysis_interval = 100 -volume_integral_type = "shock_capturing" -surface_flux = "flux_ranocha" # OBS! Using a non-dissipative flux is only sensible to test EC, - # but not for real shock simulations -volume_flux = "flux_ranocha" - -shock_indicator_variable = "density_pressure" -shock_alpha_min = 0.001 -shock_alpha_max = 0.5 -shock_alpha_smooth = true - - -#################################################################################################### -# Mesh -n_cells_max = 100000 -coordinates_min = [-2, -2, -2] -coordinates_max = [2, 2, 2] -initial_refinement_level = 3 -max_refinement_level = 4 -# refinement_patches = [ -# {type = "box", coordinates_min = [0.0, -10.0], coordinates_max = [10.0, 10.0]}, -# ] -# AMR -amr_indicator = "sedov_self_gravity" -amr_interval = 1 -#amr_alpha_max = 1.0 -#amr_alpha_min = 0.0 - - -#################################################################################################### -# I/O -# save_initial_solution = false -solution_interval = 100 -solution_variables = "primitive" -restart_interval = 10 -output_format = "hdf5" From 63f80827f5ca2156c89fcd647a56f791208f963c Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 10:45:28 +0100 Subject: [PATCH 17/23] Confirm last 3D test (except blob) --- test/test_examples_3d.jl | 10 ++++++++++ test/test_examples_3d_old.jl | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index c8eab57f92..4c7e5c75dd 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -152,6 +152,16 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end + @testset "taal-confirmed elixir_euler_shockcapturing_amr.jl" begin + # OBS! This setup does not make much practical sense. It is only added to exercise the + # `sedov_self_gravity` AMR indicator, which in its original configuration is too expensive for + # CI testing + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing_amr.jl"), + l2 = [0.022890627324485553, 0.013353127563710173, 0.013353127563710156, 0.013352146925243637, 0.08348119429398775], + linf = [0.3769085161148348, 0.380358363190641, 0.3803583631906434, 0.380366775575835, 1.3162027903728162], + maxiters=10) + end + @testset "taal-confirmed elixir_euler_density_pulse.jl with source_terms_harmonic" begin test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_pulse.jl"), l2 = [0.05719652660597408, 0.0571965266059741, 0.05719652660597407, 0.05719652660597409, 0.08579478990896279], diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index 691ce2d910..a8dbb350a6 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -155,7 +155,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.9307979866990295, 1.4326649193456429, 1.4326649193456429, 1.4326649193456429, 12.805850412386896], initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end - @testset "taal-check-me parameters_euler_shockcapturing.toml with amr_indicator=`sedov_self_gravity`" begin + @testset "taal-confirmed parameters_euler_shockcapturing.toml with amr_indicator=`sedov_self_gravity`" begin # OBS! This setup does not make much practical sense. It is only added to exercise the # `sedov_self_gravity` AMR indicator, which in its original configuration is too expensive for # CI testing From 7f09e7c7ca8a20f78ff45ad9d991e72ed2b50c1c Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 10:46:51 +0100 Subject: [PATCH 18/23] Fix indentatin --- test/test_examples_3d.jl | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index 4c7e5c75dd..d602895a1c 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -110,10 +110,10 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " end @testset "taal-confirmed elixir_hyp_diff_llf.jl with initial_refinement_level=2, surface_flux=Trixi.flux_upwind)" begin - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_hyp_diff_llf.jl"), - l2 = [0.0015377708559180534, 0.011376842329542572, 0.011376842329542624, 0.0113768423295426], - linf = [0.02271542063004106, 0.10191067906109286, 0.10191067906109552, 0.10191067906109286], - initial_refinement_level=2, surface_flux=Trixi.flux_upwind) + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_hyp_diff_llf.jl"), + l2 = [0.0015377708559180534, 0.011376842329542572, 0.011376842329542624, 0.0113768423295426], + linf = [0.02271542063004106, 0.10191067906109286, 0.10191067906109552, 0.10191067906109286], + initial_refinement_level=2, surface_flux=Trixi.flux_upwind) end @testset "taal-confirmed elixir_euler_mortar.jl" begin @@ -124,32 +124,32 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " @testset "taal-confirmed elixir_euler_taylor_green_vortex.jl" begin - test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_taylor_green_vortex.jl"), + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_taylor_green_vortex.jl"), l2 = [0.0003494971047256544, 0.03133386380969968, 0.031333863809699644, 0.04378595081016185, 0.015796569210801217], linf = [0.0013934701399120897, 0.07284947983025436, 0.07284947983025408, 0.12803234075782724, 0.07624639122292365], tspan = (0.0, 0.5)) end @testset "taal-confirmed elixir_euler_shockcapturing.jl" begin - test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), l2 = [0.025558219399128387, 0.01612806446620796, 0.016128064466207948, 0.016120400619198158, 0.09208276987000782], linf = [0.3950327737713353, 0.26324766244272796, 0.2632476624427279, 0.2634129727753079, 1.371321006006725]) end @testset "taal-confirmed elixir_euler_shockcapturing.jl with initial_condition_sedov_blast_wave" begin - # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), - l2 = [0.03627060784392582, 0.05178777376859809, 0.05178777376859804, 0.05178777376859802, 0.23043996953698023], - linf = [0.9307998233177583, 1.4326649193439467, 1.4326649193439467, 1.4326649193439467, 12.80585041235138], - initial_condition=Trixi.initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), + l2 = [0.03627060784392582, 0.05178777376859809, 0.05178777376859804, 0.05178777376859802, 0.23043996953698023], + linf = [0.9307998233177583, 1.4326649193439467, 1.4326649193439467, 1.4326649193439467, 12.80585041235138], + initial_condition=Trixi.initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end @testset "taal-confirmed elixir_euler_shockcapturing.jl with initial_condition_sedov_self_gravity" begin - # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), - l2 = [0.04846527000320781, 0.051787773760055514, 0.051787773760055486, 0.05178777376005548, 0.23043996953467236], - linf = [0.9307979866990295, 1.4326649193456429, 1.4326649193456429, 1.4326649193456429, 12.805850412386896], - initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), + l2 = [0.04846527000320781, 0.051787773760055514, 0.051787773760055486, 0.05178777376005548, 0.23043996953467236], + linf = [0.9307979866990295, 1.4326649193456429, 1.4326649193456429, 1.4326649193456429, 12.805850412386896], + initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end @testset "taal-confirmed elixir_euler_shockcapturing_amr.jl" begin @@ -163,44 +163,44 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " end @testset "taal-confirmed elixir_euler_density_pulse.jl with source_terms_harmonic" begin - test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_pulse.jl"), + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_pulse.jl"), l2 = [0.05719652660597408, 0.0571965266059741, 0.05719652660597407, 0.05719652660597409, 0.08579478990896279], linf = [0.27375961853433606, 0.27375961853433517, 0.27375961853433384, 0.2737596185343343, 0.4106394278015033], source_terms=Trixi.source_terms_harmonic) end @testset "taal-confirmed elixir_euler_ec.jl" begin - test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2 = [0.025101741317688664, 0.01655620530022176, 0.016556205300221737, 0.016549388264402515, 0.09075092792976944], linf = [0.43498932208478724, 0.2821813924028202, 0.28218139240282025, 0.2838043627560838, 1.5002293438086647]) end @testset "taal-confirmed elixir_euler_ec.jl with initial_condition=Trixi.initial_condition_constant" begin test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2 = [5.717218008425079e-16, 6.088971423170968e-16, 6.23130776282275e-16, 7.29884557381127e-16, 5.167198077601542e-15], - linf = [3.885780586188048e-15, 4.454769886308441e-15, 3.219646771412954e-15, 4.884981308350689e-15, 4.440892098500626e-14], - initial_condition=Trixi.initial_condition_constant) + l2 = [5.717218008425079e-16, 6.088971423170968e-16, 6.23130776282275e-16, 7.29884557381127e-16, 5.167198077601542e-15], + linf = [3.885780586188048e-15, 4.454769886308441e-15, 3.219646771412954e-15, 4.884981308350689e-15, 4.440892098500626e-14], + initial_condition=Trixi.initial_condition_constant) end @testset "taal-confirmed elixir_euler_ec.jl with flux_chandrashekar" begin test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2 = [0.025105743648126774, 0.016571417754430256, 0.01657141775443023, 0.016565202090289916, 0.09077232065771225], - linf = [0.4349225166034201, 0.27945714200874, 0.2794571420087401, 0.28021366413271664, 1.5240679700745954], - surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) + l2 = [0.025105743648126774, 0.016571417754430256, 0.01657141775443023, 0.016565202090289916, 0.09077232065771225], + linf = [0.4349225166034201, 0.27945714200874, 0.2794571420087401, 0.28021366413271664, 1.5240679700745954], + surface_flux=flux_chandrashekar, volume_flux=flux_chandrashekar) end @testset "taal-confirmed elixir_euler_ec.jl with flux_kennedy_gruber" begin test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2 = [0.025120431810845507, 0.016599310737401483, 0.01659931073740148, 0.016592567464138185, 0.090856457771812], - linf = [0.43120500632996794, 0.28419288751363336, 0.2841928875136334, 0.28583515705222146, 1.515485025725378], - surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) + l2 = [0.025120431810845507, 0.016599310737401483, 0.01659931073740148, 0.016592567464138185, 0.090856457771812], + linf = [0.43120500632996794, 0.28419288751363336, 0.2841928875136334, 0.28583515705222146, 1.515485025725378], + surface_flux=flux_kennedy_gruber, volume_flux=flux_kennedy_gruber) end @testset "taal-confirmed elixir_euler_ec.jl with flux_shima_etal" begin test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), - l2 = [0.025099944530993942, 0.016561611274319134, 0.016561611274319127, 0.01655478190136039, 0.09076538812894279], - linf = [0.43472962954165273, 0.2824065323711477, 0.2824065323711474, 0.28409419760015847, 1.4995295774522692], - surface_flux=flux_shima_etal, volume_flux=flux_shima_etal) + l2 = [0.025099944530993942, 0.016561611274319134, 0.016561611274319127, 0.01655478190136039, 0.09076538812894279], + linf = [0.43472962954165273, 0.2824065323711477, 0.2824065323711474, 0.28409419760015847, 1.4995295774522692], + surface_flux=flux_shima_etal, volume_flux=flux_shima_etal) end @testset "taal-confirmed elixir_mhd_ec.jl" begin @@ -210,15 +210,15 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " end @testset "taal-confirmed elixir_mhd_ec.jl with initial_condition=Trixi.initial_condition_constant" begin - test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), - l2 = [4.850506049646793e-16, 2.4804155700127237e-15, 3.579471462379534e-15, 2.7395862184339726e-15, 2.4916602560342516e-14, 1.669368799061149e-15, 1.4052897861706032e-15, 1.0685989093080367e-15, 1.1611070325375158e-15], - linf = [3.552713678800501e-15, 1.4710455076283324e-14, 2.3814283878209608e-14, 2.6423307986078726e-14, 1.6342482922482304e-13, 1.1546319456101628e-14, 1.0880185641326534e-14, 1.4099832412739488e-14, 1.1483287543575534e-14], - atol = 1000*eps(), + test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), + l2 = [4.850506049646793e-16, 2.4804155700127237e-15, 3.579471462379534e-15, 2.7395862184339726e-15, 2.4916602560342516e-14, 1.669368799061149e-15, 1.4052897861706032e-15, 1.0685989093080367e-15, 1.1611070325375158e-15], + linf = [3.552713678800501e-15, 1.4710455076283324e-14, 2.3814283878209608e-14, 2.6423307986078726e-14, 1.6342482922482304e-13, 1.1546319456101628e-14, 1.0880185641326534e-14, 1.4099832412739488e-14, 1.1483287543575534e-14], + atol = 1000*eps(), initial_condition=Trixi.initial_condition_constant) end @testset "taal-confirmed elixir_mhd_alfven_wave.jl" begin - test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), + test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"), l2 = [0.0038729054515012624, 0.00903693761037057, 0.0041729297273898815, 0.01160504558506348, 0.006241548790045999, 0.009227641613254402, 0.0034580608435846143, 0.011684993365513006, 0.0022068452165023645], linf = [0.012628629484152443, 0.03265276295369954, 0.012907838374176334, 0.044746702024108326, 0.02796611265824822, 0.03453054781110626, 0.010261557301859958, 0.044762592434299864, 0.010012319622784436]) end From 1f2b5316f0f06f20ce2f052d10b28920ca9462ae Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 11:31:17 +0100 Subject: [PATCH 19/23] Export initial_condition_density_pulse --- examples/3d/elixir_euler_amr.jl | 2 +- examples/3d/elixir_euler_density_pulse.jl | 2 +- src/Trixi.jl | 2 +- test/test_examples_1d.jl | 2 +- test/test_examples_2d.jl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/3d/elixir_euler_amr.jl b/examples/3d/elixir_euler_amr.jl index bcf3e61795..f91e689f45 100644 --- a/examples/3d/elixir_euler_amr.jl +++ b/examples/3d/elixir_euler_amr.jl @@ -7,7 +7,7 @@ using Trixi equations = CompressibleEulerEquations3D(1.4) -initial_condition = Trixi.initial_condition_density_pulse +initial_condition = initial_condition_density_pulse surface_flux = flux_lax_friedrichs solver = DGSEM(3, surface_flux) diff --git a/examples/3d/elixir_euler_density_pulse.jl b/examples/3d/elixir_euler_density_pulse.jl index bd9a0e8ddf..80b904b467 100644 --- a/examples/3d/elixir_euler_density_pulse.jl +++ b/examples/3d/elixir_euler_density_pulse.jl @@ -7,7 +7,7 @@ using Trixi equations = CompressibleEulerEquations3D(1.4) -initial_condition = Trixi.initial_condition_density_pulse +initial_condition = initial_condition_density_pulse surface_flux = flux_ranocha volume_flux = flux_ranocha diff --git a/src/Trixi.jl b/src/Trixi.jl index 80f5fa2c7f..230d4e9220 100644 --- a/src/Trixi.jl +++ b/src/Trixi.jl @@ -79,7 +79,7 @@ export flux_central, flux_lax_friedrichs, flux_hll, flux_upwind, export initial_condition_constant, initial_condition_gauss, - initial_condition_density_wave, + initial_condition_density_wave, initial_condition_density_pulse, initial_condition_isentropic_vortex, initial_condition_khi, initial_condition_weak_blast_wave, initial_condition_blast_wave, diff --git a/test/test_examples_1d.jl b/test/test_examples_1d.jl index 190149be25..c4483449ff 100644 --- a/test/test_examples_1d.jl +++ b/test/test_examples_1d.jl @@ -51,7 +51,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"), l2 = [0.003724642049410045, 0.0037246420494099837, 0.0018623210247047657], linf = [0.018538787219922304, 0.018538787219903874, 0.009269393609915078], - initial_condition = Trixi.initial_condition_density_pulse) + initial_condition = initial_condition_density_pulse) end @testset "taal-confirmed elixir_euler_density_wave.jl with initial_condition_constant" begin diff --git a/test/test_examples_2d.jl b/test/test_examples_2d.jl index b13226f4f3..dffe24816f 100644 --- a/test/test_examples_2d.jl +++ b/test/test_examples_2d.jl @@ -390,7 +390,7 @@ end l2 = [0.003201074851451383, 0.0032010748514513724, 0.0032010748514513716, 0.0032010748514513794], linf = [0.043716393835876444, 0.043716393835876444, 0.043716393835876, 0.04371639383587578], maxiters = 1, - initial_condition = Trixi.initial_condition_density_pulse) + initial_condition = initial_condition_density_pulse) end @testset "taal-confirmed elixir_euler_vortex.jl one step with initial_condition_pressure_pulse" begin From 0f3d051894225ad072fdf743a9ce7247d416cb99 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 11:41:09 +0100 Subject: [PATCH 20/23] Apply suggestions from @ranocha Co-authored-by: Hendrik Ranocha --- examples/3d/elixir_euler_amr.jl | 3 ++- .../3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl | 5 +++-- test/test_examples_3d.jl | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/3d/elixir_euler_amr.jl b/examples/3d/elixir_euler_amr.jl index f91e689f45..859a7ba4ef 100644 --- a/examples/3d/elixir_euler_amr.jl +++ b/examples/3d/elixir_euler_amr.jl @@ -3,7 +3,7 @@ using OrdinaryDiffEq using Trixi ############################################################################### -# semidiscretization of the linear advection equation +# semidiscretization of the compressible Euler equations equations = CompressibleEulerEquations3D(1.4) @@ -39,6 +39,7 @@ amr_callback = AMRCallback(semi, amr_controller, adapt_initial_condition=true, adapt_initial_condition_only_refine=true) +# FIXME Taal restore after Taam sync stepsize_callback = StepsizeCallback(cfl=0.4) save_solution = SaveSolutionCallback(interval=100, diff --git a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl index 546e78fe72..98b0e949b3 100644 --- a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl +++ b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl @@ -20,8 +20,8 @@ indicator_sc = IndicatorHennemannGassner(equations, basis, alpha_smooth=true, variable=density_pressure) volume_integral = VolumeIntegralShockCapturingHG(indicator_sc; - volume_flux_dg=volume_flux, - volume_flux_fv=surface_flux) + volume_flux_dg=volume_flux, + volume_flux_fv=surface_flux) solver = DGSEM(basis, surface_flux, volume_integral) coordinates_min = (-4, -4, -4) @@ -59,6 +59,7 @@ amr_callback = AMRCallback(semi, amr_controller, adapt_initial_condition=true, adapt_initial_condition_only_refine=true) +# FIXME Taal restore after Taam sync stepsize_callback = StepsizeCallback(cfl=0.35) save_solution = SaveSolutionCallback(interval=100, diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index d602895a1c..db51583efa 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -214,7 +214,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [4.850506049646793e-16, 2.4804155700127237e-15, 3.579471462379534e-15, 2.7395862184339726e-15, 2.4916602560342516e-14, 1.669368799061149e-15, 1.4052897861706032e-15, 1.0685989093080367e-15, 1.1611070325375158e-15], linf = [3.552713678800501e-15, 1.4710455076283324e-14, 2.3814283878209608e-14, 2.6423307986078726e-14, 1.6342482922482304e-13, 1.1546319456101628e-14, 1.0880185641326534e-14, 1.4099832412739488e-14, 1.1483287543575534e-14], atol = 1000*eps(), - initial_condition=Trixi.initial_condition_constant) + initial_condition=initial_condition_constant) end @testset "taal-confirmed elixir_mhd_alfven_wave.jl" begin From 258c2543306d12177f83366c72941b6b6073a6c6 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 11:53:21 +0100 Subject: [PATCH 21/23] Remove unnecessary Trixi. prefixes --- .../3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl | 4 ++-- test/test_examples_3d.jl | 2 +- test/test_examples_3d_old.jl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl index 98b0e949b3..68944e5553 100644 --- a/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl +++ b/examples/3d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl @@ -7,8 +7,8 @@ using Trixi equations = CompressibleEulerEquations3D(1.4) -initial_condition = Trixi.initial_condition_sedov_self_gravity -boundary_conditions = Trixi.boundary_condition_sedov_self_gravity +initial_condition = initial_condition_sedov_self_gravity +boundary_conditions = boundary_condition_sedov_self_gravity surface_flux = flux_hll volume_flux = flux_ranocha diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index db51583efa..69e6194c59 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -149,7 +149,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), l2 = [0.04846527000320781, 0.051787773760055514, 0.051787773760055486, 0.05178777376005548, 0.23043996953467236], linf = [0.9307979866990295, 1.4326649193456429, 1.4326649193456429, 1.4326649193456429, 12.805850412386896], - initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + initial_condition=initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end @testset "taal-confirmed elixir_euler_shockcapturing_amr.jl" begin diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index a8dbb350a6..0cb9fc7eb4 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -153,7 +153,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_shockcapturing.toml"), l2 = [0.04846527000320781, 0.051787773760055514, 0.051787773760055486, 0.05178777376005548, 0.23043996953467236], linf = [0.9307979866990295, 1.4326649193456429, 1.4326649193456429, 1.4326649193456429, 12.805850412386896], - initial_condition=Trixi.initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + initial_condition=initial_condition_sedov_self_gravity, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end @testset "taal-confirmed parameters_euler_shockcapturing.toml with amr_indicator=`sedov_self_gravity`" begin # OBS! This setup does not make much practical sense. It is only added to exercise the From b3520bde4a9867eb8360f8e1b0e6caac704252af Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 13:27:44 +0100 Subject: [PATCH 22/23] Remove unnecessary Trixi. prefixes --- test/test_examples_3d.jl | 4 ++-- test/test_examples_3d_old.jl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index 69e6194c59..ec8958ba0c 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -109,11 +109,11 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.0016329580288680923, 0.0029870270738030775, 0.009177053066089513, 0.009177053066084184]) end - @testset "taal-confirmed elixir_hyp_diff_llf.jl with initial_refinement_level=2, surface_flux=Trixi.flux_upwind)" begin + @testset "taal-confirmed elixir_hyp_diff_llf.jl with initial_refinement_level=2, surface_flux=flux_upwind)" begin test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_hyp_diff_llf.jl"), l2 = [0.0015377708559180534, 0.011376842329542572, 0.011376842329542624, 0.0113768423295426], linf = [0.02271542063004106, 0.10191067906109286, 0.10191067906109552, 0.10191067906109286], - initial_refinement_level=2, surface_flux=Trixi.flux_upwind) + initial_refinement_level=2, surface_flux=flux_upwind) end @testset "taal-confirmed elixir_euler_mortar.jl" begin diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index 0cb9fc7eb4..0d4830bca9 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -170,11 +170,11 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.022634590339093097, 0.10150613595329361, 0.10150613595329361, 0.10150613595329361], initial_refinement_level=2) end - @testset "taal-confirmed parameters_hyp_diff_llf.toml with initial_refinement_level=2, surface_flux=Trixi.flux_upwind)" begin + @testset "taal-confirmed parameters_hyp_diff_llf.toml with initial_refinement_level=2, surface_flux=flux_upwind)" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_hyp_diff_llf.toml"), l2 = [0.0015377708559180534, 0.011376842329542572, 0.011376842329542624, 0.0113768423295426], linf = [0.02271542063004106, 0.10191067906109286, 0.10191067906109552, 0.10191067906109286], - initial_refinement_level=2, surface_flux=Trixi.flux_upwind) + initial_refinement_level=2, surface_flux=flux_upwind) end @testset "taal-confirmed parameters_hyp_diff_nonperiodic.toml" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_hyp_diff_nonperiodic.toml"), From a2bedcb0cd92024e7406d3052f2f89393944ad10 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Tue, 10 Nov 2020 14:12:23 +0100 Subject: [PATCH 23/23] Remove unnecessary Trixi. prefixes --- test/test_examples_3d.jl | 10 +++++----- test/test_examples_3d_old.jl | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/test_examples_3d.jl b/test/test_examples_3d.jl index ec8958ba0c..80c9e8e824 100644 --- a/test/test_examples_3d.jl +++ b/test/test_examples_3d.jl @@ -40,7 +40,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"), l2 = [9.770171014620371e-16], linf = [2.4424906541753444e-15], - initial_condition=Trixi.initial_condition_constant) + initial_condition=initial_condition_constant) end @testset "taal-confirmed elixir_advection_basic.jl with initial_condition_linear_z and periodicity=false" begin @@ -141,7 +141,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_shockcapturing.jl"), l2 = [0.03627060784392582, 0.05178777376859809, 0.05178777376859804, 0.05178777376859802, 0.23043996953698023], linf = [0.9307998233177583, 1.4326649193439467, 1.4326649193439467, 1.4326649193439467, 12.80585041235138], - initial_condition=Trixi.initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + initial_condition=initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end @testset "taal-confirmed elixir_euler_shockcapturing.jl with initial_condition_sedov_self_gravity" begin @@ -175,11 +175,11 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.43498932208478724, 0.2821813924028202, 0.28218139240282025, 0.2838043627560838, 1.5002293438086647]) end - @testset "taal-confirmed elixir_euler_ec.jl with initial_condition=Trixi.initial_condition_constant" begin + @testset "taal-confirmed elixir_euler_ec.jl with initial_condition=initial_condition_constant" begin test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"), l2 = [5.717218008425079e-16, 6.088971423170968e-16, 6.23130776282275e-16, 7.29884557381127e-16, 5.167198077601542e-15], linf = [3.885780586188048e-15, 4.454769886308441e-15, 3.219646771412954e-15, 4.884981308350689e-15, 4.440892098500626e-14], - initial_condition=Trixi.initial_condition_constant) + initial_condition=initial_condition_constant) end @testset "taal-confirmed elixir_euler_ec.jl with flux_chandrashekar" begin @@ -209,7 +209,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " linf = [0.2645851360519166, 0.33611482816103344, 0.33611482816103466, 0.36952265576762666, 1.230825809630423, 0.09818527443798974, 0.09818527443798908, 0.10507242371450054, 0.008456471524217968]) end - @testset "taal-confirmed elixir_mhd_ec.jl with initial_condition=Trixi.initial_condition_constant" begin + @testset "taal-confirmed elixir_mhd_ec.jl with initial_condition=initial_condition_constant" begin test_trixi_run(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"), l2 = [4.850506049646793e-16, 2.4804155700127237e-15, 3.579471462379534e-15, 2.7395862184339726e-15, 2.4916602560342516e-14, 1.669368799061149e-15, 1.4052897861706032e-15, 1.0685989093080367e-15, 1.1611070325375158e-15], linf = [3.552713678800501e-15, 1.4710455076283324e-14, 2.3814283878209608e-14, 2.6423307986078726e-14, 1.6342482922482304e-13, 1.1546319456101628e-14, 1.0880185641326534e-14, 1.4099832412739488e-14, 1.1483287543575534e-14], diff --git a/test/test_examples_3d_old.jl b/test/test_examples_3d_old.jl index 0d4830bca9..25b0776c60 100644 --- a/test/test_examples_3d_old.jl +++ b/test/test_examples_3d_old.jl @@ -36,7 +36,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_advection_basic.toml"), l2 = [9.770171014620371e-16], linf = [2.4424906541753444e-15], - initial_condition=Trixi.initial_condition_constant) + initial_condition=initial_condition_constant) end @testset "taal-confirmed parameters_advection_basic.toml with initial_condition_linear_z and periodicity=false" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_advection_basic.toml"), @@ -99,11 +99,11 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [0.025101741317688664, 0.01655620530022176, 0.016556205300221737, 0.016549388264402515, 0.09075092792976944], linf = [0.43498932208478724, 0.2821813924028202, 0.28218139240282025, 0.2838043627560838, 1.5002293438086647]) end - @testset "taal-confirmed parameters_euler_ec.toml with initial_condition=Trixi.initial_condition_constant" begin + @testset "taal-confirmed parameters_euler_ec.toml with initial_condition=initial_condition_constant" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_ec.toml"), l2 = [5.717218008425079e-16, 6.088971423170968e-16, 6.23130776282275e-16, 7.29884557381127e-16, 5.167198077601542e-15], linf = [3.885780586188048e-15, 4.454769886308441e-15, 3.219646771412954e-15, 4.884981308350689e-15, 4.440892098500626e-14], - initial_condition=Trixi.initial_condition_constant) + initial_condition=initial_condition_constant) end @testset "taal-confirmed parameters_euler_ec.toml with flux_chandrashekar" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_ec.toml"), @@ -146,7 +146,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_euler_shockcapturing.toml"), l2 = [0.03627060784392582, 0.05178777376859809, 0.05178777376859804, 0.05178777376859802, 0.23043996953698023], linf = [0.9307998233177583, 1.4326649193439467, 1.4326649193439467, 1.4326649193439467, 12.80585041235138], - initial_condition=Trixi.initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) + initial_condition=initial_condition_sedov_blast_wave, cfl=0.25, shock_alpha_max=1.0, t_end=0.1) end @testset "taal-confirmed parameters_euler_shockcapturing.toml with initial_condition_sedov_self_gravity" begin # OBS! This setup does not run longer but crashes (also the parameters do not make sense) -> only for testing the IC! @@ -186,12 +186,12 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", " l2 = [0.01921453037426997, 0.01924853398980921, 0.01924853398980923, 0.019247118340533328, 0.08310482412935676, 0.010362656540935251, 0.010362656540935237, 0.010364587080559528, 0.00020760700572485828], linf = [0.2645851360519166, 0.33611482816103344, 0.33611482816103466, 0.36952265576762666, 1.230825809630423, 0.09818527443798974, 0.09818527443798908, 0.10507242371450054, 0.008456471524217968]) end - @testset "taal-confirmed parameters_mhd_ec.toml with initial_condition=Trixi.initial_condition_constant" begin + @testset "taal-confirmed parameters_mhd_ec.toml with initial_condition=initial_condition_constant" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_mhd_ec.toml"), l2 = [4.850506049646793e-16, 2.4804155700127237e-15, 3.579471462379534e-15, 2.7395862184339726e-15, 2.4916602560342516e-14, 1.669368799061149e-15, 1.4052897861706032e-15, 1.0685989093080367e-15, 1.1611070325375158e-15], linf = [3.552713678800501e-15, 1.4710455076283324e-14, 2.3814283878209608e-14, 2.6423307986078726e-14, 1.6342482922482304e-13, 1.1546319456101628e-14, 1.0880185641326534e-14, 1.4099832412739488e-14, 1.1483287543575534e-14], atol = 1000*eps(), - initial_condition=Trixi.initial_condition_constant) + initial_condition=initial_condition_constant) end @testset "taal-confirmed parameters_mhd_alfven_wave.toml" begin test_trixi_run(joinpath(EXAMPLES_DIR, "parameters_mhd_alfven_wave.toml"),