Clean up branch with main

trixi-framework · Nov 14, 2023 · fca5614 · fca5614
1 parent bc5d5e4
commit fca5614
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/src/solvers/dg.jl b/src/solvers/dg.jl
@@ -192,12 +192,6 @@ A subcell limiting volume integral type for DG methods based on subcell blending
 with a low-order FV method. Used with the limiters [`SubcellLimiterIDP`](@ref) and
 [`SubcellLimiterMCL`](@ref).
 
-!!! note
-    Subcell limiting methods are not fully functional on non-conforming meshes. This is
-    mainly because the implementation assumes that low- and high-order schemes have the same
-    surface terms, which is not guaranteed for non-conforming meshes. The low-order scheme
-    with a high-order mortar is not invariant domain preserving.
-
 !!! note
     Subcell limiting methods are not fully functional on non-conforming meshes. This is
     mainly because the implementation assumes that low- and high-order schemes have the same

diff --git a/src/solvers/dgsem_tree/dg_2d.jl b/src/solvers/dgsem_tree/dg_2d.jl
@@ -549,7 +549,6 @@ end
     return nothing
 end
 
-# We pass the `surface_integral` argument solely for dispatch
 function prolong2interfaces!(cache, u,
                              mesh::TreeMesh{2}, equations, surface_integral, dg::DG)
     @unpack interfaces = cache

diff --git a/src/solvers/dgsem_tree/subcell_limiters.jl b/src/solvers/dgsem_tree/subcell_limiters.jl
@@ -239,7 +239,7 @@ end
 
 function get_node_variables!(node_variables, limiter::SubcellLimiterIDP,
                              ::VolumeIntegralSubcellLimiting, equations)
-    node_variables[:alpha_limiter] = limiter.cache.subcell_limiter_coefficients.alpha
+    node_variables[:limiting_coefficient] = limiter.cache.subcell_limiter_coefficients.alpha
 
     return nothing
 end

diff --git a/src/solvers/dgsem_tree/subcell_limiters_2d.jl b/src/solvers/dgsem_tree/subcell_limiters_2d.jl
@@ -36,10 +36,8 @@ function (limiter::SubcellLimiterIDP)(u::AbstractArray{<:Any, 4}, semi, dg::DGSE
                                       dt;
                                       kwargs...)
     @unpack alpha = limiter.cache.subcell_limiter_coefficients
-    @trixi_timeit timer() "reset alpha" @threaded for element in eachelement(dg,
-                                                                             semi.cache)
-        alpha[.., element] .= zero(eltype(alpha))
-    end
+    @trixi_timeit timer() "reset alpha" reset_du!(alpha, dg, semi.cache)
+
     if limiter.smoothness_indicator
         elements = semi.cache.element_ids_dgfv
     else

diff --git a/test/test_unit.jl b/test/test_unit.jl
@@ -296,11 +296,9 @@ end
     end
     Trixi.move_connectivity!(c::MyContainer, first, last, destination) = c
     Trixi.delete_connectivity!(c::MyContainer, first, last) = c
-    function Trixi.reset_data_structures!(c::MyContainer)
-        (c.data = Vector{Int}(undef,
-                              c.capacity + 1);
-         c)
-    end
+    Trixi.reset_data_structures!(c::MyContainer) = (c.data = Vector{Int}(undef,
+                                                                         c.capacity + 1);
+                                                    c)
     function Base.:(==)(c1::MyContainer, c2::MyContainer)
         return (c1.capacity == c2.capacity &&
                 c1.length == c2.length &&