Move velocity into elixir

trixi-framework · Oct 22, 2023 · 09f1e85 · 09f1e85
1 parent 825ff34
commit 09f1e85
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 32 deletions.
diff --git a/examples/tree_2d_dgsem/elixir_navierstokes_shearlayer_amr.jl b/examples/tree_2d_dgsem/elixir_navierstokes_shearlayer_amr.jl
@@ -55,7 +55,7 @@ semi = SemidiscretizationHyperbolicParabolic(mesh, (equations, equations_parabol
 ###############################################################################
 # ODE solvers, callbacks etc.
 
-tspan = (0.0, 0.7)
+tspan = (0.0, 1.0)
 ode = semidiscretize(semi, tspan)
 
 summary_callback = SummaryCallback()
@@ -66,6 +66,10 @@ analysis_callback = AnalysisCallback(semi, interval=analysis_interval)
 alive_callback = AliveCallback(analysis_interval=analysis_interval,)
 
 # This uses velocity-based AMR
+@inline function v1(u, equations::CompressibleEulerEquations2D)
+  rho, rho_v1, _, _ = u
+  return rho_v1 / rho
+end
 amr_indicator = IndicatorLöhner(semi, variable=v1)                                          
 amr_controller = ControllerThreeLevel(semi, amr_indicator,
                                       base_level = 3,

diff --git a/src/equations/compressible_euler_1d.jl b/src/equations/compressible_euler_1d.jl
@@ -973,11 +973,6 @@ end
     return rho_times_p
 end
 
-@inline function v1(u, equations::CompressibleEulerEquations1D)
-    rho, rho_v1, _ = u
-    return rho_v1 / rho
-end
-
 # Calculate thermodynamic entropy for a conservative state `cons`
 @inline function entropy_thermodynamic(cons, equations::CompressibleEulerEquations1D)
     # Pressure

diff --git a/src/equations/compressible_euler_2d.jl b/src/equations/compressible_euler_2d.jl
@@ -1428,16 +1428,6 @@ end
     return rho_times_p
 end
 
-@inline function v1(u, equations::CompressibleEulerEquations2D)
-    rho, rho_v1, _, _ = u
-    return rho_v1 / rho
-end
-
-@inline function v2(u, equations::CompressibleEulerEquations2D)
-    rho, _, rho_v2, _ = u
-    return rho_v2 / rho
-end
-
 # Calculates the entropy flux in direction "orientation" and the entropy variables for a state cons
 # NOTE: This method seems to work currently (b82534e) but is never used anywhere. Thus it is
 # commented here until someone uses it or writes a test for it.

diff --git a/src/equations/compressible_euler_3d.jl b/src/equations/compressible_euler_3d.jl
@@ -1514,21 +1514,6 @@ end
     return rho_times_p
 end
 
-@inline function v1(u, equations::CompressibleEulerEquations3D)
-    rho, rho_v1, _, _, _ = u
-    return rho_v1 / rho
-end
-
-@inline function v2(u, equations::CompressibleEulerEquations3D)
-    rho, _, rho_v2, _, _ = u
-    return rho_v2 / rho
-end
-
-@inline function v3(u, equations::CompressibleEulerEquations3D)
-    rho, _, _, rho_v3, _ = u
-    return rho_v3 / rho
-end
-
 # Calculate thermodynamic entropy for a conservative state `u`
 @inline function entropy_thermodynamic(u, equations::CompressibleEulerEquations3D)
     rho, _ = u

diff --git a/test/test_parabolic_2d.jl b/test/test_parabolic_2d.jl
@@ -252,7 +252,8 @@ isdir(outdir) && rm(outdir, recursive=true)
   @trixi_testset "TreeMesh2D: elixir_navierstokes_shearlayer_amr.jl" begin
     @test_trixi_include(joinpath(examples_dir(), "tree_2d_dgsem", "elixir_navierstokes_shearlayer_amr.jl"),
       l2 = [0.00526017743452336, 0.4130430692895672, 0.4310996183791349, 1.1544344171604635],
-      linf = [0.03492185879198495, 1.392635891671335, 1.357551616406459, 8.713760873018146]
+      linf = [0.03492185879198495, 1.392635891671335, 1.357551616406459, 8.713760873018146],
+      tspan = (0.0, 0.7)
     )
   end