Merge branch 'main' into arr/euler_gravity_geopotential

Author: amrueda

src/meshes/dgmulti_icosahedron_tri.jl

@@ -42,7 +42,7 @@ function DGMultiMeshTriIcosahedron2D(dg::DGMulti{NDIMS, <:Tri}, radius;
                         vk = ntuple(n -> Vxyz_old[n][k], NDIMS_AMBIENT)
                         vl = ntuple(n -> Vxyz_old[n][l], NDIMS_AMBIENT)
                         midpoint = 0.5 .* (vk .+ vl)
-                        midpoint = midpoint .* (EARTH_RADIUS / norm(midpoint)) # Normalize to outer radius
+                        midpoint = midpoint .* (radius / norm(midpoint)) # Normalize to outer radius
                         for n in 1:NDIMS_AMBIENT
                             push!(Vxyz[n], midpoint[n])
                         end

src/solvers/dgmulti/dg_manifold_covariant.jl

@@ -97,14 +97,15 @@ function Trixi.calc_interface_flux!(cache, surface_integral::SurfaceIntegralWeak
         uP = u_face_values[idP]
         auxM = aux_face_values[idM]
         auxP = aux_face_values[idP]
+
         # Transform uP to the same coordinate system as uM
         uP_global = contravariant2global(uP, auxP, equations)
         uP_transformed_to_M = global2contravariant(uP_global, auxM, equations)
 
         # Compute ref_index from face_node_index in order to access covariant normal vector
         # in reference element coordinates.
         ref_index = mod(face_node_index - 1, Nfq) + 1
-        normal = SVector(ntuple(k -> nrstJ[k][ref_index], NDIMS))
+        normal = SVector{NDIMS}(getindex.(nrstJ, ref_index))
 
         flux_face_values[idM] = surface_flux(uM, uP_transformed_to_M, auxM, auxM, normal,
                                              equations)

test/test_2d_shallow_water_covariant.jl

@@ -102,12 +102,12 @@ end
 
 @trixi_testset "elixir_tri_barotropic_instability" begin
     @test_trixi_include(joinpath(EXAMPLES_DIR,
-    "elixir_barotropic_instability.jl"),
-    l2=[41.05018196765347, 0.04598801953369521, 0.03324228006147076],
-    linf=[202.17195189961058, 0.2046503536574818, 0.14813768215260187]),
-    polydeg = 3,
-    initial_refinement_level = 1,
-    tspan = (0.0, 1.0 * SECONDS_PER_DAY)
+                                 "elixir_tri_barotropic_instability.jl"),
+                        l2=[41.05018196765347, 0.04598801953369521, 0.03324228006147076],
+                        linf=[202.17195189961058, 0.2046503536574818, 0.14813768215260187],
+                        polydeg=3,
+                        initial_refinement_level=1,
+                        tspan=(0.0, 1.0 * SECONDS_PER_DAY))
     # Ensure that we do not have excessive memory allocations
     # (e.g., from type instabilities)
     @test_allocations(TrixiAtmo.Trixi.rhs!, semi, sol, 100)

test/test_threaded.jl

@@ -29,7 +29,24 @@ include("test_trixiatmo.jl")
                         tspan=(0.0, 0.1))
     # Ensure that we do not have excessive memory allocations
     # (e.g., from type instabilities)
-    @test_allocations(TrixiAtmo.Trixi.rhs!, semi, sol, 2500)
+    @test_allocations(TrixiAtmo.Trixi.rhs!, semi, sol, 5000)
+end
+
+@trixi_testset "elixir_tri_barotropic_instability threaded" begin
+    @test_trixi_include(abspath(joinpath(EXAMPLES_DIR, "shallow_water/covariant",
+                                         "elixir_tri_barotropic_instability.jl")),
+                        l2=[41.05018196765347, 0.04598801953369521, 0.03324228006147076],
+                        linf=[
+                            202.17195189961058,
+                            0.2046503536574818,
+                            0.14813768215260187
+                        ],
+                        polydeg=3,
+                        initial_refinement_level=1,
+                        tspan=(0.0, 1.0 * SECONDS_PER_DAY))
+    # Ensure that we do not have excessive memory allocations
+    # (e.g., from type instabilities)
+    @test_allocations(TrixiAtmo.Trixi.rhs!, semi, sol, 5000)
 end
 end
 end # module