Skip to content

Commit 4748cb7

Browse files
authored
Merge pull request #3600 from PecanProject/dlebauer-patch-1
Revert to PEcAn.utils::ud_convert
2 parents f987989 + b86e4e3 commit 4748cb7

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

modules/data.atmosphere/R/metutils.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,23 @@ sat_vapor_pressure <- function(
126126

127127
if (method == "Magnus") {
128128
# canonical temp: degC; canonical pressure: kPa
129-
Tc <- units::ud_convert(temp, temp_units, "degC")
129+
Tc <- PEcAn.utils::ud_convert(temp, temp_units, "degC")
130130
es_kPa <- 0.61078 * exp((17.27 * Tc) / (Tc + 237.3))
131-
return(units::ud_convert(es_kPa, "kPa", out_units))
131+
return(PEcAn.utils::ud_convert(es_kPa, "kPa", out_units))
132132
}
133133

134134
if (method == "ClausiusClapeyron") {
135135
# canonical temp: degC; canonical pressure: hPa
136-
Tc <- units::ud_convert(temp, temp_units, "degC")
136+
Tc <- PEcAn.utils::ud_convert(temp, temp_units, "degC")
137137
L <- 2.5e6 # J kg^-1
138138
Rv <- 461 # J kg^-1 K^-1
139139
es_hPa <- 6.11 * exp((L / Rv) * (1 / 273 - 1 / (273 + Tc)))
140-
return(units::ud_convert(es_hPa, "hPa", out_units))
140+
return(PEcAn.utils::ud_convert(es_hPa, "hPa", out_units))
141141
}
142142

143143
if (method == "GoffGratch") {
144144
# canonical temp: K; canonical pressure: hPa
145-
Tk <- units::ud_convert(temp, temp_units, "K")
145+
Tk <- PEcAn.utils::ud_convert(temp, temp_units, "K")
146146
Tst <- 373.15 # K
147147
est <- 1013.246 # hPa at steam point
148148
lg10 <- function(z) log10(z)
@@ -152,7 +152,7 @@ sat_vapor_pressure <- function(
152152
8.1328e-3 * (10^(-3.49149 * (Tst / Tk - 1)) - 1) +
153153
lg10(est)
154154
es_hPa <- 10^log10_es
155-
return(units::ud_convert(es_hPa, "hPa", out_units))
155+
return(PEcAn.utils::ud_convert(es_hPa, "hPa", out_units))
156156
}
157157
}
158158

0 commit comments

Comments
 (0)