Merge pull request #267 from CliMA/zs/remove_ft

Remove dispatch on FT

Author: szy21

src/Thermodynamics.jl

@@ -67,7 +67,7 @@ include("printing.jl")
 @inline print_warning() = false
 
 # Default phase partition for dry air
-@inline q_pt_0(::Type{FT}) where {FT} = PhasePartition(FT(0), FT(0), FT(0))
+@inline q_pt_0(::APS{FT}) where {FT} = PhasePartition(FT(0), FT(0), FT(0))
 
 @inline solution_type() = RS.CompactSolution()
 include("DataCollection.jl")

src/air_dry_adiabatic.jl

@@ -26,10 +26,10 @@ for an isentropic process: `p = p₀ * (1 - Φ/(θ * cₚ))^(cₚ/R)`, where `p
 """
 @inline function air_pressure_given_θ(
     param_set::APS,
-    θ::FT,
-    Φ::FT,
+    θ,
+    Φ,
     ::DryAdiabaticProcess,
-) where {FT <: Real}
+)
     p0 = TP.p_ref_theta(param_set)
     _R_d = TP.R_d(param_set)
     _cp_d = TP.cp_d(param_set)
@@ -49,15 +49,9 @@ The pressure is computed using the isentropic relation: `p = p∞ * (T/T∞)^(1/
 where `κ = R/cₚ` is the ratio of the gas constant to the isobaric specific heat capacity
 of dry air.
 """
-@inline function air_pressure(
-    param_set::APS,
-    T::FT,
-    T∞::FT,
-    p∞::FT,
-    ::DryAdiabaticProcess,
-) where {FT <: Real}
+@inline function air_pressure(param_set::APS, T, T∞, p∞, ::DryAdiabaticProcess)
     _kappa_d = TP.kappa_d(param_set)
-    return p∞ * (T / T∞)^(FT(1) / _kappa_d)
+    return p∞ * (T / T∞)^(1 / _kappa_d)
 end
 
 """
@@ -72,12 +66,7 @@ The temperature is computed using the definition of the dry potential temperatur
 `T = θ * (p/p₀)^(R/cₚ)`, where `p₀` is the reference pressure, `R` is the gas constant of dry air,
 and `cₚ` is the isobaric specific heat capacity of dry air.
 """
-@inline function air_temperature(
-    param_set::APS,
-    p::FT,
-    θ::FT,
-    ::DryAdiabaticProcess,
-) where {FT <: Real}
+@inline function air_temperature(param_set::APS, p, θ, ::DryAdiabaticProcess)
     _R_d = TP.R_d(param_set)
     _cp_d = TP.cp_d(param_set)
     p0 = TP.p_ref_theta(param_set)

src/air_energies.jl

@@ -31,9 +31,9 @@ When `q` is not provided, the results are for dry air.
 """
 @inline function internal_energy(
     param_set::APS,
-    T::FT,
-    q::PhasePartition{FT} = q_pt_0(FT),
-) where {FT <: Real}
+    T,
+    q::PhasePartition = q_pt_0(param_set),
+)
     q_vap = vapor_specific_humidity(q)
     q_dry = 1 - q.tot
 
@@ -53,7 +53,7 @@ The dry air internal energy, given
  - `param_set` an `AbstractParameterSet`, see the [`Thermodynamics`](@ref) for more details
  - `T` temperature
 """
-@inline function internal_energy_dry(param_set::APS, T::FT) where {FT <: Real}
+@inline function internal_energy_dry(param_set::APS, T)
     T_0 = TP.T_0(param_set)
     cv_d = TP.cv_d(param_set)
     R_d = TP.R_d(param_set)
@@ -68,7 +68,7 @@ The water vapor internal energy, given
  - `param_set` an `AbstractParameterSet`, see the [`Thermodynamics`](@ref) for more details
  - `T` temperature
 """
-@inline function internal_energy_vapor(param_set::APS, T::FT) where {FT <: Real}
+@inline function internal_energy_vapor(param_set::APS, T)
     T_0 = TP.T_0(param_set)
     cv_v = TP.cv_v(param_set)
     e_int_v0 = TP.e_int_v0(param_set)
@@ -84,10 +84,7 @@ The liquid water internal energy, given
  - `param_set` an `AbstractParameterSet`, see the [`Thermodynamics`](@ref) for more details
  - `T` temperature
 """
-@inline function internal_energy_liquid(
-    param_set::APS,
-    T::FT,
-) where {FT <: Real}
+@inline function internal_energy_liquid(param_set::APS, T)
     T_0 = TP.T_0(param_set)
     cv_l = TP.cv_l(param_set)
 
@@ -102,7 +99,7 @@ The ice internal energy, given
  - `param_set` an `AbstractParameterSet`, see the [`Thermodynamics`](@ref) for more details
  - `T` temperature
 """
-@inline function internal_energy_ice(param_set::APS, T::FT) where {FT <: Real}
+@inline function internal_energy_ice(param_set::APS, T)
     T_0 = TP.T_0(param_set)
     cv_i = TP.cv_i(param_set)
     e_int_i0 = TP.e_int_i0(param_set)
