Commit dd45d335 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.2.7.1 NEW: diagrams added in doc about GR4J, GR5J and GR6J #5458

Showing with 21 additions and 5 deletions
+21 -5
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.7.0 Version: 1.2.7.1
Date: 2019-02-28 Date: 2019-02-28
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
...@@ -13,7 +13,7 @@ output: ...@@ -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: ...@@ -41,18 +41,22 @@ output:
#### Major user-visible changes #### Major user-visible changes
- <code>ErrorCrit_&#42;()</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_&#42;()</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>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. - <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 #### Minor user-visible changes
- <code>ErrorCrit_&#42;()</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>ErrorCrit_&#42;()</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.
____________________________________________________________________________________ ____________________________________________________________________________________
......
...@@ -64,6 +64,10 @@ Function which performs a single run for the GR4J daily lumped model over the te ...@@ -64,6 +64,10 @@ Function which performs a single run for the GR4J daily lumped model over the te
\details{ \details{
For further details on the model, see the references section. For further details on the model, see the references section.
For further details on the argument structures and initialisation options, see \code{\link{CreateRunOptions}}. 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}}
} }
......
...@@ -65,6 +65,10 @@ Function which performs a single run for the GR5J daily lumped model over the te ...@@ -65,6 +65,10 @@ Function which performs a single run for the GR5J daily lumped model over the te
\details{ \details{
For further details on the model, see the references section. For further details on the model, see the references section.
For further details on the argument structures and initialisation options, see \code{\link{CreateRunOptions}}. 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}}
} }
......
...@@ -68,6 +68,10 @@ Function which performs a single run for the GR6J daily lumped model over the te ...@@ -68,6 +68,10 @@ Function which performs a single run for the GR6J daily lumped model over the te
\details{ \details{
For further details on the model, see the references section. For further details on the model, see the references section.
For further details on the argument structures and initialisation options, see \code{\link{CreateRunOptions}}. 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}}
} }
......
File added
man/figures/diagramGR4J-EN.png

43.4 KB

File added
man/figures/diagramGR5J-EN.png

39 KB

File added
man/figures/diagramGR6J-EN.png

54.3 KB

Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment