Merge branch 'main' into compathelper/new_version/2024-02-23-00-04-21…

…-953-01267395299

.github/workflows/SpellCheck.yml

@@ -10,4 +10,4 @@ jobs:
       - name: Checkout Actions Repository
         uses: actions/checkout@v4
       - name: Check spelling
-        uses: crate-ci/[email protected].0
+        uses: crate-ci/[email protected].2

Project.toml

@@ -1,7 +1,7 @@
 name = "Trixi"
 uuid = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
 authors = ["Michael Schlottke-Lakemper <[email protected]>", "Gregor Gassner <[email protected]>", "Hendrik Ranocha <[email protected]>", "Andrew R. Winters <[email protected]>", "Jesse Chan <[email protected]>"]
-version = "0.7.1-pre"
+version = "0.7.2-pre"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"

examples/structured_2d_dgsem/elixir_advection_coupled.jl

@@ -53,7 +53,8 @@ cells_per_dimension = (8, 8)
 coordinates_min1 = (-1.0, 0.0) # minimum coordinates (min(x), min(y))
 coordinates_max1 = (0.0, 1.0) # maximum coordinates (max(x), max(y))
 
-mesh1 = StructuredMesh(cells_per_dimension, coordinates_min1, coordinates_max1)
+mesh1 = StructuredMesh(cells_per_dimension, coordinates_min1, coordinates_max1,
+                       periodicity = false)
 
 # Define the coupling functions
 coupling_function12 = (x, u, equations_other, equations_own) -> u
