Make Taal pass Taam tests

examples/2d/elixir_advection_basic.jl

@@ -67,6 +67,7 @@ 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
+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

examples/3d/elixir_euler_blob_amr.jl

@@ -49,7 +49,9 @@ amr_callback = AMRCallback(semi, amr_controller,
                            adapt_initial_condition=false,
                            adapt_initial_condition_only_refine=true)
 
-stepsize_callback = StepsizeCallback(cfl=1.7)
+# FIXME Taal restore after Taam sync
+# stepsize_callback = StepsizeCallback(cfl=1.7)
+stepsize_callback = StepsizeCallback(cfl=0.9)
 
 save_solution = SaveSolutionCallback(interval=200,
                                      save_initial_solution=true,

examples/3d/parameters_euler_blob_amr.toml

@@ -2,7 +2,7 @@
 # Simulation
 ndims = 3
 equations = "CompressibleEulerEquations"
-gamma = 1.66667
+gamma = 1.6666666666666667
 initial_condition = "initial_condition_blob"
 t_start = 0.0
 t_end   = 2.5

examples/paper-self-gravitating-gas-dynamics/elixir_eulergravity_jeans_instability.jl

@@ -3,42 +3,10 @@ using OrdinaryDiffEq
 using Trixi
 
 
-# If you're developing an elixir for Trixi for some project, you can define
-# initial conditions etc. directly inside the elixir, e.g. using the code below
-# (which is commented out).
-# For example, running
-# trixi_include("examples/2d/elixir_eulergravity_jeans_instability.jl")
-# from the REPL works fine with that setting.
-# However, we're running CI with automated tests of Trixi. In that case,
-# we get annoying world age issues. Hence, we keep initial_condition_jeans_instability
-# in Trixi/src for now.
-#
-# function initial_condition_jeans_instability(x, t,
-#                                             equations::CompressibleEulerEquations2D)
-#   # Jeans gravitational instability test case
-#   # see Derigs et al. https://arxiv.org/abs/1605.03572; Sec. 4.6
-#   # OBS! this uses cgs (centimeter, gram, second) units
-#   # periodic boundaries
-#   # domain size [0,L]^2 depends on the wave number chosen for the perturbation
-#   # OBS! Be very careful here L must be chosen such that problem is periodic
-#   # typical final time is T = 5
-#   # gamma = 5/3
-#   dens0  = 1.5e7 # g/cm^3
-#   pres0  = 1.5e7 # dyn/cm^2
-#   delta0 = 1e-3
-#   # set wave vector values for pertubation (units 1/cm)
-#   # see FLASH manual: https://flash.uchicago.edu/site/flashcode/user_support/flash_ug_devel.pdf
-#   kx = 2.0*pi/0.5 # 2π/λ_x, λ_x = 0.5
-#   ky = 0.0   # 2π/λ_y, λ_y = 1e10
-#   k_dot_x = kx*x[1] + ky*x[2]
-#   # perturb density and pressure away from reference states ρ_0 and p_0
-#   dens = dens0*(1.0 + delta0*cos(k_dot_x))                 # g/cm^3
-#   pres = pres0*(1.0 + equations.gamma*delta0*cos(k_dot_x)) # dyn/cm^2
-#   # flow starts as stationary
-#   velx = 0.0 # cm/s
-#   vely = 0.0 # cm/s
-#   return Trixi.prim2cons((dens, velx, vely, pres), equations)
-# end
+"""
+    initial_condition_jeans_instability(x, t,
+                                        equations::Union{CompressibleEulerEquations2D,
+                                                         HyperbolicDiffusionEquations2D})
 
 The classical Jeans instability taken from
 - Michael Schlottke-Lakemper, Andrew R. Winters, Hendrik Ranocha, Gregor J. Gassner (2020)

src/Trixi.jl

@@ -17,8 +17,8 @@ module Trixi
 using LinearAlgebra: dot
 using Pkg.TOML: parsefile, parse
 using Printf: @printf, @sprintf, println
-using Profile: clear_malloc_data
-using Random: seed! # TODO: Taal, can be removed
+using Profile: clear_malloc_data # TODO: Taal, remove this dependency
+using Random: seed! # TODO: Taal, remove this dependency
 
 import DiffEqBase: ODEProblem, ODESolution, get_du, u_modified!, set_proposed_dt!, terminate!
 using DiffEqCallbacks: CallbackSet, DiscreteCallback

test/test_examples_1d.jl

@@ -17,64 +17,64 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "
 # Run basic tests
 @testset "Examples 1D" begin
   @testset "taal-confirmed elixir_advection_basic.jl" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
       l2   = [5.581321238071356e-6],
       linf = [3.270561745361e-5])
   end
 
   @testset "taal-confirmed elixir_advection_amr.jl" begin
-  test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"),
+  @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr.jl"),
       l2   = [0.3540209654959832],
       linf = [0.9999905446337742])
   end
 
   @testset "taal-confirmed elixir_advection_amr_nonperiodic.jl" begin
-  test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_nonperiodic.jl"),
+  @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_amr_nonperiodic.jl"),
       l2   = [4.317984162166343e-6],
       linf = [3.239622040581043e-5])
   end
 
 
   @testset "taal-confirmed elixir_euler_source_terms.jl" begin
-  test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"),
+  @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"),
       l2   = [2.243591980786875e-8, 1.8007794300157155e-8, 7.701353735993148e-8],
       linf = [1.6169171668245497e-7, 1.4838378192827406e-7, 5.407841152660353e-7])
   end
 
   @testset "taal-confirmed elixir_euler_density_wave.jl" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"),
       l2   = [0.0011482554828446659, 0.00011482554838682677, 5.741277410494742e-6],
       linf = [0.004090978306810378, 0.0004090978313616156, 2.045489169688608e-5])
   end
 
   @testset "taal-confirmed elixir_euler_density_wave.jl with initial_condition_density_pulse" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"),
+    @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 = initial_condition_density_pulse)
   end
 
   @testset "taal-confirmed elixir_euler_density_wave.jl with initial_condition_constant" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_density_wave.jl"),
       l2   = [7.058654266604569e-16, 1.9703187362332313e-14, 7.286819681608443e-15],
       linf = [3.774758283725532e-15, 6.733502644351574e-14, 2.4868995751603507e-14],
       initial_condition = initial_condition_constant)
   end
 
   @testset "taal-confirmed elixir_euler_nonperiodic.jl" begin
-  test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_nonperiodic.jl"),
+  @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_nonperiodic.jl"),
       l2   = [3.8103398423084437e-6, 1.6765350427819571e-6, 7.733123446821975e-6],
       linf = [1.2975101617795914e-5, 9.274867029507305e-6, 3.093686036947929e-5])
   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.11948926375393912, 0.15554606230413676, 0.4466895989733186],
       linf = [0.2956500342985863, 0.28341906267346123, 1.0655211913235232])
   end
 
   @testset "taal-confirmed elixir_euler_ec.jl with flux_shima_etal" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"),
       l2   = [0.06423364669980625, 0.08503530800170918, 0.2407844935006154],
       linf = [0.3212150514022287, 0.3070502221852398, 1.1446658347785068],
       maxiters=10,
@@ -83,7 +83,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "
   end
 
   @testset "taal-confirmed elixir_euler_ec.jl with flux_ranocha" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"),
       l2   = [0.06424564531300972, 0.08500942143178748, 0.2407606831620822],
       linf = [0.3215742010701772, 0.30592054370082256, 1.1453122141121064],
       maxiters=10,
@@ -92,7 +92,7 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "
   end
 
   @testset "taal-confirmed elixir_euler_ec.jl with flux_hll" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"),
       l2   = [0.0575654253650954, 0.0748264642646861, 0.21532027367350406],
       linf = [0.17289848639699257, 0.22023865765090028, 0.6349097763679086],
       maxiters=10,
@@ -101,33 +101,33 @@ const EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "
   end
 
   @testset "taal-confirmed elixir_euler_sedov_blast_wave_shockcapturing_amr.jl" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_shockcapturing_amr.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_shockcapturing_amr.jl"),
       l2   = [1.252250990134887, 0.068566581088377, 0.9448804645921002],
       linf = [2.989362275712484, 0.16948139637812973, 2.665646470846281])
   end
 
   @testset "taal-confirmed elixir_euler_sedov_blast_wave_shockcapturing_amr.jl with pressure" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_shockcapturing_amr.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_shockcapturing_amr.jl"),
       l2   = [1.297435677146544, 0.07960523576439762, 0.9453356096003658],
       linf = [3.1803117766542313, 0.21385627917778924, 2.665017066963603],
       shock_indicator_variable = pressure)
   end
 
   @testset "taal-confirmed elixir_euler_sedov_blast_wave_shockcapturing_amr.jl with density" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_shockcapturing_amr.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave_shockcapturing_amr.jl"),
       l2   = [1.2778131494486642, 0.0709461986289949, 0.9456057083034296],
       linf = [3.1163652756237115, 0.17652352860779985, 2.66646958937844],
       shock_indicator_variable = density)
   end
 
   @testset "taal-confirmed elixir_euler_weak_blast_wave_shockcapturing.jl" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weak_blast_wave_shockcapturing.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_weak_blast_wave_shockcapturing.jl"),
       l2   = [0.1166063015913971, 0.15097998823740955, 0.4348178492249418],
       linf = [0.1872570975062362, 0.245999816865685, 0.7037939282238272])
   end
 
   @testset "taal-confirmed elixir_euler_blast_wave_shockcapturing.jl" begin
-  test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_shockcapturing.jl"),
+  @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_blast_wave_shockcapturing.jl"),
       l2   = [0.21530530948120738, 0.2805965425286348, 0.5591770920395336],
       linf = [1.508388610723991, 1.5622010377944118, 2.035149673163788],
       maxiters=30)
@@ -138,22 +138,22 @@ end
 @testset "Tests for initial conditions" begin
   # Linear scalar advection
   @testset "taal-confirmed elixir_advection_basic.jl with initial_condition_sin" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
       l2   = [9.506162481381351e-5],
       linf = [0.00017492510098227054],
       maxiters = 1,
       initial_condition = Trixi.initial_condition_sin)
   end
   @testset "taal-confirmed elixir_advection_basic.jl with initial_condition_constant" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
       l2   = [6.120436421866528e-16],
       linf = [1.3322676295501878e-15],
       maxiters = 1,
       initial_condition = initial_condition_constant)
   end
   @testset "taal-confirmed elixir_advection_basic.jl with initial_condition_linear_x" begin
     # TODO Taal: create separate `*_linear_x.jl` elixir to keep `basic` simple
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
       l2   = [7.602419413667044e-17],
       linf = [2.220446049250313e-16],
       maxiters = 1,
@@ -162,7 +162,7 @@ end
       periodicity=false)
   end
   @testset "taal-confirmed elixir_advection_basic.jl with initial_condition_convergence_test" begin
-    test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
       l2   = [2.9989673704826656e-6],
       linf = [5.841215237722963e-6],
       maxiters = 1,