Commit f6bf5f48 authored by François Bourgin's avatar François Bourgin Committed by fbourgin
Browse files

UPDATE: ETP Oudin daily in Fortran

Showing with 4 additions and 4 deletions
+4 -4
PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg")) { PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg"), run_fortran = F) {
## ---------- deprecated function ## ---------- deprecated function
...@@ -49,14 +49,14 @@ PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg")) { ...@@ -49,14 +49,14 @@ PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg")) {
## ---------- Oudin's formula ## ---------- Oudin's formula
run_fortran = T
if (run_fortran) if (run_fortran)
{ {
if (LatUnit[1L] == "rad") { if (LatUnit[1L] == "rad") {
Lat = Lat * 180 / pi Lat = Lat * 180 / pi
} }
LInputs = as.integer(length(Temp)) LInputs = as.integer(length(Temp))
RESULTS <- .Fortran("frun_etp_oudin", PACKAGE="airGR", RESULTS <- .Fortran("frun_etp_oudin", PACKAGE="airGR",
##inputs ##inputs
LInputs = LInputs, LInputs = LInputs,
...@@ -66,6 +66,7 @@ PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg")) { ...@@ -66,6 +66,7 @@ PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg")) {
##outputs ##outputs
PE_Oudin_D = rep(as.double(-999.999), LInputs) PE_Oudin_D = rep(as.double(-999.999), LInputs)
) )
PE_Oudin_D = RESULTS$PE_Oudin_D
} else { } else {
PE_Oudin_D <- rep(NA, length(Temp)) PE_Oudin_D <- rep(NA, length(Temp))
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
DO k=1,LInputs DO k=1,LInputs
tt = InputsTT(k) tt = InputsTT(k)
jj = InputsJJ(k) jj = InputsJJ(k)
ETPoud = -99.9
!model run on one time step !model run on one time step
CALL ETP_OUDIN(FI,tt,jj,ETPoud) CALL ETP_OUDIN(FI,tt,jj,ETPoud)
!storage of outputs !storage of outputs
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment