avoid if

trixi-framework · Mar 22, 2024 · b0d2c6e · b0d2c6e
1 parent 08bd818
commit b0d2c6e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/src/equations/compressible_navier_stokes.jl b/src/equations/compressible_navier_stokes.jl
@@ -62,3 +62,7 @@ Under `GradientVariablesEntropy`, the Navier-Stokes discretization is provably e
 """
 struct GradientVariablesPrimitive end
 struct GradientVariablesEntropy end
+
+dynamic_viscosity(u, equations) = dynamic_viscosity(u, equations.mu, equations)
+dynamic_viscosity(u, mu::Real, equations) = mu
+dynamic_viscosity(u, mu::T, equations) where {T} = mu(u, equations)
diff --git a/src/equations/compressible_navier_stokes_1d.jl b/src/equations/compressible_navier_stokes_1d.jl
@@ -166,13 +166,7 @@ function flux(u, gradients, orientation::Integer,
     # In the simplest cases, the user passed in `mu` or `mu()` 
     # (which returns just a constant) but
     # more complex functions like Sutherland's law are possible.
-    if equations.mu isa Real
-        mu = equations.mu
-    else
-        # The equations are equipped with a function that computes the dynamic viscosity mu
-        # from the current state. 
-        mu = equations.mu(u, equations)
-    end
+    mu = dynamic_viscosity(u, equations)
 
     # viscous flux components in the x-direction
     f1 = zero(rho)

diff --git a/src/equations/compressible_navier_stokes_2d.jl b/src/equations/compressible_navier_stokes_2d.jl
@@ -175,13 +175,7 @@ function flux(u, gradients, orientation::Integer,
     # In the simplest cases, the user passed in `mu` or `mu()` 
     # (which returns just a constant) but
     # more complex functions like Sutherland's law are possible.
-    if equations.mu isa Real
-        mu = equations.mu
-    else
-        # The equations are equipped with a function that computes the dynamic viscosity mu
-        # from the current state. 
-        mu = equations.mu(u, equations)
-    end
+    mu = dynamic_viscosity(u, equations)
 
     if orientation == 1
         # viscous flux components in the x-direction

diff --git a/src/equations/compressible_navier_stokes_3d.jl b/src/equations/compressible_navier_stokes_3d.jl
@@ -188,13 +188,7 @@ function flux(u, gradients, orientation::Integer,
     # In the simplest cases, the user passed in `mu` or `mu()` 
     # (which returns just a constant) but
     # more complex functions like Sutherland's law are possible.
-    if equations.mu isa Real
-        mu = equations.mu
-    else
-        # The equations are equipped with a function that computes the dynamic viscosity mu
-        # from the current state. 
-        mu = equations.mu(u, equations)
-    end
+    mu = dynamic_viscosity(u, equations)
 
     if orientation == 1
         # viscous flux components in the x-direction