Use for custom integrators only OrdinaryDiffEq:CallbackSet, no blan…

…k line elixirs (#2226) * Use for custom integrators only `OrdinaryDiffEq:CallbackSet`, make first line blank for elixirs * blank line * seperate using * stick to joint using * joint using * remove blank lines elixirs * Update examples/tree_1d_dgsem/elixir_advection_perk2.jl Co-authored-by: Joshua Lampert <[email protected]> * access non-exported function --------- Co-authored-by: Joshua Lampert <[email protected]>
trixi-framework · Jan 12, 2025 · 8592c0e · 8592c0e
1 parent 62e3584
commit 8592c0e
Show file tree

Hide file tree

Showing 296 changed files with 41 additions and 310 deletions.
diff --git a/examples/dgmulti_1d/elixir_advection_gauss_sbp.jl b/examples/dgmulti_1d/elixir_advection_gauss_sbp.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_1d/elixir_euler_fdsbp_periodic.jl b/examples/dgmulti_1d/elixir_euler_fdsbp_periodic.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(element_type = Line(),

diff --git a/examples/dgmulti_2d/elixir_euler_bilinear.jl b/examples/dgmulti_2d/elixir_euler_bilinear.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(polydeg = 3, element_type = Quad(), approximation_type = SBP(),

diff --git a/examples/dgmulti_2d/elixir_euler_curved.jl b/examples/dgmulti_2d/elixir_euler_curved.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(polydeg = 3, element_type = Quad(), approximation_type = SBP(),

diff --git a/examples/dgmulti_2d/elixir_euler_fdsbp_periodic.jl b/examples/dgmulti_2d/elixir_euler_fdsbp_periodic.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(element_type = Quad(),

diff --git a/examples/dgmulti_2d/elixir_euler_hohqmesh.jl b/examples/dgmulti_2d/elixir_euler_hohqmesh.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl b/examples/dgmulti_2d/elixir_euler_rayleigh_taylor_instability.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 ###############################################################################

diff --git a/examples/dgmulti_2d/elixir_euler_shockcapturing.jl b/examples/dgmulti_2d/elixir_euler_shockcapturing.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_2d/elixir_euler_shockcapturing_curved.jl b/examples/dgmulti_2d/elixir_euler_shockcapturing_curved.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_2d/elixir_euler_weakform.jl b/examples/dgmulti_2d/elixir_euler_weakform.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(polydeg = 3, element_type = Tri(), approximation_type = Polynomial(),

diff --git a/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl b/examples/dgmulti_2d/elixir_euler_weakform_periodic.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(polydeg = 3, element_type = Tri(), approximation_type = Polynomial(),

diff --git a/examples/dgmulti_2d/elixir_mhd_reflective_wall.jl b/examples/dgmulti_2d/elixir_mhd_reflective_wall.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 using LinearAlgebra: norm, dot # for use in the MHD boundary condition

diff --git a/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl b/examples/dgmulti_2d/elixir_mhd_weak_blast_wave.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_2d/elixir_mhd_weak_blast_wave_SBP.jl b/examples/dgmulti_2d/elixir_mhd_weak_blast_wave_SBP.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_3d/elixir_euler_curved.jl b/examples/dgmulti_3d/elixir_euler_curved.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(polydeg = 3, element_type = Hex(), approximation_type = SBP(),

diff --git a/examples/dgmulti_3d/elixir_euler_fdsbp_periodic.jl b/examples/dgmulti_3d/elixir_euler_fdsbp_periodic.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl b/examples/dgmulti_3d/elixir_euler_taylor_green_vortex.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/dgmulti_3d/elixir_euler_weakform.jl b/examples/dgmulti_3d/elixir_euler_weakform.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(polydeg = 3, element_type = Tet(),

diff --git a/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl b/examples/dgmulti_3d/elixir_euler_weakform_periodic.jl
@@ -1,4 +1,3 @@
-
 using Trixi, OrdinaryDiffEq
 
 dg = DGMulti(polydeg = 3, element_type = Tet(), approximation_type = Polynomial(),

diff --git a/examples/dgmulti_3d/elixir_navierstokes_taylor_green_vortex.jl b/examples/dgmulti_3d/elixir_navierstokes_taylor_green_vortex.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl b/examples/p4est_2d_dgsem/elixir_advection_amr_solution_independent.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_amr_unstructured_flag.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_advection_extended.jl b/examples/p4est_2d_dgsem/elixir_advection_extended.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_nonconforming_flag.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_advection_restart.jl b/examples/p4est_2d_dgsem/elixir_advection_restart.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_advection_restart_amr.jl b/examples/p4est_2d_dgsem/elixir_advection_restart_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_advection_unstructured_flag.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_NACA0012airfoil_mach085.jl b/examples/p4est_2d_dgsem/elixir_euler_NACA0012airfoil_mach085.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_NACA6412airfoil_mach2.jl b/examples/p4est_2d_dgsem/elixir_euler_NACA6412airfoil_mach2.jl
@@ -1,4 +1,3 @@
-
 using Trixi
 using OrdinaryDiffEq
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl b/examples/p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_double_mach_amr.jl b/examples/p4est_2d_dgsem/elixir_euler_double_mach_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_forward_step_amr.jl b/examples/p4est_2d_dgsem/elixir_euler_forward_step_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl b/examples/p4est_2d_dgsem/elixir_euler_free_stream.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_sedov.jl b/examples/p4est_2d_dgsem/elixir_euler_sedov.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_sedov_blast_wave_sc_subcell.jl b/examples/p4est_2d_dgsem/elixir_euler_sedov_blast_wave_sc_subcell.jl
@@ -1,4 +1,5 @@
-using OrdinaryDiffEq
+# We use time integration methods implemented in Trixi.jl, but we need the `CallbackSet`
+using OrdinaryDiffEq: CallbackSet
 using Trixi
 
 ###############################################################################

diff --git a/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl b/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec_float32.jl b/examples/p4est_2d_dgsem/elixir_euler_shockcapturing_ec_float32.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl b/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_subsonic_cylinder.jl b/examples/p4est_2d_dgsem/elixir_euler_subsonic_cylinder.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_supersonic_cylinder_sc_subcell.jl b/examples/p4est_2d_dgsem/elixir_euler_supersonic_cylinder_sc_subcell.jl
@@ -13,7 +13,8 @@
 #
 # Keywords: supersonic flow, shock capturing, AMR, unstructured curved mesh, positivity preservation, compressible Euler, 2D
 
-using OrdinaryDiffEq
+# We use time integration methods implemented in Trixi.jl, but we need the `CallbackSet`
+using OrdinaryDiffEq: CallbackSet
 using Trixi
 
 ###############################################################################

diff --git a/examples/p4est_2d_dgsem/elixir_euler_wall_bc_amr.jl b/examples/p4est_2d_dgsem/elixir_euler_wall_bc_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_euler_weak_blast_wave_amr.jl b/examples/p4est_2d_dgsem/elixir_euler_weak_blast_wave_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl b/examples/p4est_2d_dgsem/elixir_eulergravity_convergence.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_linearizedeuler_gaussian_source.jl b/examples/p4est_2d_dgsem/elixir_linearizedeuler_gaussian_source.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl b/examples/p4est_2d_dgsem/elixir_mhd_alfven_wave.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl b/examples/p4est_2d_dgsem/elixir_mhd_rotor.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_navierstokes_NACA0012airfoil_mach08.jl b/examples/p4est_2d_dgsem/elixir_navierstokes_NACA0012airfoil_mach08.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_2d_dgsem/elixir_shallowwater_source_terms.jl b/examples/p4est_2d_dgsem/elixir_shallowwater_source_terms.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl b/examples/p4est_3d_dgsem/elixir_advection_cubed_sphere.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl b/examples/p4est_3d_dgsem/elixir_advection_nonconforming.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_advection_restart.jl b/examples/p4est_3d_dgsem/elixir_advection_restart.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_ec.jl b/examples/p4est_3d_dgsem/elixir_euler_ec.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl b/examples/p4est_3d_dgsem/elixir_euler_free_stream.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_free_stream_boundaries.jl b/examples/p4est_3d_dgsem/elixir_euler_free_stream_boundaries.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl b/examples/p4est_3d_dgsem/elixir_euler_free_stream_extruded.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_sedov.jl b/examples/p4est_3d_dgsem/elixir_euler_sedov.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_curved.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic_hohqmesh.jl b/examples/p4est_3d_dgsem/elixir_euler_source_terms_nonperiodic_hohqmesh.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_euler_weak_blast_wave_amr.jl b/examples/p4est_3d_dgsem/elixir_euler_weak_blast_wave_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl b/examples/p4est_3d_dgsem/elixir_mhd_alfven_wave_nonconforming.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_mhd_amr_entropy_bounded.jl b/examples/p4est_3d_dgsem/elixir_mhd_amr_entropy_bounded.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl b/examples/p4est_3d_dgsem/elixir_mhd_shockcapturing_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_navierstokes_blast_wave_amr.jl b/examples/p4est_3d_dgsem/elixir_navierstokes_blast_wave_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex.jl b/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex_amr.jl b/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex_amr.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_euler_convergence.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_convergence.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_sedov_blast_wave.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl b/examples/paper_self_gravitating_gas_dynamics/elixir_hypdiff_convergence.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/special_elixirs/elixir_euler_ad.jl b/examples/special_elixirs/elixir_euler_ad.jl
@@ -1,4 +1,3 @@
-
 # This example is described in more detail in the documentation of Trixi.jl
 
 using Trixi, LinearAlgebra, ForwardDiff

diff --git a/examples/structured_1d_dgsem/elixir_advection_float128.jl b/examples/structured_1d_dgsem/elixir_advection_float128.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl b/examples/structured_1d_dgsem/elixir_advection_nonperiodic.jl
@@ -1,4 +1,3 @@
-
 using OrdinaryDiffEq
 using Trixi
 

diff --git a/examples/structured_1d_dgsem/elixir_burgers_perk3.jl b/examples/structured_1d_dgsem/elixir_burgers_perk3.jl
@@ -6,7 +6,8 @@ using Convex, ECOS
 # in the Butcher tableau in the third order PERK time integrator.
 using NLsolve
 
-using OrdinaryDiffEq
+# We use time integration methods implemented in Trixi.jl, but we need the `CallbackSet`
+using OrdinaryDiffEq: CallbackSet
 using Trixi
 
 ###############################################################################
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		using Trixi, OrdinaryDiffEq

		dg = DGMulti(element_type = Line(),
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		using Trixi, OrdinaryDiffEq

		dg = DGMulti(polydeg = 3, element_type = Quad(), approximation_type = SBP(),
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		using Trixi, OrdinaryDiffEq

		dg = DGMulti(element_type = Quad(),
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		using Trixi, OrdinaryDiffEq

		###############################################################################
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		# This example is described in more detail in the documentation of Trixi.jl

		using Trixi, LinearAlgebra, ForwardDiff
Expand Down