@@ -125,18 +122,18 @@ given
 """
 @inline function internal_energy_sat(
     param_set::APS,
-    T::FT,
-    ρ::FT,
-    q_tot::FT,
+    T,
+    ρ,
+    q_tot,
     ::Type{phase_type},
-    q_pt::PhasePartition{FT} = PhasePartition_equil(
+    q_pt::PhasePartition = PhasePartition_equil(
         param_set,
         T,
         ρ,
         q_tot,
         phase_type,
     ),
-) where {FT <: Real, phase_type <: ThermodynamicState}
+) where {phase_type <: ThermodynamicState}
     return internal_energy(param_set, T, q_pt)
 end
 @inline internal_energy_sat(param_set, T, ρ, q_tot, phase_type) =
@@ -160,11 +157,11 @@ When `q` is not provided, the results are for dry air.
 """
 @inline function total_energy(
     param_set::APS,
-    e_kin::FT,
-    e_pot::FT,
-    T::FT,
-    q::PhasePartition{FT} = q_pt_0(FT),
-) where {FT <: Real}
+    e_kin,
+    e_pot,
+    T,
+    q::PhasePartition = q_pt_0(param_set),
+)
     return internal_energy(param_set, T, q) + e_pot + e_kin
 end
 
@@ -180,7 +177,7 @@ The specific enthalpy, given
 
 This method is deprecated and will be removed in a future release.
 """
-@inline function specific_enthalpy(e_int::FT, R_m::FT, T::FT) where {FT <: Real}
+@inline function specific_enthalpy(e_int, R_m, T)
     return e_int + R_m * T
 end
 
@@ -200,9 +197,9 @@ When `q` is not provided, the results are for dry air.
 """
 @inline function specific_enthalpy(
     param_set::APS,
-    T::FT,
-    q::PhasePartition{FT} = q_pt_0(FT),
-) where {FT <: Real}
+    T,
+    q::PhasePartition = q_pt_0(param_set),
+)
     R_m = gas_constant_air(param_set, q)
     e_int = internal_energy(param_set, T, q)
     return e_int + R_m * T
@@ -222,11 +219,11 @@ and total specific humidity, given
 """
 @inline function specific_enthalpy_sat(
     param_set::APS,
-    T::FT,
-    ρ::FT,
-    q_tot::FT,
+    T,
+    ρ,
+    q_tot,
     ::Type{phase_type},
-) where {FT <: Real, phase_type <: ThermodynamicState}
+) where {phase_type <: ThermodynamicState}
     return specific_enthalpy(
         param_set,
         T,
@@ -302,10 +299,10 @@ When `q` is not provided, the results are for dry air.
 """
 @inline function total_specific_enthalpy(
     param_set::APS,
-    e_tot::FT,
-    T::FT,
-    q::PhasePartition{FT} = q_pt_0(FT),
-) where {FT <: Real}
+    e_tot,
+    T,
+    q::PhasePartition = q_pt_0(param_set),
+)
     R_m = gas_constant_air(param_set, q)
     return e_tot + R_m * T
 end
@@ -320,10 +317,6 @@ The total specific enthalpy, given
  - `R_m` [`gas_constant_air`](@ref)
  - `T` air temperature
 """
-@inline function total_specific_enthalpy(
-    e_tot::FT,
-    R_m::FT,
-    T::FT,
-) where {FT <: Real}
+@inline function total_specific_enthalpy(e_tot, R_m, T)
     return e_tot + R_m * T
 end

src/air_entropies.jl

@@ -15,12 +15,7 @@ The specific entropy, given
 
 The specific entropy is computed from equations (29)-(33) of [Pressel2015](@cite).
 """
-@inline function specific_entropy(
-    param_set::APS,
-    p::FT,
-    T::FT,
-    q::PhasePartition{FT},
-) where {FT <: Real}
+@inline function specific_entropy(param_set::APS, p, T, q::PhasePartition)
     L_v = latent_heat_vapor(param_set, T)
     L_s = latent_heat_sublim(param_set, T)
     s_d = specific_entropy_dry(param_set, p, T, q)
@@ -39,11 +34,11 @@ The dry air specific entropy, given
  - `q` phase partition
 """
 @inline function specific_entropy_dry(
-    param_set::APS,
-    p::FT,
-    T::FT,
-    q::PhasePartition{FT},
-) where {FT <: Real}
+    param_set::APS{FT},
+    p,
+    T,
+    q::PhasePartition,
+) where {FT}
     T_ref = TP.entropy_reference_temperature(param_set)
     p_ref = TP.MSLP(param_set)
     s_d_ref = TP.entropy_dry_air(param_set)
@@ -64,11 +59,11 @@ The specific entropy of water vapor, given
  - `q` phase partition
 """
 @inline function specific_entropy_vapor(
-    param_set::APS,
-    p::FT,
-    T::FT,
-    q::PhasePartition{FT},
-) where {FT <: Real}
+    param_set::APS{FT},
+    p,
+    T,
+    q::PhasePartition,
+) where {FT}
     T_ref = TP.entropy_reference_temperature(param_set)
     p_ref = TP.MSLP(param_set)
     s_v_ref = TP.entropy_water_vapor(param_set)