Semantic code order for Multi Equations Constructors (#2202)

trixi-framework · Dec 11, 2024 · f45455b · f45455b
1 parent a151e74
commit f45455b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/src/equations/compressible_euler_multicomponent_1d.jl b/src/equations/compressible_euler_multicomponent_1d.jl
@@ -78,13 +78,12 @@ function CompressibleEulerMulticomponentEquations1D(; gammas, gas_constants)
     _gas_constants = promote(gas_constants...)
     RealT = promote_type(eltype(_gammas), eltype(_gas_constants),
                          typeof(gas_constants[1] / (gammas[1] - 1)))
+    __gammas = SVector(map(RealT, _gammas))
+    __gas_constants = SVector(map(RealT, _gas_constants))
 
     NVARS = length(_gammas) + 2
     NCOMP = length(_gammas)
 
-    __gammas = SVector(map(RealT, _gammas))
-    __gas_constants = SVector(map(RealT, _gas_constants))
-
     return CompressibleEulerMulticomponentEquations1D{NVARS, NCOMP, RealT}(__gammas,
                                                                            __gas_constants)
 end

diff --git a/src/equations/compressible_euler_multicomponent_2d.jl b/src/equations/compressible_euler_multicomponent_2d.jl
@@ -82,13 +82,12 @@ function CompressibleEulerMulticomponentEquations2D(; gammas, gas_constants)
     _gas_constants = promote(gas_constants...)
     RealT = promote_type(eltype(_gammas), eltype(_gas_constants),
                          typeof(gas_constants[1] / (gammas[1] - 1)))
+    __gammas = SVector(map(RealT, _gammas))
+    __gas_constants = SVector(map(RealT, _gas_constants))
 
     NVARS = length(_gammas) + 3
     NCOMP = length(_gammas)
 
-    __gammas = SVector(map(RealT, _gammas))
-    __gas_constants = SVector(map(RealT, _gas_constants))
-
     return CompressibleEulerMulticomponentEquations2D{NVARS, NCOMP, RealT}(__gammas,
                                                                            __gas_constants)
 end

diff --git a/src/equations/ideal_glm_mhd_multicomponent_1d.jl b/src/equations/ideal_glm_mhd_multicomponent_1d.jl
@@ -41,12 +41,12 @@ function IdealGlmMhdMulticomponentEquations1D(; gammas, gas_constants)
     _gas_constants = promote(gas_constants...)
     RealT = promote_type(eltype(_gammas), eltype(_gas_constants))
 
-    NVARS = length(_gammas) + 7
-    NCOMP = length(_gammas)
-
     __gammas = SVector(map(RealT, _gammas))
     __gas_constants = SVector(map(RealT, _gas_constants))
 
+    NVARS = length(_gammas) + 7
+    NCOMP = length(_gammas)
+
     return IdealGlmMhdMulticomponentEquations1D{NVARS, NCOMP, RealT}(__gammas,
                                                                      __gas_constants)
 end

diff --git a/src/equations/ideal_glm_mhd_multicomponent_2d.jl b/src/equations/ideal_glm_mhd_multicomponent_2d.jl
@@ -42,15 +42,14 @@ function IdealGlmMhdMulticomponentEquations2D(; gammas, gas_constants)
     _gammas = promote(gammas...)
     _gas_constants = promote(gas_constants...)
     RealT = promote_type(eltype(_gammas), eltype(_gas_constants))
-
-    NVARS = length(_gammas) + 8
-    NCOMP = length(_gammas)
-
     __gammas = SVector(map(RealT, _gammas))
     __gas_constants = SVector(map(RealT, _gas_constants))
 
     c_h = convert(RealT, NaN)
 
+    NVARS = length(_gammas) + 8
+    NCOMP = length(_gammas)
+
     return IdealGlmMhdMulticomponentEquations2D{NVARS, NCOMP, RealT}(__gammas,
                                                                      __gas_constants,
                                                                      c_h)
@@ -61,15 +60,14 @@ function IdealGlmMhdMulticomponentEquations2D(gammas, gas_constants, cv, cp, c_h
     _gammas = promote(gammas...)
     _gas_constants = promote(gas_constants...)
     RealT = promote_type(eltype(_gammas), eltype(_gas_constants))
-
-    NVARS = length(_gammas) + 8
-    NCOMP = length(_gammas)
-
     __gammas = SVector(map(RealT, _gammas))
     __gas_constants = SVector(map(RealT, _gas_constants))
 
     c_h = convert(RealT, c_h)
 
+    NVARS = length(_gammas) + 8
+    NCOMP = length(_gammas)
+
     return IdealGlmMhdMulticomponentEquations2D{NVARS, NCOMP, RealT}(__gammas,
                                                                      __gas_constants,
                                                                      c_h)