UPDATE: ETP Oudin daily in Fortran

f6bf5f48 · François Bourgin · fbourgin · 83bf349f · f6bf5f48 · f6bf5f48
Commit f6bf5f48 authored 4 years ago by François Bourgin Committed by fbourgin 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 4 deletions
+4 -4
--- a/R/PEdaily_Oudin.R
+++ b/R/PEdaily_Oudin.R
-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))

--- 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