diff --git a/R/PEdaily_Oudin.R b/R/PEdaily_Oudin.R index b8fcef19c2964f35b6d441ef76b248a97472fc4b..7689fd5b22f3ccde884131cf3825b6df09cd5b60 100644 --- a/R/PEdaily_Oudin.R +++ b/R/PEdaily_Oudin.R @@ -1,4 +1,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 @@ -49,14 +49,14 @@ PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg")) { ## ---------- Oudin's formula - run_fortran = T + if (run_fortran) { if (LatUnit[1L] == "rad") { Lat = Lat * 180 / pi } LInputs = as.integer(length(Temp)) - + RESULTS <- .Fortran("frun_etp_oudin", PACKAGE="airGR", ##inputs LInputs = LInputs, @@ -66,6 +66,7 @@ PEdaily_Oudin <- function(JD, Temp, LatRad, Lat, LatUnit = c("rad", "deg")) { ##outputs PE_Oudin_D = rep(as.double(-999.999), LInputs) ) + PE_Oudin_D = RESULTS$PE_Oudin_D } else { PE_Oudin_D <- rep(NA, length(Temp)) diff --git a/src/frun_ETP.f90 b/src/frun_ETP.f90 index 5bde3e9c0cf0cd6c636dea5d59fd5b6285e2bc74..2fbb5fdc47794cafc683f4b0ad42919b90df9758 100644 --- a/src/frun_ETP.f90 +++ b/src/frun_ETP.f90 @@ -28,7 +28,6 @@ DO k=1,LInputs tt = InputsTT(k) jj = InputsJJ(k) - ETPoud = -99.9 !model run on one time step CALL ETP_OUDIN(FI,tt,jj,ETPoud) !storage of outputs