non-functionalized mu

trixi-framework · Mar 19, 2024 · 040eca8 · 040eca8
1 parent 4ddfaf6
commit 040eca8
Show file tree

Hide file tree

Showing 26 changed files with 68 additions and 56 deletions.
diff --git a/examples/dgmulti_2d/elixir_navierstokes_convergence.jl b/examples/dgmulti_2d/elixir_navierstokes_convergence.jl
@@ -5,12 +5,12 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations2D(1.4)
 # Note: If you change the Navier-Stokes parameters here, also change them in the initial condition
 # I really do not like this structure but it should work for now
-equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -55,7 +55,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/dgmulti_2d/elixir_navierstokes_convergence_curved.jl b/examples/dgmulti_2d/elixir_navierstokes_convergence_curved.jl
@@ -5,12 +5,12 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations2D(1.4)
 # Note: If you change the Navier-Stokes parameters here, also change them in the initial condition
 # I really do not like this structure but it should work for now
-equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -63,7 +63,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/dgmulti_2d/elixir_navierstokes_lid_driven_cavity.jl b/examples/dgmulti_2d/elixir_navierstokes_lid_driven_cavity.jl
@@ -5,7 +5,7 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.001
+mu = 0.001
 
 equations = CompressibleEulerEquations2D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,

diff --git a/examples/dgmulti_3d/elixir_navierstokes_convergence.jl b/examples/dgmulti_3d/elixir_navierstokes_convergence.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations3D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -57,7 +57,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Constants. OBS! Must match those in `initial_condition_navier_stokes_convergence_test`
     c = 2.0

diff --git a/examples/dgmulti_3d/elixir_navierstokes_convergence_curved.jl b/examples/dgmulti_3d/elixir_navierstokes_convergence_curved.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations3D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -65,7 +65,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Constants. OBS! Must match those in `initial_condition_navier_stokes_convergence_test`
     c = 2.0

diff --git a/examples/dgmulti_3d/elixir_navierstokes_taylor_green_vortex.jl b/examples/dgmulti_3d/elixir_navierstokes_taylor_green_vortex.jl
@@ -6,7 +6,7 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 6.25e-4 # equivalent to Re = 1600
+mu = 6.25e-4 # equivalent to Re = 1600
 
 equations = CompressibleEulerEquations3D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,

diff --git a/examples/p4est_2d_dgsem/elixir_navierstokes_convergence.jl b/examples/p4est_2d_dgsem/elixir_navierstokes_convergence.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations2D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -55,7 +55,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/p4est_2d_dgsem/elixir_navierstokes_convergence_nonperiodic.jl b/examples/p4est_2d_dgsem/elixir_navierstokes_convergence_nonperiodic.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations2D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -55,7 +55,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/p4est_2d_dgsem/elixir_navierstokes_lid_driven_cavity.jl b/examples/p4est_2d_dgsem/elixir_navierstokes_lid_driven_cavity.jl
@@ -5,7 +5,7 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.001
+mu = 0.001
 
 equations = CompressibleEulerEquations2D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,

diff --git a/examples/p4est_2d_dgsem/elixir_navierstokes_lid_driven_cavity_amr.jl b/examples/p4est_2d_dgsem/elixir_navierstokes_lid_driven_cavity_amr.jl
@@ -5,7 +5,7 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.001
+mu = 0.001
 
 equations = CompressibleEulerEquations2D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,

diff --git a/examples/p4est_3d_dgsem/elixir_navierstokes_blast_wave_amr.jl b/examples/p4est_3d_dgsem/elixir_navierstokes_blast_wave_amr.jl
@@ -6,7 +6,7 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 6.25e-4 # equivalent to Re = 1600
+mu = 6.25e-4 # equivalent to Re = 1600
 
 equations = CompressibleEulerEquations3D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,

diff --git a/examples/p4est_3d_dgsem/elixir_navierstokes_convergence.jl b/examples/p4est_3d_dgsem/elixir_navierstokes_convergence.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations3D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -58,7 +58,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Constants. OBS! Must match those in `initial_condition_navier_stokes_convergence_test`
     c = 2.0

diff --git a/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex.jl b/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex.jl
@@ -6,7 +6,7 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 6.25e-4 # equivalent to Re = 1600
+mu = 6.25e-4 # equivalent to Re = 1600
 
 equations = CompressibleEulerEquations3D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,

diff --git a/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex_amr.jl b/examples/p4est_3d_dgsem/elixir_navierstokes_taylor_green_vortex_amr.jl
@@ -6,7 +6,7 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 6.25e-4 # equivalent to Re = 1600
+mu = 6.25e-4 # equivalent to Re = 1600
 
 equations = CompressibleEulerEquations3D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,

