From 2a524d430ef9908112d14ba7e7de759c63601c1f Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 23 Nov 2020 17:04:11 +0100
Subject: [PATCH] v1.6.3.71 style: rename frun_etp_oudin Fortran subroutine
into frun_pe_oudin to be consitent with the R function name Refs #62
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/PE_Oudin.R | 2 +-
src/{frun_ETP.f90 => frun_PE.f90} | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
rename src/{frun_ETP.f90 => frun_PE.f90} (96%)
diff --git a/DESCRIPTION b/DESCRIPTION
index 3f18ce20..1e6c8db7 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.3.70
+Version: 1.6.3.71
Date: 2020-11-23
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 23725f3f..b53eef01 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.6.3.70 Release Notes (2020-11-23)
+### 1.6.3.71 Release Notes (2020-11-23)
#### New features
diff --git a/R/PE_Oudin.R b/R/PE_Oudin.R
index 92468df8..a156f3b2 100644
--- a/R/PE_Oudin.R
+++ b/R/PE_Oudin.R
@@ -68,7 +68,7 @@ PE_Oudin <- function(JD, Temp,
Lat = rep(Lat, LInputs)
}
- RESULTS <- .Fortran("frun_etp_oudin", PACKAGE = "airGR",
+ RESULTS <- .Fortran("frun_pe_oudin", PACKAGE = "airGR",
##inputs
LInputs = LInputs,
InputsLAT = as.double(Lat),
diff --git a/src/frun_ETP.f90 b/src/frun_PE.f90
similarity index 96%
rename from src/frun_ETP.f90
rename to src/frun_PE.f90
index 9d064c3b..be4e84a5 100644
--- a/src/frun_ETP.f90
+++ b/src/frun_PE.f90
@@ -3,7 +3,7 @@
!------------------------------------------------------------------------------
! TITLE : airGR
! PROJECT : airGR
-! FILE : frun_ETP.f90
+! FILE : frun_PE.f90
!------------------------------------------------------------------------------
! AUTHORS
! Original code: L. Oudin
@@ -21,13 +21,13 @@
! 303(1-4), 290-306.
!------------------------------------------------------------------------------
! Quick description of public procedures:
-! 1. frun_etp_oudin
+! 1. frun_pe_oudin
! 2. PE_OUDIN
!------------------------------------------------------------------------------
!*******************************************************************************
- SUBROUTINE frun_etp_oudin(LInputs,InputsLAT,InputsTemp,InputsJJ,OutputsPE)
+ SUBROUTINE frun_pe_oudin(LInputs,InputsLAT,InputsTemp,InputsJJ,OutputsPE)
!*******************************************************************************
! Subroutine that performs the call to the PE_OUDIN subroutine at each time step,
! and stores the final values
@@ -41,7 +41,7 @@
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_etp_oudin
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_pe_oudin
Implicit None
--
GitLab