WIP: Additional analysis for multi-component Euler systems.

src/callbacks_step/analysis_dg2d.jl

@@ -246,11 +246,29 @@ function integrate(func::Func, u,
                                UnstructuredMesh2D, P4estMesh{2}, P4estMeshView{2},
                                T8codeMesh{2}},
                    equations, dg::DG, cache; normalize = true) where {Func}
-    integrate_via_indices(u, mesh, equations, dg, cache;
-                          normalize = normalize) do u, i, j, element, equations, dg
-        u_local = get_node_vars(u, equations, dg, i, j, element)
-        return func(u_local, equations)
-    end
+    @autoinfiltrate
+    if length(m.sig.parameters) == 2
+        integrate_via_indices(u, mesh, equations, dg, cache;
+                            normalize = normalize) do u, i, j, element, equations, dg
+            u_local = get_node_vars(u, equations, dg, i, j, element)
+            return func(u_local, equations)
+        end
+    if length(m.sig.parameters) == 3
+        integrate_via_indices(u, mesh, equations, dg, cache;
+                            normalize = normalize) do u, i, j, element, equations, dg
+            u_local = get_node_vars(u, equations, dg, i, j, element)
+            # Since gradients are calculated for parabolic equations we need to use
+            # some of their infrastructure.
+            viscous_container = init_viscous_container_2d(nvariables(equations),
+                                                        nnodes(cache.elements), nelements(cache.elements),
+                                                        eltype(cache.elements))
+            @unpack u_transformed, gradients, flux_viscous = viscous_container
+            calc_gradient!(gradients, u_transformed, 0.0,
+                                mesh::TreeMesh{2}, equations,
+                                boundary_conditions, dg::DG, parabolic_scheme,
+                                cache, cache)
+            return func(u_local, gradients, equations)
+        end
 end
 
 function integrate(func::Func, u,

src/equations/compressible_euler_multicomponent_2d.jl

@@ -865,4 +865,21 @@ end
     v = u[orientation] / rho
     return v
 end
+
+@inline function enstrophy(u, gradients, equations::CompressibleEulerMulticomponentEquations2D)
+    # Enstrophy is 0.5 rho ω⋅ω where ω = ∇ × v
+
+    omega = vorticity(u, gradients, equations)
+
+    return 0.5f0 * u[1] * omega^2
+end
+
+@inline function vorticity(u, gradients, equations::CompressibleEulerMulticomponentEquations2D)
+    # Ensure that we have velocity `gradients` by way of the `convert_gradient_variables` function.
+    _, dv1dx, dv2dx, _ = convert_derivative_to_primitive(u, gradients[1], equations)
+    _, dv1dy, dv2dy, _ = convert_derivative_to_primitive(u, gradients[2], equations)
+
+    return dv2dx - dv1dy
+end
+
 end # @muladd

src/equations/compressible_navier_stokes_2d.jl

@@ -288,14 +288,14 @@ end
     return SVector(v1, v2)
 end
 
-@inline function enstrophy(u, gradients, equations::CompressibleNavierStokesDiffusion2D)
+@inline function enstrophy(u, equations::CompressibleNavierStokesDiffusion2D; gradients)
     # Enstrophy is 0.5 rho ω⋅ω where ω = ∇ × v
 
     omega = vorticity(u, gradients, equations)
     return 0.5f0 * u[1] * omega^2
 end
 
-@inline function vorticity(u, gradients, equations::CompressibleNavierStokesDiffusion2D)
+@inline function vorticity(u, equations::CompressibleNavierStokesDiffusion2D; gradients)
     # Ensure that we have velocity `gradients` by way of the `convert_gradient_variables` function.
     _, dv1dx, dv2dx, _ = convert_derivative_to_primitive(u, gradients[1], equations)
     _, dv1dy, dv2dy, _ = convert_derivative_to_primitive(u, gradients[2], equations)