diff --git a/examples/tree_1d_dgsem/elixir_navierstokes_convergence_periodic.jl b/examples/tree_1d_dgsem/elixir_navierstokes_convergence_periodic.jl
@@ -6,10 +6,10 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 6.25e-4 # equivalent to Re = 1600
+mu() = 6.25e-4 # equivalent to Re = 1600
 
 equations = CompressibleEulerEquations1D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion1D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion1D(equations, mu = mu(),
                                                           Prandtl = prandtl_number())
 
 # This convergence test setup was originally derived by Andrew Winters (@andrewwinters5000)
@@ -36,7 +36,7 @@ initial_condition = initial_condition_navier_stokes_convergence_test
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/tree_1d_dgsem/elixir_navierstokes_convergence_walls.jl b/examples/tree_1d_dgsem/elixir_navierstokes_convergence_walls.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations1D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion1D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion1D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -53,7 +53,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/tree_1d_dgsem/elixir_navierstokes_convergence_walls_amr.jl b/examples/tree_1d_dgsem/elixir_navierstokes_convergence_walls_amr.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations1D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion1D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion1D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesEntropy())
 
@@ -53,7 +53,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/tree_2d_dgsem/elixir_navierstokes_convergence.jl b/examples/tree_2d_dgsem/elixir_navierstokes_convergence.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations2D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -55,7 +55,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Same settings as in `initial_condition`
     # Amplitude and shift

diff --git a/examples/tree_2d_dgsem/elixir_navierstokes_lid_driven_cavity.jl b/examples/tree_2d_dgsem/elixir_navierstokes_lid_driven_cavity.jl
@@ -5,7 +5,7 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.001
+mu = 0.001
 
 equations = CompressibleEulerEquations2D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,

diff --git a/examples/tree_2d_dgsem/elixir_navierstokes_shearlayer_amr.jl b/examples/tree_2d_dgsem/elixir_navierstokes_shearlayer_amr.jl
@@ -6,7 +6,7 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 1.0 / 3.0 * 10^(-4) # equivalent to Re = 30,000
+mu = 1.0 / 3.0 * 10^(-4) # equivalent to Re = 30,000
 
 equations = CompressibleEulerEquations2D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,

diff --git a/examples/tree_2d_dgsem/elixir_navierstokes_taylor_green_vortex.jl b/examples/tree_2d_dgsem/elixir_navierstokes_taylor_green_vortex.jl
@@ -6,7 +6,7 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 6.25e-4 # equivalent to Re = 1600
+mu = 6.25e-4 # equivalent to Re = 1600
 
 equations = CompressibleEulerEquations2D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion2D(equations, mu = mu,

diff --git a/examples/tree_3d_dgsem/elixir_navierstokes_convergence.jl b/examples/tree_3d_dgsem/elixir_navierstokes_convergence.jl
@@ -5,10 +5,10 @@ using Trixi
 # semidiscretization of the ideal compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 0.01
+mu() = 0.01
 
 equations = CompressibleEulerEquations3D(1.4)
-equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,
+equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu(),
                                                           Prandtl = prandtl_number(),
                                                           gradient_variables = GradientVariablesPrimitive())
 
@@ -58,7 +58,7 @@ end
     # see also https://github.com/trixi-framework/Trixi.jl/pull/1160
     inv_gamma_minus_one = inv(equations.gamma - 1)
     Pr = prandtl_number()
-    mu_ = mu(u, equations)
+    mu_ = mu()
 
     # Constants. OBS! Must match those in `initial_condition_navier_stokes_convergence_test`
     c = 2.0

diff --git a/examples/tree_3d_dgsem/elixir_navierstokes_taylor_green_vortex.jl b/examples/tree_3d_dgsem/elixir_navierstokes_taylor_green_vortex.jl
@@ -6,7 +6,7 @@ using Trixi
 # semidiscretization of the compressible Navier-Stokes equations
 
 prandtl_number() = 0.72
-mu(u, equations) = 6.25e-4 # equivalent to Re = 1600
+mu = 6.25e-4 # equivalent to Re = 1600
 
 equations = CompressibleEulerEquations3D(1.4)
 equations_parabolic = CompressibleNavierStokesDiffusion3D(equations, mu = mu,

diff --git a/src/equations/compressible_navier_stokes_1d.jl b/src/equations/compressible_navier_stokes_1d.jl
@@ -160,11 +160,15 @@ function flux(u, gradients, orientation::Integer,
     # in the implementation
     q1 = equations.kappa * dTdx
 
-    # The equations are equipped with a function that computes the dynamic viscosity mu
-    # from the current state. 
     # In the simplest case, `mu(u, equations)` returns just a constant but
     # more complex functions like Sutherland's law are possible.
-    mu = equations.mu(u, equations)
+    if equations.mu isa Real
+        mu = equations.mu
+        # The equations are equipped with a function that computes the dynamic viscosity mu
+        # from the current state. 
+    else
+        mu = equations.mu(u, equations)
+    end
 
     # viscous flux components in the x-direction
     f1 = zero(rho)