From dd5301e2049623afea08d828c22c1f7aab539e54 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 19 Jun 2019 11:49:06 +0200
Subject: [PATCH] v1.3.2.19 CLEAN: uppercase and lowercase corrected for
Fortran subroutines original declaration
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/RunModel_CemaNeige.R | 2 +-
R/RunModel_CemaNeigeGR4H.R | 4 ++--
R/RunModel_CemaNeigeGR4J.R | 4 ++--
R/RunModel_CemaNeigeGR5J.R | 4 ++--
R/RunModel_CemaNeigeGR6J.R | 4 ++--
R/RunModel_GR2M.R | 2 +-
R/RunModel_GR4H.R | 2 +-
R/RunModel_GR4J.R | 2 +-
R/RunModel_GR5J.R | 2 +-
R/RunModel_GR6J.R | 2 +-
src/frun_CEMANEIGE.f | 4 ++--
src/frun_GR1A.f | 4 ++--
src/frun_GR2M.f | 4 ++--
src/frun_GR4H.f | 4 ++--
src/frun_GR4J.f | 4 ++--
src/frun_GR5J.f | 4 ++--
src/frun_GR6J.f | 4 ++--
19 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 8ec2e93d..bb36da0c 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.3.2.18
+Version: 1.3.2.19
Date: 2019-06-19
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index 3800c04d..77f065f0 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.3.2.18 Release Notes (2019-06-19)
+### 1.3.2.19 Release Notes (2019-06-19)
#### New features
diff --git a/R/RunModel_CemaNeige.R b/R/RunModel_CemaNeige.R
index eaaf7424..929a5f90 100644
--- a/R/RunModel_CemaNeige.R
+++ b/R/RunModel_CemaNeige.R
@@ -79,7 +79,7 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param) {
} else {
StateStartCemaNeige <- RunOptions$IniStates[(7 + 20*time_mult + 40*time_mult) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
}
- RESULTS <- .Fortran("frun_CemaNeige", PACKAGE = "airGR",
+ RESULTS <- .Fortran("frun_cemaneige", PACKAGE = "airGR",
## inputs
LInputs = as.integer(length(IndPeriod1)), ### length of input and output series
InputsPrecip = InputsModel$LayerPrecip[[iLayer]][IndPeriod1], ### input series of total precipitation [mm/time step]
diff --git a/R/RunModel_CemaNeigeGR4H.R b/R/RunModel_CemaNeigeGR4H.R
index ea9edfe5..e632eaa5 100644
--- a/R/RunModel_CemaNeigeGR4H.R
+++ b/R/RunModel_CemaNeigeGR4H.R
@@ -64,7 +64,7 @@ RunModel_CemaNeigeGR4H <- function(InputsModel,RunOptions,Param){
} else {
StateStartCemaNeige <- RunOptions$IniStates[(7 + 20*24 + 40*24) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
}
- RESULTS <- .Fortran("frun_CemaNeige",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_cemaneige",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$LayerPrecip[[iLayer]][IndPeriod1], ### input series of total precipitation [mm/h]
@@ -113,7 +113,7 @@ RunModel_CemaNeigeGR4H <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR4H",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr4h",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=CatchMeltAndPliq, ### input series of total precipitation [mm/h]
diff --git a/R/RunModel_CemaNeigeGR4J.R b/R/RunModel_CemaNeigeGR4J.R
index 9254b597..f09ffceb 100644
--- a/R/RunModel_CemaNeigeGR4J.R
+++ b/R/RunModel_CemaNeigeGR4J.R
@@ -64,7 +64,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){
} else {
StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
}
- RESULTS <- .Fortran("frun_CemaNeige",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_cemaneige",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$LayerPrecip[[iLayer]][IndPeriod1], ### input series of total precipitation [mm/d]
@@ -113,7 +113,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR4J",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr4j",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=CatchMeltAndPliq, ### input series of total precipitation [mm/d]
diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R
index 699117ab..6bf8cc83 100644
--- a/R/RunModel_CemaNeigeGR5J.R
+++ b/R/RunModel_CemaNeigeGR5J.R
@@ -62,7 +62,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
} else {
StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
}
- RESULTS <- .Fortran("frun_CemaNeige",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_cemaneige",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$LayerPrecip[[iLayer]][IndPeriod1], ### input series of total precipitation [mm/d]
@@ -111,7 +111,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR5J",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr5j",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=CatchMeltAndPliq, ### input series of total precipitation [mm/d]
diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R
index a288a008..9027a96a 100644
--- a/R/RunModel_CemaNeigeGR6J.R
+++ b/R/RunModel_CemaNeigeGR6J.R
@@ -66,7 +66,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
} else {
StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
}
- RESULTS <- .Fortran("frun_CemaNeige",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_cemaneige",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$LayerPrecip[[iLayer]][IndPeriod1], ### input series of total precipitation [mm/d]
@@ -116,7 +116,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR6J",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr6j",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=CatchMeltAndPliq, ### input series of total precipitation [mm/d]
diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R
index 7f414e9f..59c3e9d4 100644
--- a/R/RunModel_GR2M.R
+++ b/R/RunModel_GR2M.R
@@ -42,7 +42,7 @@ RunModel_GR2M <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR2M",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr2M",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$Precip[IndPeriod1], ### input series of total precipitation [mm/month]
diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R
index ad6dd7d1..fc29cbd2 100644
--- a/R/RunModel_GR4H.R
+++ b/R/RunModel_GR4H.R
@@ -47,7 +47,7 @@ RunModel_GR4H <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR4H",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr4h",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$Precip[IndPeriod1], ### input series of total precipitation [mm/h]
diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R
index c0ea07f7..cb1fad6c 100644
--- a/R/RunModel_GR4J.R
+++ b/R/RunModel_GR4J.R
@@ -46,7 +46,7 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR4J",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr4j",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$Precip[IndPeriod1], ### input series of total precipitation [mm/d]
diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R
index e098f09d..96fc0b32 100644
--- a/R/RunModel_GR5J.R
+++ b/R/RunModel_GR5J.R
@@ -47,7 +47,7 @@ RunModel_GR5J <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR5J",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr5j",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$Precip[IndPeriod1], ### input series of total precipitation [mm/d]
diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R
index 2f36a24a..7fff0937 100644
--- a/R/RunModel_GR6J.R
+++ b/R/RunModel_GR6J.R
@@ -52,7 +52,7 @@ RunModel_GR6J <- function(InputsModel,RunOptions,Param){
}
##Call_fortan
- RESULTS <- .Fortran("frun_GR6J",PACKAGE="airGR",
+ RESULTS <- .Fortran("frun_gr6j",PACKAGE="airGR",
##inputs
LInputs=LInputSeries, ### length of input and output series
InputsPrecip=InputsModel$Precip[IndPeriod1], ### input series of total precipitation [mm/d]
diff --git a/src/frun_CEMANEIGE.f b/src/frun_CEMANEIGE.f
index f3389245..e778f37f 100644
--- a/src/frun_CEMANEIGE.f
+++ b/src/frun_CEMANEIGE.f
@@ -2,7 +2,7 @@
- SUBROUTINE frun_CEMANEIGE(
+ SUBROUTINE frun_cemaneige(
!inputs
& LInputs , ! [integer] length of input and output series
& InputsPrecip , ! [double] input series of total precipitation [mm/time step]
@@ -21,7 +21,7 @@
& StateEnd ) ! [double] state variables at the end of the model run
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_CemaNeige
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_cemaneige
Implicit None
diff --git a/src/frun_GR1A.f b/src/frun_GR1A.f
index 4c0ece58..9d35501c 100644
--- a/src/frun_GR1A.f
+++ b/src/frun_GR1A.f
@@ -1,6 +1,6 @@
- SUBROUTINE frun_GR1A(
+ SUBROUTINE frun_gr1a(
!inputs
& LInputs , ! [integer] length of input and output series
& InputsPrecip , ! [double] input series of total precipitation [mm/year]
@@ -16,7 +16,7 @@
& StateEnd ) ! [double] state variables at the end of the model run (none here)
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_GR1A
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_gr1a
Implicit None
diff --git a/src/frun_GR2M.f b/src/frun_GR2M.f
index 942fe573..46f76304 100644
--- a/src/frun_GR2M.f
+++ b/src/frun_GR2M.f
@@ -1,6 +1,6 @@
- SUBROUTINE frun_GR2M(
+ SUBROUTINE frun_gr2m(
!inputs
& LInputs , ! [integer] length of input and output series
& InputsPrecip , ! [double] input series of total precipitation [mm/month]
@@ -16,7 +16,7 @@
& StateEnd ) ! [double] state variables at the end of the model run (store levels [mm])
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_GR2M
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_gr2m
Implicit None
diff --git a/src/frun_GR4H.f b/src/frun_GR4H.f
index 83732b42..1b1193cf 100644
--- a/src/frun_GR4H.f
+++ b/src/frun_GR4H.f
@@ -1,6 +1,6 @@
- SUBROUTINE frun_GR4H(
+ SUBROUTINE frun_gr4h(
!inputs
& LInputs , ! [integer] length of input and output series
& InputsPrecip , ! [double] input series of total precipitation [mm/hour]
@@ -16,7 +16,7 @@
& StateEnd ) ! [double] state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_GR4H
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_gr4h
Implicit None
diff --git a/src/frun_GR4J.f b/src/frun_GR4J.f
index 99633faa..892d8c07 100644
--- a/src/frun_GR4J.f
+++ b/src/frun_GR4J.f
@@ -1,6 +1,6 @@
- SUBROUTINE frun_GR4J(
+ SUBROUTINE frun_gr4j(
!inputs
& LInputs , ! [integer] length of input and output series
& InputsPrecip , ! [double] input series of total precipitation [mm/day]
@@ -16,7 +16,7 @@
& StateEnd ) ! [double] state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_GR4J
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_gr4j
Implicit None
diff --git a/src/frun_GR5J.f b/src/frun_GR5J.f
index c6df7455..f2750b62 100644
--- a/src/frun_GR5J.f
+++ b/src/frun_GR5J.f
@@ -1,6 +1,6 @@
- SUBROUTINE frun_GR5J(
+ SUBROUTINE frun_gr5j(
!inputs
& LInputs , ! [integer] length of input and output series
& InputsPrecip , ! [double] input series of total precipitation [mm/day]
@@ -16,7 +16,7 @@
& StateEnd ) ! [double] state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_GR5J
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_gr5j
Implicit None
diff --git a/src/frun_GR6J.f b/src/frun_GR6J.f
index c174ed68..c967d915 100644
--- a/src/frun_GR6J.f
+++ b/src/frun_GR6J.f
@@ -1,6 +1,6 @@
- SUBROUTINE frun_GR6J(
+ SUBROUTINE frun_gr6j(
!inputs
& LInputs , ! [integer] length of input and output series
& InputsPrecip , ! [double] input series of total precipitation [mm/day]
@@ -16,7 +16,7 @@
& StateEnd ) ! [double] state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
- !DEC$ ATTRIBUTES DLLEXPORT :: frun_GR6J
+ !DEC$ ATTRIBUTES DLLEXPORT :: frun_gr6j
Implicit None
--
GitLab