Merge branch 'main' into jc/StartUpDG_v1.1.0

trixi-framework · Jul 12, 2024 · de80ed3 · de80ed3
2 parents 7233b57 + ea2dd3a
commit de80ed3
Show file tree

Hide file tree

Showing 13 changed files with 509 additions and 229 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Trixi"
 uuid = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
 authors = ["Michael Schlottke-Lakemper <m.schlottke-lakemper@hlrs.de>", "Gregor Gassner <ggassner@uni-koeln.de>", "Hendrik Ranocha <mail@ranocha.de>", "Andrew R. Winters <andrew.ross.winters@liu.se>", "Jesse Chan <jesse.chan@rice.edu>"]
-version = "0.8.3-DEV"
+version = "0.8.4-DEV"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"

diff --git a/README.md b/README.md
@@ -26,13 +26,13 @@ from the Trixi Framework ecosystem:
 
 * [**Julia for Particle-Based Multiphysics with TrixiParticles.jl**](https://pretalx.com/juliacon2024/talk/TPFF8L/),<br/>
   [*Erik Faulhaber*](https://github.com/efaulhaber/), [*Niklas Neher*](https://github.com/lasnikas/),
-  10th July 2024, 11:30am–12:00pm, Function (4.1)
+  10th July 2024, 11:00–11:30, Function (4.1)
 * [**Towards Aerodynamic Simulations in Julia with Trixi.jl**](https://pretalx.com/juliacon2024/talk/XH8KBG/),<br/>
   [*Daniel Doehring*](https://github.com/danieldoehring/),
-  10th July 2024, 15:00pm–15:30pm, While Loop (4.2)
+  10th July 2024, 15:30–16:00, While Loop (4.2)
 * [**libtrixi: serving legacy codes in earth system modeling with fresh Julia CFD**](https://pretalx.com/juliacon2024/talk/SXC7LA/),<br/>
   [*Benedict Geihe*](https://github.com/benegee/),
-  12th July 2024, 14:00pm–17:00pm, Function (4.1)
+  12th July 2024, 14:00–17:00, Function (4.1)
 
 The last talk is part of the 
 [Julia for High-Performance Computing](https://juliacon.org/2024/minisymposia/hpc/)

diff --git a/examples/tree_1d_dgsem/elixir_advection_diffusion.jl b/examples/tree_1d_dgsem/elixir_advection_diffusion.jl
@@ -53,7 +53,7 @@ boundary_conditions_parabolic = boundary_condition_periodic
 
 # A semidiscretization collects data structures and functions for the spatial discretization
 semi = SemidiscretizationHyperbolicParabolic(mesh, (equations, equations_parabolic),
-                                             initial_condition_diffusive_convergence_test,
+                                             initial_condition,
                                              solver;
                                              boundary_conditions = (boundary_conditions,
                                                                     boundary_conditions_parabolic))

diff --git a/examples/tree_1d_dgsem/elixir_advection_perk2.jl b/examples/tree_1d_dgsem/elixir_advection_perk2.jl
@@ -44,9 +44,15 @@ stepsize_callback = StepsizeCallback(cfl = 2.5)
 
 alive_callback = AliveCallback(alive_interval = analysis_interval)
 
+save_solution = SaveSolutionCallback(dt = 0.1,
+                                     save_initial_solution = true,
+                                     save_final_solution = true,
+                                     solution_variables = cons2prim)
+
 # Create a CallbackSet to collect all callbacks such that they can be passed to the ODE solver
 callbacks = CallbackSet(summary_callback,
                         alive_callback,
+                        save_solution,
                         analysis_callback,
                         stepsize_callback)
 
@@ -59,7 +65,7 @@ callbacks = CallbackSet(summary_callback,
 ode_algorithm = Trixi.PairedExplicitRK2(6, tspan, semi)
 
 sol = Trixi.solve(ode, ode_algorithm,
-                  dt = 1.0, # solve needs some value here but it will be overwritten by the stepsize_callback
+                  dt = 1.0, # Manual time step value, will be overwritten by the stepsize_callback when it is specified.
                   save_everystep = false, callback = callbacks);
 
 # Print the timer summary

diff --git a/ext/TrixiConvexECOSExt.jl b/ext/TrixiConvexECOSExt.jl
@@ -151,7 +151,14 @@ function Trixi.bisect_stability_polynomial(consistency_order, num_eig_vals,
         println("Concluded stability polynomial optimization \n")
     end
 
-    return evaluate(gamma), dt
+    gamma_opt = evaluate(gamma)
+
+    # Catch case S = 3 (only one opt. variable)
+    if isa(gamma_opt, Number)
+        gamma_opt = [gamma_opt]
+    end
+
+    return gamma_opt, dt
 end
 end # @muladd
 

diff --git a/src/equations/compressible_euler_multicomponent_1d.jl b/src/equations/compressible_euler_multicomponent_1d.jl
@@ -206,7 +206,7 @@ function initial_condition_weak_blast_wave(x, t,
                                                                 2^(i - 1) * (1 - 2) /
                                                                 (1 -
                                                                  2^ncomponents(equations)) *
-                                                                1 :
+                                                                one(RealT) :
                                                                 2^(i - 1) * (1 - 2) /
                                                                 (1 -
                                                                  2^ncomponents(equations)) *

diff --git a/src/equations/compressible_euler_multicomponent_2d.jl b/src/equations/compressible_euler_multicomponent_2d.jl
@@ -224,7 +224,7 @@ function initial_condition_weak_blast_wave(x, t,
                                                                 2^(i - 1) * (1 - 2) /
                                                                 (1 -
                                                                  2^ncomponents(equations)) *
-                                                                1 :
+                                                                one(RealT) :
                                                                 2^(i - 1) * (1 - 2) /
                                                                 (1 -
                                                                  2^ncomponents(equations)) *