diff --git a/DESCRIPTION b/DESCRIPTION index ebfc7ab9f7bb303a1c096188e7475b4431282b1d..3be854470ec7bf71f7c537968f30c8a53fc03291 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.2.7.0 +Version: 1.2.7.1 Date: 2019-02-28 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 6a0db407e475da988edb2ad76ec6f07955094861..0fc45a5f7a9cbe6ad0938d18516036bb118c9ed6 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.7.0 Release Notes (2019-02-28) +### 1.2.7.1 Release Notes (2019-02-28) @@ -41,18 +41,22 @@ output: #### Major user-visible changes -- <code>ErrorCrit_*()</code> functions now return an error message if the <code>InputsCrit</code> object is of class <code>Multi</code> or <code>Compo</code> +- <code>ErrorCrit_*()</code> functions now return an error message if the <code>InputsCrit</code> object is of class <code>Multi</code> or <code>Compo</code>. - <code>ErrorCrit()</code> function can now run on a multiple <code>InputsCrit</code>. It returns a list of <code>InputsCrit</code>. - <code>Calibration_Michel()</code> function can now run on a composite <code>InputsCrit</code>. It returns a composite value of error and the list of <code>InputsCrit</code> used to calculate this composite criterion. +- Model diagrams added in documentations of <code>RunModel_GR4J()</code>, <code>RunModel_GR5J()</code> and <code>RunModel_GR6J()</code> functions. + #### Minor user-visible changes - <code>ErrorCrit_*()</code> functions now return objects of class <code>ErrorCrit</code> and <code>NSE</code>, <code>KGE</code>, <code>KGE2</code> or <code>RMSE</code>. -- <code>.FortranOutputs()</code> private function added to manage Fortran outputs -- Outputs of frun_GR2M Fortran subroutine were reordered + +- <code>.FortranOutputs()</code> private function added to manage Fortran outputs. + +- Outputs of frun_GR2M Fortran subroutine were reordered. ____________________________________________________________________________________ diff --git a/man/RunModel_GR4J.Rd b/man/RunModel_GR4J.Rd index cf1057067093886633159e7e484e1d9e98d08200..f67b0f7296b5e93b62ae870e7da5bd50789097e6 100644 --- a/man/RunModel_GR4J.Rd +++ b/man/RunModel_GR4J.Rd @@ -64,6 +64,10 @@ Function which performs a single run for the GR4J daily lumped model over the te \details{ For further details on the model, see the references section. For further details on the argument structures and initialisation options, see \code{\link{CreateRunOptions}}. +\cr +\cr +\if{html}{\figure{diagramGR4J-EN.png}{options: width="60\%" alt="Figure: diagramGR4J-EN.png"}} +\if{latex}{\figure{diagramGR4J-EN.pdf}{options: width=6cm}} } diff --git a/man/RunModel_GR5J.Rd b/man/RunModel_GR5J.Rd index 3379ffa4d3caf0cee3f3b3a8c627a6536eff87b1..f6079fffce9c23bc023b3b3103b51a60f282462e 100644 --- a/man/RunModel_GR5J.Rd +++ b/man/RunModel_GR5J.Rd @@ -65,6 +65,10 @@ Function which performs a single run for the GR5J daily lumped model over the te \details{ For further details on the model, see the references section. For further details on the argument structures and initialisation options, see \code{\link{CreateRunOptions}}. +\cr +\cr +\if{html}{\figure{diagramGR5J-EN.png}{options: width="60\%" alt="Figure: diagramGR5J-EN.png"}} +\if{latex}{\figure{diagramGR5J-EN.pdf}{options: width=6cm}} } diff --git a/man/RunModel_GR6J.Rd b/man/RunModel_GR6J.Rd index 245bd5b4d7ad89986fb95bbae74b622de2e51c4e..da36a0977c23659e7d11d6171f6f1ee06cb71a0d 100644 --- a/man/RunModel_GR6J.Rd +++ b/man/RunModel_GR6J.Rd @@ -68,6 +68,10 @@ Function which performs a single run for the GR6J daily lumped model over the te \details{ For further details on the model, see the references section. For further details on the argument structures and initialisation options, see \code{\link{CreateRunOptions}}. +\cr +\cr +\if{html}{\figure{diagramGR6J-EN.png}{options: width="60\%" alt="Figure: diagramGR6J-EN.png"}} +\if{latex}{\figure{diagramGR6J-EN.pdf}{options: width=6cm}} } diff --git a/man/figures/diagramGR4J-EN.pdf b/man/figures/diagramGR4J-EN.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f656e94689603dc7fbf1d2ae9d246167beec7899 Binary files /dev/null and b/man/figures/diagramGR4J-EN.pdf differ diff --git a/man/figures/diagramGR4J-EN.png b/man/figures/diagramGR4J-EN.png new file mode 100644 index 0000000000000000000000000000000000000000..461cf1bb7450a289b5150b937b67b9b335167624 Binary files /dev/null and b/man/figures/diagramGR4J-EN.png differ diff --git a/man/figures/diagramGR5J-EN.pdf b/man/figures/diagramGR5J-EN.pdf new file mode 100644 index 0000000000000000000000000000000000000000..a29e3e7ded711b27b0e228bba58e76346cfa659a Binary files /dev/null and b/man/figures/diagramGR5J-EN.pdf differ diff --git a/man/figures/diagramGR5J-EN.png b/man/figures/diagramGR5J-EN.png new file mode 100644 index 0000000000000000000000000000000000000000..35cf3099e3057cafca9821dca84335b5edfa4c82 Binary files /dev/null and b/man/figures/diagramGR5J-EN.png differ diff --git a/man/figures/diagramGR6J-EN.pdf b/man/figures/diagramGR6J-EN.pdf new file mode 100644 index 0000000000000000000000000000000000000000..52a63580c0ece4371df98b4383ab205d44921b13 Binary files /dev/null and b/man/figures/diagramGR6J-EN.pdf differ diff --git a/man/figures/diagramGR6J-EN.png b/man/figures/diagramGR6J-EN.png new file mode 100644 index 0000000000000000000000000000000000000000..888b0993bc3aa1429884c801b622a61f9180213c Binary files /dev/null and b/man/figures/diagramGR6J-EN.png differ