Merge branch 'main' into msl/structuredmesh-view

trixi-framework · Nov 10, 2023 · 7898405 · 7898405
2 parents 11645a9 + cb8181f
commit 7898405
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 24 deletions.
diff --git a/src/equations/compressible_euler_2d.jl b/src/equations/compressible_euler_2d.jl
@@ -1351,7 +1351,7 @@ of the numerical flux.
     v1_roe = (sqrt_rho_ll * v1_ll + sqrt_rho_rr * v1_rr) * inv_sum_sqrt_rho
     v2_roe = (sqrt_rho_ll * v2_ll + sqrt_rho_rr * v2_rr) * inv_sum_sqrt_rho
     v_roe = v1_roe * normal_direction[1] + v2_roe * normal_direction[2]
-    v_roe_mag = (v1_roe * normal_direction[1])^2 + (v2_roe * normal_direction[2])^2
+    v_roe_mag = v1_roe^2 + v2_roe^2
 
     H_roe = (sqrt_rho_ll * H_ll + sqrt_rho_rr * H_rr) * inv_sum_sqrt_rho
     c_roe = sqrt((equations.gamma - 1) * (H_roe - 0.5 * v_roe_mag)) * norm_

diff --git a/src/solvers/dgsem_tree/indicators_1d.jl b/src/solvers/dgsem_tree/indicators_1d.jl
@@ -289,14 +289,15 @@ function (indicator_max::IndicatorMax)(u::AbstractArray{<:Any, 3},
                                        kwargs...)
     @unpack alpha, indicator_threaded = indicator_max.cache
     resize!(alpha, nelements(dg, cache))
+    indicator_variable = indicator_max.variable
 
     @threaded for element in eachelement(dg, cache)
         indicator = indicator_threaded[Threads.threadid()]
 
         # Calculate indicator variables at Gauss-Lobatto nodes
         for i in eachnode(dg)
             u_local = get_node_vars(u, equations, dg, i, element)
-            indicator[i] = indicator_max.variable(u_local, equations)
+            indicator[i] = indicator_variable(u_local, equations)
         end
 
         alpha[element] = maximum(indicator)

diff --git a/src/solvers/dgsem_tree/indicators_2d.jl b/src/solvers/dgsem_tree/indicators_2d.jl
@@ -323,14 +323,15 @@ function (indicator_max::IndicatorMax)(u::AbstractArray{<:Any, 4},
                                        kwargs...)
     @unpack alpha, indicator_threaded = indicator_max.cache
     resize!(alpha, nelements(dg, cache))
+    indicator_variable = indicator_max.variable
 
     @threaded for element in eachelement(dg, cache)
         indicator = indicator_threaded[Threads.threadid()]
 
         # Calculate indicator variables at Gauss-Lobatto nodes
         for j in eachnode(dg), i in eachnode(dg)
             u_local = get_node_vars(u, equations, dg, i, j, element)
-            indicator[i, j] = indicator_max.variable(u_local, equations)
+            indicator[i, j] = indicator_variable(u_local, equations)
         end
 
         alpha[element] = maximum(indicator)

diff --git a/src/solvers/dgsem_tree/indicators_3d.jl b/src/solvers/dgsem_tree/indicators_3d.jl
@@ -234,14 +234,15 @@ function (indicator_max::IndicatorMax)(u::AbstractArray{<:Any, 5},
                                        kwargs...)
     @unpack alpha, indicator_threaded = indicator_max.cache
     resize!(alpha, nelements(dg, cache))
+    indicator_variable = indicator_max.variable
 
     @threaded for element in eachelement(dg, cache)
         indicator = indicator_threaded[Threads.threadid()]
 
         # Calculate indicator variables at Gauss-Lobatto nodes
         for k in eachnode(dg), j in eachnode(dg), i in eachnode(dg)
             u_local = get_node_vars(u, equations, dg, i, j, k, element)
-            indicator[i, j, k] = indicator_max.variable(u_local, equations)
+            indicator[i, j, k] = indicator_variable(u_local, equations)
         end
 
         alpha[element] = maximum(indicator)

diff --git a/test/test_p4est_2d.jl b/test/test_p4est_2d.jl
@@ -203,16 +203,16 @@ end
 @trixi_testset "elixir_euler_sedov.jl (HLLE)" begin
     @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov.jl"),
                         l2=[
-                            0.411541263324004,
-                            0.2558929632770186,
-                            0.2558929632770193,
-                            1.298715766843915,
+                            0.40853279043747015,
+                            0.25356771650524296,
+                            0.2535677165052422,
+                            1.2984601729572691,
                         ],
                         linf=[
-                            1.3457201726152221,
-                            1.3138961427140758,
-                            1.313896142714079,
-                            6.293305112638921,
+                            1.3840909333784284,
+                            1.3077772519086124,
+                            1.3077772519086157,
+                            6.298798630968632,
                         ],
                         surface_flux=flux_hlle,
                         tspan=(0.0, 0.3))

diff --git a/test/test_tree_1d_shallowwater.jl b/test/test_tree_1d_shallowwater.jl
@@ -109,7 +109,9 @@ end
                             2.2447689894899726e-13,
                             1.9999999999999714,
                         ],
-                        tspan=(0.0, 0.25))
+                        tspan=(0.0, 0.25),
+                        # Soften the tolerance as test results vary between different CPUs
+                        atol=1000 * eps())
     # Ensure that we do not have excessive memory allocations
     # (e.g., from type instabilities)
     let

diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl
@@ -425,19 +425,22 @@ end
 @trixi_testset "elixir_euler_sedov_blast_wave.jl (HLLE)" begin
     @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_sedov_blast_wave.jl"),
                         l2=[
-                            0.35267161504176747,
-                            0.17218309138797958,
-                            0.17218307467125854,
-                            0.6236143054619037,
+                            0.352405949321075,
+                            0.17207721487429464,
+                            0.17207721487433883,
+                            0.6263024434020885,
                         ],
                         linf=[
-                            2.77484045816607,
-                            1.8281111268370718,
-                            1.8281110470490887,
-                            6.24263735888126,
+                            2.760997358628186,
+                            1.8279186132509326,
+                            1.8279186132502805,
+                            6.251573757093399,
                         ],
                         tspan=(0.0, 0.5),
-                        surface_flux=flux_hlle)
+                        callbacks=CallbackSet(summary_callback,
+                                              analysis_callback, alive_callback,
+                                              stepsize_callback),
+                        surface_flux=flux_hlle),
     # Ensure that we do not have excessive memory allocations
     # (e.g., from type instabilities)
     let

diff --git a/test/test_unit.jl b/test/test_unit.jl
@@ -1191,7 +1191,7 @@ end
         u_values = [SVector(1.0, 0.5, -0.7, 1.0),
             SVector(1.5, -0.2, 0.1, 5.0)]
         fluxes = [flux_central, flux_ranocha, flux_shima_etal, flux_kennedy_gruber,
-            flux_hll, FluxHLL(min_max_speed_davis)]
+            flux_hll, FluxHLL(min_max_speed_davis), flux_hlle]
 
         for f_std in fluxes
             f_rot = FluxRotated(f_std)
@@ -1215,7 +1215,7 @@ end
             SVector(1.5, -0.2, 0.1, 0.2, 5.0)]
         fluxes = [flux_central, flux_ranocha, flux_shima_etal, flux_kennedy_gruber,
             FluxLMARS(340),
-            flux_hll, FluxHLL(min_max_speed_davis)]
+            flux_hll, FluxHLL(min_max_speed_davis), flux_hlle]
 
         for f_std in fluxes
             f_rot = FluxRotated(f_std)