diff --git a/DESCRIPTION b/DESCRIPTION
index 8ec2e93d42d791977e8fce3b963c95bfa9ce389c..bb36da0cfa79d455c410ebabe2efe20f286f4876 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 3800c04deb817e863cdb09222b1af3bc53533250..77f065f0869850e5261979c30f0bee456e30e562 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 eaaf7424217888639571010e01fbb82af1227ab7..929a5f90b4e638ea9fce99109e857747af2af83b 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 ea9edfe5334508e9cc001d81457776ebd7b9453f..e632eaa59c00d16849d0de98de4e96822c322e91 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 9254b597e048e3ff63da85a68503f7241398647b..f09ffceb81eedb02ae9a9e71d399011e70b6efd8 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 699117ab9c77f488acde82e3210b0ded06c74e64..6bf8cc83747385547b1c7e23cee950b01fe55895 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 a288a008bc4e05946d2bc791bec6c1069219f657..9027a96a7c329549cca695b804308522482f48c4 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 7f414e9f7fb2e4675551ce3d25cb2241e1726a17..59c3e9d414e0692c91384e676e3f0671c1cce20b 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 ad6dd7d189f7a833c8ebf082d97f7a1ee9fdb860..fc29cbd2d9da720765009158a22a98580e24bc29 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 c0ea07f744a421c892ba011e284808415ea14a2b..cb1fad6c523831b0c4b1d1198111300ad6e9eb74 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 e098f09d3701cbeefd306734bbb9ec30122f2fc0..96fc0b320e1125a9fa4c378f51c958d7fecf7fe4 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 2f36a24a1d874d13da303ef68c74487abfd7ce7f..7fff09370b0ce6dcd161ff71c11cfeaea9ca0497 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 f3389245801fb3e86a16efdad7d0fe7727510c6e..e778f37ff627035f86a5f241b1c9b23ec42b02dd 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 4c0ece5871777bc772600093fb2773557da17abe..9d35501c2f1bd47c77e375200409a4a738147d00 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 942fe573fff254c01e748187b219930f07f40f24..46f76304c06022e5795b86297f7c38ff65d43d6a 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 83732b4291315cf673a98203de26e87b0229f9b5..1b1193cfe4988bb28e03dbebfa741315903cc4c7 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 99633faa907ee730621a393082b64ac6ec7cb535..892d8c07cb04315dcd1c1438597861fe21121300 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 c6df74555b9c05615a3d41a90e610fa9cfda56e3..f2750b629fef670b5dbee595e0b5f63c09a7f428 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 c174ed68fbb9ff01259527dd573c0c9482a6fd50..c967d915eda7aa0a00449701eb28144c1eccb9c4 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