trixi-framework · sloede · Oct 27, 2020 · Oct 27, 2020 · Oct 27, 2020 · Oct 27, 2020
diff --git a/examples/1d/elixir_advection_amr.jl b/examples/1d/elixir_advection_amr.jl
@@ -40,7 +40,7 @@ amr_callback = AMRCallback(semi, amr_controller,
                            adapt_initial_condition=true,
                            adapt_initial_condition_only_refine=true)
 
-stepsize_callback = StepsizeCallback(cfl=1.6)
+stepsize_callback = StepsizeCallback(cfl=0.8)
 
 save_solution = SaveSolutionCallback(interval=100,
                                      save_initial_solution=true,

diff --git a/examples/1d/parameters_advection_basic.toml b/examples/1d/parameters_advection_basic.toml
@@ -20,7 +20,7 @@ t_end   = 1.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.2
+cfl = 1.6
 n_steps_max = 10000
 analysis_interval = 2000
 alive_interval = 0

diff --git a/examples/1d/parameters_euler_blast_wave_shockcapturing.toml b/examples/1d/parameters_euler_blast_wave_shockcapturing.toml
@@ -15,7 +15,7 @@ t_end   = 12.5
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 0.8
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "shock_capturing"

diff --git a/examples/1d/parameters_euler_ec.toml b/examples/1d/parameters_euler_ec.toml
@@ -25,7 +25,7 @@ t_end   = 0.4
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 1000
 alive_interval = 0

diff --git a/examples/1d/parameters_euler_nonperiodic.toml b/examples/1d/parameters_euler_nonperiodic.toml
@@ -18,7 +18,7 @@ t_end   = 2.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.2
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 100
 

diff --git a/examples/1d/parameters_euler_source_terms.toml b/examples/1d/parameters_euler_source_terms.toml
@@ -17,7 +17,7 @@ t_end   = 2.0
 # Solver
 solver = "dg"
 polydeg = 4
-cfl = 0.6
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 2000
 alive_interval=0

diff --git a/examples/2d/elixir_euler_blob_mortar_shockcapturing.jl b/examples/2d/elixir_euler_blob_mortar_shockcapturing.jl
@@ -14,7 +14,7 @@ volume_flux  = flux_chandrashekar
 basis = LobattoLegendreBasis(3)
 
 indicator_sc = IndicatorHennemannGassner(equations, basis,
-                                         alpha_max=0.5,
+                                         alpha_max=0.05,
                                          alpha_min=0.0001,
                                          alpha_smooth=true,
                                          variable=pressure)
@@ -29,6 +29,7 @@ coordinates_min = (-32, -32)
 coordinates_max = ( 32,  32)
 refinement_patches = (
   (type="box", coordinates_min=(-40, -5), coordinates_max=(40, 5)),
+  (type="box", coordinates_min=(-40, -5), coordinates_max=(40, 5)),
 )
 mesh = TreeMesh(coordinates_min, coordinates_max,
                 initial_refinement_level=4,

diff --git a/examples/2d/elixir_euler_blob_shockcapturing_amr.jl b/examples/2d/elixir_euler_blob_shockcapturing_amr.jl
@@ -46,12 +46,13 @@ summary_callback = SummaryCallback()
 amr_indicator = IndicatorHennemannGassner(semi,
                                           alpha_max=1.0,
                                           alpha_min=0.0001,
-                                          alpha_smooth=true,
-                                          variable=pressure)
-amr_controller = ControllerThreeLevel(semi, amr_indicator,
-                                      base_level=4,
-                                      med_level =7, med_threshold=0.003,
-                                      max_level =7, max_threshold=0.3)
+                                          alpha_smooth=false,
+                                          variable=density)
+amr_controller = ControllerThreeLevelCombined(semi, amr_indicator, indicator_sc,
+                                              base_level=4,
+                                              med_level =0, med_threshold=0.0003, # med_level = current level
+                                              max_level =7, max_threshold=0.003,
+                                              max_threshold_secondary=indicator_sc.alpha_max)
 amr_callback = AMRCallback(semi, amr_controller,
                            interval=1,
                            adapt_initial_condition=true,

diff --git a/examples/2d/elixir_euler_khi_shockcapturing.jl b/examples/2d/elixir_euler_khi_shockcapturing.jl
@@ -1,4 +1,5 @@
 
+using Random: seed!
 using OrdinaryDiffEq
 using Trixi
 
@@ -7,6 +8,7 @@ using Trixi
 gamma = 1.4
 equations = CompressibleEulerEquations2D(gamma)
 
+seed!(0)
 initial_condition = initial_condition_khi
 
 surface_flux = flux_lax_friedrichs

diff --git a/examples/2d/elixir_euler_khi_shockcapturing_amr.jl b/examples/2d/elixir_euler_khi_shockcapturing_amr.jl
@@ -46,11 +46,12 @@ summary_callback = SummaryCallback()
 amr_indicator = IndicatorHennemannGassner(semi,
                                           alpha_max=1.0,
                                           alpha_min=0.0001,
-                                          alpha_smooth=true,
+                                          alpha_smooth=false,
                                           variable=density)
 amr_controller = ControllerThreeLevel(semi, amr_indicator,
-                                      base_level=4, med_threshold=0.0003,
-                                      max_level =6, max_threshold=0.003)
+                                      base_level=4,
+                                      med_level=0, med_threshold=0.0003, # med_level = current level
+                                      max_level=6, max_threshold=0.003)
 amr_callback = AMRCallback(semi, amr_controller,
                            interval=1,
                            adapt_initial_condition=true,

diff --git a/examples/2d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl b/examples/2d/elixir_euler_sedov_blast_wave_shockcapturing_amr.jl
@@ -53,7 +53,7 @@ amr_callback = AMRCallback(semi, amr_controller,
                            adapt_initial_condition=true,
                            adapt_initial_condition_only_refine=true)
 
-stepsize_callback = StepsizeCallback(cfl=1.0)
+stepsize_callback = StepsizeCallback(cfl=0.8)
 
 save_solution = SaveSolutionCallback(interval=100,
                                      save_initial_solution=true,

diff --git a/...elixir_euler_gravity_jeans_instability.jl → .../elixir_eulergravity_jeans_instability.jl b/...elixir_euler_gravity_jeans_instability.jl → .../elixir_eulergravity_jeans_instability.jl
diff --git a/...ty_sedov_blast_wave_shockcapturing_amr.jl → ...ty_sedov_blast_wave_shockcapturing_amr.jl b/...ty_sedov_blast_wave_shockcapturing_amr.jl → ...ty_sedov_blast_wave_shockcapturing_amr.jl
diff --git a/examples/2d/elixir_mhd_orszag_tang_shockcapturing_amr.jl b/examples/2d/elixir_mhd_orszag_tang_shockcapturing_amr.jl
@@ -14,7 +14,7 @@ equations = IdealGlmMhdEquations2D(gamma)
 
 initial_condition = initial_condition_orszag_tang
 
-surface_flux = flux_hll
+surface_flux = flux_lax_friedrichs
 volume_flux  = flux_central
 basis = LobattoLegendreBasis(3)
 indicator_sc = IndicatorHennemannGassner(equations, basis,
@@ -48,13 +48,13 @@ summary_callback = SummaryCallback()
 amr_indicator = IndicatorHennemannGassner(semi,
                                           alpha_max=0.5,
                                           alpha_min=0.001,
-                                          alpha_smooth=true,
+                                          alpha_smooth=false,
                                           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=5,
+                           interval=6,
                            adapt_initial_condition=true,
                            adapt_initial_condition_only_refine=true)
 

diff --git a/examples/2d/elixir_mhd_rotor_shockcapturing_amr.jl b/examples/2d/elixir_mhd_rotor_shockcapturing_amr.jl
@@ -47,13 +47,13 @@ summary_callback = SummaryCallback()
 amr_indicator = IndicatorHennemannGassner(semi,
                                           alpha_max=0.5,
                                           alpha_min=0.001,
-                                          alpha_smooth=true,
+                                          alpha_smooth=false,
                                           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=5,
+                           interval=6,
                            adapt_initial_condition=true,
                            adapt_initial_condition_only_refine=true)
 

diff --git a/examples/2d/parameters_euler_blast_wave_shockcapturing.toml b/examples/2d/parameters_euler_blast_wave_shockcapturing.toml
@@ -15,7 +15,7 @@ t_end   = 12.5
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "shock_capturing"

diff --git a/examples/2d/parameters_euler_blast_wave_shockcapturing_amr.toml b/examples/2d/parameters_euler_blast_wave_shockcapturing_amr.toml
@@ -15,7 +15,7 @@ t_end   = 12.5
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "shock_capturing"

diff --git a/...ler_blob_mortar_split_shockcapturing.toml → ...ers_euler_blob_mortar_shockcapturing.toml b/...ler_blob_mortar_split_shockcapturing.toml → ...ers_euler_blob_mortar_shockcapturing.toml
@@ -2,7 +2,7 @@
 # Simulation
 ndims = 2
 equations = "CompressibleEulerEquations"
-gamma = 1.66667
+gamma = 1.666666666666667
 # equations = "LinearScalarAdvectionEquation"
 # advectionvelocity = [1.0, 1.0] # Need only for linarscalaradvection
 # initial_condition = "initial_condition_convergence_test"
@@ -22,7 +22,7 @@ t_end   = 16.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 0.7
 n_steps_max = 10000
 analysis_interval = 100
 shock_indicator_variable = "pressure"

diff --git a/..._euler_blob_split_shockcapturing_amr.toml → ...meters_euler_blob_shockcapturing_amr.toml b/..._euler_blob_split_shockcapturing_amr.toml → ...meters_euler_blob_shockcapturing_amr.toml
@@ -2,15 +2,7 @@
 # Simulation
 ndims = 2
 equations = "CompressibleEulerEquations"
-gamma = 1.66667
-# equations = "LinearScalarAdvectionEquation"
-# advectionvelocity = [1.0, 1.0] # Need only for linarscalaradvection
-# initial_condition = "initial_condition_convergence_test"
-# initial_condition = "initial_condition_isentropic_vortex"
-# initial_condition = "initial_condition_linear_x_y"
-# initial_condition = "initial_condition_linear_x"
-# initial_condition = "initial_condition_constant"
-#initial_condition = "initial_condition_weak_blast_wave"
+gamma = 1.6666666666666667
 initial_condition = "initial_condition_blob"
 # source_terms =
 t_start = 0.0
@@ -22,24 +14,15 @@ t_end   = 8.0
 # Solver
 solver = "dg"
 polydeg = 4
-cfl = 0.2
+cfl = 0.3
 n_steps_max = 15000
 analysis_interval = 100
 shock_indicator_variable = "pressure"
 shock_alpha_max = 0.4
 shock_alpha_min = 0.0001
 volume_integral_type = "shock_capturing"
-#volume_integral_type = "new_trick"
-#volume_integral_type = "split_form"
-#volume_integral_type = "weak_form"
-#volume_integral_type = "entropy_fix"
-#volume_integral_type = "entropy_fix2"
 surface_flux = "flux_lax_friedrichs"
-#surface_flux = "flux_chandrashekar"
-#surface_flux = "flux_shima_etal"
-#volume_flux = "flux_shima_etal"
 volume_flux = "flux_chandrashekar"
-# volume_flux = "flux_central"
 
 ####################################################################################################
 # Mesh

diff --git a/examples/2d/parameters_euler_density_wave.toml b/examples/2d/parameters_euler_density_wave.toml
@@ -16,7 +16,7 @@ t_end   = 2.0
 # Solver
 solver = "dg"
 polydeg = 5
-cfl = 0.8
+cfl = 1.6
 n_steps_max = 10000
 analysis_interval = 100
 

diff --git a/examples/2d/parameters_euler_ec.toml b/examples/2d/parameters_euler_ec.toml
@@ -29,7 +29,7 @@ t_end   = 0.4
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 100
 #volume_integral_type = "shock_capturing"

diff --git a/examples/2d/parameters_euler_khi.toml → .../parameters_euler_khi_shockcapturing.toml b/examples/2d/parameters_euler_khi.toml → .../parameters_euler_khi_shockcapturing.toml
@@ -21,7 +21,7 @@ t_end   = 5.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.7
+cfl = 1.4
 n_steps_max = 10000
 analysis_interval = 100
 shock_alpha_max = 0.002

diff --git a/examples/2d/parameters_euler_khi_amr.toml → ...ameters_euler_khi_shockcapturing_amr.toml b/examples/2d/parameters_euler_khi_amr.toml → ...ameters_euler_khi_shockcapturing_amr.toml
@@ -21,23 +21,14 @@ t_end   = 5.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.7
+cfl = 1.4
 n_steps_max = 10000
 analysis_interval = 100
 shock_alpha_max = 0.002
 shock_alpha_min = 0.0001
 volume_integral_type = "shock_capturing"
-#volume_integral_type = "new_trick"
-#volume_integral_type = "split_form"
-#volume_integral_type = "weak_form"
-#volume_integral_type = "entropy_fix"
-#volume_integral_type = "entropy_fix2"
 surface_flux = "flux_lax_friedrichs"
-#surface_flux = "flux_chandrashekar"
-#surface_flux = "flux_shima_etal"
-#volume_flux = "flux_shima_etal"
 volume_flux = "flux_chandrashekar"
-# volume_flux = "flux_central"
 
 ####################################################################################################
 # Mesh

diff --git a/examples/2d/parameters_euler_nonperiodic.toml b/examples/2d/parameters_euler_nonperiodic.toml
@@ -19,7 +19,7 @@ t_end   = 2.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.6
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 100
 

diff --git a/examples/2d/parameters_euler_sedov_blast_wave_shockcapturing_amr.toml b/examples/2d/parameters_euler_sedov_blast_wave_shockcapturing_amr.toml
@@ -14,7 +14,7 @@ t_end   = 12.5
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 0.8
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "shock_capturing"

diff --git a/examples/2d/parameters_euler_source_terms.toml b/examples/2d/parameters_euler_source_terms.toml
@@ -18,7 +18,7 @@ t_end   = 2.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.6
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 100
 

diff --git a/examples/2d/parameters_euler_vortex.toml b/examples/2d/parameters_euler_vortex.toml
@@ -20,7 +20,7 @@ t_end   = 20.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.6
+cfl = 1.4
 n_steps_max = 10000
 analysis_interval = 100
 extra_analysis_quantities = ["conservation_error", "entropy", "energy_total", "energy_kinetic",

diff --git a/examples/2d/parameters_euler_vortex_mortar.toml b/examples/2d/parameters_euler_vortex_mortar.toml
@@ -23,7 +23,7 @@ t_end   = 1.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.8
+cfl = 1.4
 n_steps_max = 10000
 analysis_interval = 100
 

diff --git a/...r_vortex_mortar_split_shockcapturing.toml → ...s_euler_vortex_mortar_shockcapturing.toml b/...r_vortex_mortar_split_shockcapturing.toml → ...s_euler_vortex_mortar_shockcapturing.toml
@@ -25,7 +25,7 @@ t_end   = 1.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.4
+cfl = 1.4
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "shock_capturing"

diff --git a/examples/2d/parameters_euler_vortex_mortar_split.toml b/examples/2d/parameters_euler_vortex_mortar_split.toml
@@ -24,7 +24,7 @@ t_end   = 1.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.8
+cfl = 1.4
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "split_form"

diff --git a/...rs_euler_vortex_split_shockcapturing.toml → ...rameters_euler_vortex_shockcapturing.toml b/...rs_euler_vortex_split_shockcapturing.toml → ...rameters_euler_vortex_shockcapturing.toml
@@ -25,7 +25,7 @@ t_end   = 1.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.4
+cfl = 1.4
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "shock_capturing"

diff --git a/examples/2d/parameters_euler_weak_blast_wave_shockcapturing.toml b/examples/2d/parameters_euler_weak_blast_wave_shockcapturing.toml
@@ -26,7 +26,7 @@ t_end   = 1.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 1.0
 n_steps_max = 10000
 analysis_interval = 100
 volume_integral_type = "shock_capturing"

diff --git a/examples/2d/parameters_mhd_alfven_wave.toml b/examples/2d/parameters_mhd_alfven_wave.toml
@@ -17,7 +17,7 @@ t_end   = 2.0
 # Solver
 solver = "dg"
 polydeg = 3
-cfl = 0.5
+cfl = 1.2
 n_steps_max = 10000
 analysis_interval = 100
 extra_analysis_quantities = ["entropy", "energy_total", "energy_kinetic", "energy_magnetic",