Merge pull request #195 from CliMA/ck/rm_type_casting

Remove type casting of parameters
CliMA · Feb 13, 2024 · 5d3b8e0 · 5d3b8e0
2 parents fa610f8 + 53b65cd
commit 5d3b8e0
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 144 deletions.
diff --git a/src/TemperatureProfiles.jl b/src/TemperatureProfiles.jl
@@ -74,10 +74,10 @@ to be greater than or equal to `profile.T_min_ref`.
 """
 function (profile::DryAdiabaticProfile)(param_set::APS, z::FT) where {FT}
 
-    R_d::FT = TP.R_d(param_set)
-    cp_d::FT = TP.cp_d(param_set)
-    grav::FT = TP.grav(param_set)
-    MSLP::FT = TP.MSLP(param_set)
+    R_d = TP.R_d(param_set)
+    cp_d = TP.cp_d(param_set)
+    grav = TP.grav(param_set)
+    MSLP = TP.MSLP(param_set)
 
     # Temperature
     Γ = grav / cp_d
@@ -127,9 +127,9 @@ end
 
 
 function (profile::DecayingTemperatureProfile)(param_set::APS, z::FT) where {FT}
-    R_d::FT = TP.R_d(param_set)
-    grav::FT = TP.grav(param_set)
-    MSLP::FT = TP.MSLP(param_set)
+    R_d = TP.R_d(param_set)
+    grav = TP.grav(param_set)
+    MSLP = TP.MSLP(param_set)
 
     # Scale height for surface temperature
     H_sfc = R_d * profile.T_virt_surf / grav

diff --git a/src/TestedProfiles.jl b/src/TestedProfiles.jl
@@ -169,8 +169,8 @@ function PhaseDryProfiles(param_set::APS, ::Type{ArrayType}) where {ArrayType}
         shared_profiles(param_set, z_range, relative_sat, T_surface, T_min)
     T = T_virt
     FT = eltype(T)
-    R_d::FT = TP.R_d(param_set)
-    grav::FT = TP.grav(param_set)
+    R_d = TP.R_d(param_set)
+    grav = TP.grav(param_set)
     ρ = p ./ (R_d .* T)
 
     # Additional variables
@@ -235,8 +235,8 @@ function PhaseEquilProfiles(param_set::APS, ::Type{ArrayType}) where {ArrayType}
     T = T_virt
 
     FT = eltype(T)
-    R_d::FT = TP.R_d(param_set)
-    grav::FT = TP.grav(param_set)
+    R_d = TP.R_d(param_set)
+    grav = TP.grav(param_set)
     # Compute total specific humidity from temperature, pressure
     # and relative saturation, and partition the saturation excess
     # according to temperature.

diff --git a/src/config_numerical_method.jl b/src/config_numerical_method.jl
@@ -55,7 +55,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.NewtonsMethod, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     T_init = if T_guess isa Nothing
         max(T_min, air_temperature(param_set, e_int, PhasePartition(q_tot))) # Assume all vapor
     else
@@ -73,7 +73,7 @@ end
     ::Type{phase_type},
     T_guess::FT,
 ) where {FT, NM <: RS.NewtonsMethodAD, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     T_init = if T_guess isa Nothing
         max(T_min, air_temperature(param_set, e_int, PhasePartition(q_tot))) # Assume all vapor
     else
@@ -91,7 +91,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.SecantMethod, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     q_pt = PhasePartition(q_tot, FT(0), q_tot) # Assume all ice
     T_2 = air_temperature(param_set, e_int, q_pt)
     T_1 = max(T_min, air_temperature(param_set, e_int, PhasePartition(q_tot))) # Assume all vapor
@@ -108,7 +108,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.RegulaFalsiMethod, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     q_pt = PhasePartition(q_tot, FT(0), q_tot) # Assume all ice
     T_2 = air_temperature(param_set, e_int, q_pt)
     T_1 = max(T_min, air_temperature(param_set, e_int, PhasePartition(q_tot))) # Assume all vapor
@@ -166,7 +166,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.NewtonsMethodAD, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     T_init = if T_guess isa Nothing
         max(T_min, air_temperature(param_set, e_int, PhasePartition(q_tot))) # Assume all vapor
     else
@@ -184,7 +184,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.SecantMethod, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     q_pt = PhasePartition(q_tot, FT(0), q_tot) # Assume all ice
     T_2 = air_temperature(param_set, e_int, q_pt)
     T_1 = max(T_min, air_temperature(param_set, e_int, PhasePartition(q_tot))) # Assume all vapor
@@ -205,7 +205,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.NewtonsMethodAD, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     T_init = if T_guess isa Nothing # Assume all vapor
         max(
             T_min,
@@ -226,7 +226,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.SecantMethod, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     q_pt = PhasePartition(q_tot, FT(0), q_tot) # Assume all ice
     T_2 = air_temperature_from_enthalpy(param_set, h, q_pt)
     T_1 = max(
@@ -246,7 +246,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.RegulaFalsiMethod, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     q_pt = PhasePartition(q_tot, FT(0), q_tot) # Assume all ice
     T_2 = air_temperature_from_enthalpy(param_set, h, q_pt)
     T_1 = max(
@@ -270,8 +270,8 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.RegulaFalsiMethod, phase_type <: PhaseEquil}
-    _T_min::FT = TP.T_min(param_set)
-    _T_max::FT = TP.T_max(param_set)
+    _T_min = TP.T_min(param_set)
+    _T_max = TP.T_max(param_set)
     @inline air_temp(q) = air_temperature_given_pθq(param_set, p, θ_liq_ice, q)
     T_1 = max(_T_min, air_temp(PhasePartition(q_tot))) # Assume all vapor
     T_2 = T_1 + 10
@@ -288,7 +288,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.SecantMethod, phase_type <: PhaseEquil}
-    _T_min::FT = TP.T_min(param_set)
+    _T_min = TP.T_min(param_set)
     @inline air_temp(q) = air_temperature_given_pθq(param_set, p, θ_liq_ice, q)
     T_1 = max(_T_min, air_temp(PhasePartition(q_tot))) # Assume all vapor
     T_2 = air_temp(PhasePartition(q_tot, FT(0), q_tot)) # Assume all ice
@@ -305,7 +305,7 @@ end
     ::Type{phase_type},
     T_guess::Union{FT, Nothing},
 ) where {FT, NM <: RS.NewtonsMethodAD, phase_type <: PhaseEquil}
-    T_min::FT = TP.T_min(param_set)
+    T_min = TP.T_min(param_set)
     @inline air_temp(q) = air_temperature_given_pθq(param_set, p, θ_liq_ice, q)
     T_init = if T_guess isa Nothing
         max(T_min, air_temp(PhasePartition(q_tot))) # Assume all vapor

diff --git a/src/isentropic.jl b/src/isentropic.jl
@@ -28,9 +28,9 @@ The air pressure for an isentropic process, where
     Φ::FT,
     ::DryAdiabaticProcess,
 ) where {FT <: Real}
-    p0::FT = TP.p_ref_theta(param_set)
-    _R_d::FT = TP.R_d(param_set)
-    _cp_d::FT = TP.cp_d(param_set)
+    p0 = TP.p_ref_theta(param_set)
+    _R_d = TP.R_d(param_set)
+    _cp_d = TP.cp_d(param_set)
     return p0 * (1 - Φ / (θ * _cp_d))^(_cp_d / _R_d)
 end
 
@@ -51,7 +51,7 @@ The air pressure for an isentropic process, where
     p∞::FT,
     ::DryAdiabaticProcess,
 ) where {FT <: Real}
-    _kappa_d::FT = TP.kappa_d(param_set)
+    _kappa_d = TP.kappa_d(param_set)
     return p∞ * (T / T∞)^(FT(1) / _kappa_d)
 end
 
@@ -70,8 +70,8 @@ The air temperature for an isentropic process, where
     θ::FT,
     ::DryAdiabaticProcess,
 ) where {FT <: Real}
-    _R_d::FT = TP.R_d(param_set)
-    _cp_d::FT = TP.cp_d(param_set)
-    p0::FT = TP.p_ref_theta(param_set)
+    _R_d = TP.R_d(param_set)
+    _cp_d = TP.cp_d(param_set)
+    p0 = TP.p_ref_theta(param_set)
     return (p / p0)^(_R_d / _cp_d) * θ
 end