Skip to content

Commit a801ea7

Browse files
committed
Use convert function to change type
1 parent faeadbb commit a801ea7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/surface_roughness.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@ true
149149
```
150150
"""
151151
function roughness_parameters(::RoughnessCanopyHeight, zh::FT;
152-
frac_d=FT(0.7), frac_z0m=FT(0.1)) where FT
152+
frac_d=convert(FT,0.7), frac_z0m=convert(FT,0.1)) where FT
153153
d = frac_d*zh
154154
z0m = frac_z0m*zh
155155
z0m_se = missing
156156
(;d, z0m, z0m_se)
157157
end
158158

159159
function roughness_parameters(::RoughnessCanopyHeightLAI, zh::FT, LAI;
160-
cd=FT(0.2), hs=FT(0.01)) where FT
160+
cd=convert(FT,0.2), hs=convert(FT,0.01)) where FT
161161
X = cd * LAI
162-
d = FT(1.1) * zh * log(1 + X^FT(1/4))
163-
z0m = ifelse(0 <= X <= FT(0.2), hs + FT(0.3) * X^(1/2), FT(0.3) * zh * (1 - d/zh))
162+
d = convert(FT,1.1) * zh * log(1 + X^convert(FT,1/4))
163+
z0m = ifelse(0 <= X <= convert(FT,0.2), hs + convert(FT,0.3) * X^(1/2), convert(FT,0.3) * zh * (1 - d/zh))
164164
z0m_se = missing
165165
(;d, z0m, z0m_se)
166166
end

src/unit_conversions.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ function Esat_slope(Tair::Number; Esat_formula=Sonntag1990(), constants=BigleafC
6161
Esat, Delta
6262
end,
6363
function Esat_from_Tair(Tair::FT; Esat_formula=Sonntag1990(), constants=BigleafConstants()) where FT
64-
a,b,c = map(FT, get_EsatCoef(Esat_formula))
64+
a,b,c = map(x -> convert(FT,x), get_EsatCoef(Esat_formula))
6565
Esat = a * exp((b * Tair) / (c + Tair)) * FT(constants.Pa2kPa)
6666
end,
6767
function Esat_from_Tair_deriv(Tair::FT; Esat_formula=Sonntag1990(), constants=BigleafConstants()) where FT
6868
# slope of the saturation vapor pressure curve
6969
#Delta = eval(D(expression(a * exp((b * Tair) / (c + Tair))),name="Tair"))
70-
a,b,c = map(FT, get_EsatCoef(Esat_formula))
70+
a,b,c = map(x -> convert(FT,x), get_EsatCoef(Esat_formula))
7171
#Delta_Pa = @. a*(b / (Tair + c) + (-Tair*b) / ((Tair + c)^2))*exp((Tair*b) / (Tair + c))
7272
Delta_Pa = a * (exp((b * Tair)/(c + Tair)) * (b/(c + Tair) - (b * Tair)/(c + Tair)^2))
73-
Delta = Delta_Pa .* FT(constants.Pa2kPa)
73+
Delta = Delta_Pa .* convert(FT, constants.Pa2kPa)
7474
end
7575

7676
get_EsatCoef(::Sonntag1990) = (a=611.2,b=17.62,c=243.12)

0 commit comments

Comments
 (0)