@@ -84,7 +85,8 @@ semi1 = SemidiscretizationHyperbolic(mesh1, equations, initial_condition_converg
 coordinates_min2 = (0.0, 0.0) # minimum coordinates (min(x), min(y))
 coordinates_max2 = (1.0, 1.0) # maximum coordinates (max(x), max(y))
 
-mesh2 = StructuredMesh(cells_per_dimension, coordinates_min2, coordinates_max2)
+mesh2 = StructuredMesh(cells_per_dimension, coordinates_min2, coordinates_max2,
+                       periodicity = false)
 
 # Define the coupling functions
 coupling_function21 = (x, u, equations_other, equations_own) -> u
@@ -115,7 +117,8 @@ semi2 = SemidiscretizationHyperbolic(mesh2, equations, initial_condition_converg
 coordinates_min3 = (-1.0, -1.0) # minimum coordinates (min(x), min(y))
 coordinates_max3 = (0.0, 0.0) # maximum coordinates (max(x), max(y))
 
-mesh3 = StructuredMesh(cells_per_dimension, coordinates_min3, coordinates_max3)
+mesh3 = StructuredMesh(cells_per_dimension, coordinates_min3, coordinates_max3,
+                       periodicity = false)
 
 # Define the coupling functions
 coupling_function34 = (x, u, equations_other, equations_own) -> u
@@ -146,7 +149,8 @@ semi3 = SemidiscretizationHyperbolic(mesh3, equations, initial_condition_converg
 coordinates_min4 = (0.0, -1.0) # minimum coordinates (min(x), min(y))
 coordinates_max4 = (1.0, 0.0) # maximum coordinates (max(x), max(y))
 
-mesh4 = StructuredMesh(cells_per_dimension, coordinates_min4, coordinates_max4)
+mesh4 = StructuredMesh(cells_per_dimension, coordinates_min4, coordinates_max4,
+                       periodicity = false)
 
 # Define the coupling functions
 coupling_function43 = (x, u, equations_other, equations_own) -> u

examples/structured_2d_dgsem/elixir_euler_rayleigh_taylor_instability.jl

@@ -69,7 +69,7 @@ mapping(xi, eta) = SVector(0.25 * 0.5 * (1.0 + xi), 0.5 * (1.0 + eta))
 
 num_elements_per_dimension = 32
 cells_per_dimension = (num_elements_per_dimension, num_elements_per_dimension * 4)
-mesh = StructuredMesh(cells_per_dimension, mapping)
+mesh = StructuredMesh(cells_per_dimension, mapping, periodicity = false)
 
 initial_condition = initial_condition_rayleigh_taylor_instability
 boundary_conditions = (x_neg = boundary_condition_slip_wall,

examples/structured_2d_dgsem/elixir_euler_warm_bubble.jl

@@ -100,7 +100,8 @@ coordinates_min = (0.0, 0.0)
 coordinates_max = (20_000.0, 10_000.0)
 
 cells_per_dimension = (64, 32)
-mesh = StructuredMesh(cells_per_dimension, coordinates_min, coordinates_max)
+mesh = StructuredMesh(cells_per_dimension, coordinates_min, coordinates_max,
+                      periodicity = (true, false))
 
 semi = SemidiscretizationHyperbolic(mesh, equations, warm_bubble_setup, solver,
                                     source_terms = warm_bubble_setup,

examples/unstructured_2d_fdsbp/elixir_euler_free_stream_upwind.jl

@@ -0,0 +1,86 @@
+# !!! warning "Experimental implementation (upwind SBP)"
+#     This is an experimental feature and may change in future releases.
+
+using OrdinaryDiffEq
+using Trixi
+
+###############################################################################
+# semidiscretization of the compressible Euler equations
+
+equations = CompressibleEulerEquations2D(1.4)
+
+initial_condition = initial_condition_constant
+
+# Boundary conditions for free-stream preservation test
+boundary_condition_free_stream = BoundaryConditionDirichlet(initial_condition)
+
+boundary_conditions = Dict(:outerCircle => boundary_condition_free_stream,
+                           :cone1 => boundary_condition_free_stream,
+                           :cone2 => boundary_condition_free_stream,
+                           :iceCream => boundary_condition_free_stream)
+
+###############################################################################
+# Get the Upwind FDSBP approximation space
+
+# TODO: FDSBP
+# Note, one must set `xmin=-1` and `xmax=1` due to the reuse
+# of interpolation routines from `calc_node_coordinates!` to create
+# the physical coordinates in the mappings.
+D_upw = upwind_operators(SummationByPartsOperators.Mattsson2017,
+                         derivative_order = 1,
+                         accuracy_order = 8,
+                         xmin = -1.0, xmax = 1.0,
+                         N = 17)
+
+flux_splitting = splitting_vanleer_haenel
+solver = FDSBP(D_upw,
+               surface_integral = SurfaceIntegralStrongForm(FluxUpwind(flux_splitting)),
+               volume_integral = VolumeIntegralUpwind(flux_splitting))
+
+###############################################################################
+# Get the curved quad mesh from a file (downloads the file if not available locally)
+
+# Mesh with second-order boundary polynomials requires an upwind SBP operator
+# with (at least) 4th order boundary closure to guarantee the approximation is
+# free-stream preserving
+mesh_file = Trixi.download("https://gist.githubusercontent.com/andrewwinters5000/ec9a345f09199ebe471d35d5c1e4e08f/raw/15975943d8642e42f8292235314b6f1b30aa860d/mesh_inner_outer_boundaries.mesh",
+                           joinpath(@__DIR__, "mesh_inner_outer_boundaries.mesh"))
+
+mesh = UnstructuredMesh2D(mesh_file)
+
+###############################################################################
+# create the semi discretization object
+
+semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver,
+                                    boundary_conditions = boundary_conditions)
+
+###############################################################################
+# ODE solvers, callbacks etc.
+
+tspan = (0.0, 5.0)
+ode = semidiscretize(semi, tspan)
+
+summary_callback = SummaryCallback()
+
+analysis_interval = 1000
+analysis_callback = AnalysisCallback(semi, interval = analysis_interval)
+
+alive_callback = AliveCallback(analysis_interval = analysis_interval)
+
+save_solution = SaveSolutionCallback(interval = 1000,
+                                     save_initial_solution = true,
+                                     save_final_solution = true)
+
+callbacks = CallbackSet(summary_callback,
+                        analysis_callback,
+                        save_solution,
+                        alive_callback)
+
+###############################################################################
+# run the simulation
+
+# set small tolerances for the free-stream preservation test
+sol = solve(ode, SSPRK43(), abstol = 1.0e-12, reltol = 1.0e-12,
+            save_everystep = false, callback = callbacks)
+
+summary_callback() # print the timer summary

examples/unstructured_2d_fdsbp/elixir_euler_source_terms_upwind.jl

@@ -0,0 +1,87 @@
+# !!! warning "Experimental implementation (upwind SBP)"
+#     This is an experimental feature and may change in future releases.
+
+using OrdinaryDiffEq
+using Trixi
+
+###############################################################################
+# semidiscretization of the compressible Euler equations
+
+equations = CompressibleEulerEquations2D(1.4)
+
+initial_condition = initial_condition_convergence_test
+
+source_term = source_terms_convergence_test
+
+boundary_condition_eoc = BoundaryConditionDirichlet(initial_condition)
+
+boundary_conditions = Dict(:Top => boundary_condition_eoc,
+                           :Bottom => boundary_condition_eoc,
+                           :Right => boundary_condition_eoc,
+                           :Left => boundary_condition_eoc)
+
+###############################################################################
+# Get the Upwind FDSBP approximation space
+
+# TODO: FDSBP
+# Note, one must set `xmin=-1` and `xmax=1` due to the reuse
+# of interpolation routines from `calc_node_coordinates!` to create
+# the physical coordinates in the mappings.
+D_upw = upwind_operators(SummationByPartsOperators.Mattsson2017,
+                         derivative_order = 1,
+                         accuracy_order = 4,
+                         xmin = -1.0, xmax = 1.0,
+                         N = 9)
+
+flux_splitting = splitting_drikakis_tsangaris
+solver = FDSBP(D_upw,
+               surface_integral = SurfaceIntegralStrongForm(FluxUpwind(flux_splitting)),
+               volume_integral = VolumeIntegralUpwind(flux_splitting))
+
+###############################################################################
+# Get the curved quad mesh from a file (downloads the file if not available locally)
+
+# Mesh with first-order boundary polynomials requires an upwind SBP operator
+# with (at least) 2nd order boundary closure to guarantee the approximation is
+# free-stream preserving
+mesh_file = Trixi.download("https://gist.githubusercontent.com/andrewwinters5000/a4f4743008bf3233957a9ea6ac7a62e0/raw/8b36cc6649153fe0a5723b200368a210a1d74eaf/mesh_refined_box.mesh",
+                           joinpath(@__DIR__, "mesh_refined_box.mesh"))
+
+mesh = UnstructuredMesh2D(mesh_file)
+
+###############################################################################
+# create the semidiscretization object
+
+semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver,
+                                    source_terms = source_term,
+                                    boundary_conditions = boundary_conditions)
+
+###############################################################################
+# ODE solvers, callbacks etc.
+
+tspan = (0.0, 1.0)
+ode = semidiscretize(semi, tspan)
+
+summary_callback = SummaryCallback()
+
+analysis_interval = 1000
+analysis_callback = AnalysisCallback(semi, interval = analysis_interval)
+
+alive_callback = AliveCallback(analysis_interval = analysis_interval)
+
+save_solution = SaveSolutionCallback(interval = 1000,
+                                     save_initial_solution = true,
+                                     save_final_solution = true)
+
+callbacks = CallbackSet(summary_callback,
+                        analysis_callback,
+                        save_solution,
+                        alive_callback)
+
+###############################################################################
+# run the simulation
+
+sol = solve(ode, SSPRK43(), abstol = 1.0e-6, reltol = 1.0e-6,
+            save_everystep = false, callback = callbacks)
+
+summary_callback() # print the timer summary

src/Trixi.jl

@@ -191,7 +191,8 @@ export flux, flux_central, flux_lax_friedrichs, flux_hll, flux_hllc, flux_hlle,
        FluxUpwind
 
 export splitting_steger_warming, splitting_vanleer_haenel,
-       splitting_coirier_vanleer, splitting_lax_friedrichs
+       splitting_coirier_vanleer, splitting_lax_friedrichs,
+       splitting_drikakis_tsangaris
 
 export initial_condition_constant,
        initial_condition_gauss,