En raison d'une défaillance matérielle, les jobs d'intégration continue peuvent échouer sans raison évidente sur les runners partagés. Les disques incriminés devraient être changés en fin de semaine. Merci de votre compréhension.

Commit 6a1c6122 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.9.9 MERGE: branch 'master' into 'sheetTabPanel'

# Conflicts:
#   DESCRIPTION
#   NEWS.md
#   inst/ShinyGR/ui.R
parents 200f56ad f68c15dc
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.9.8
Version: 0.2.9.9
Date: 2020-03-27
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
......
......@@ -4,7 +4,7 @@
### 0.2.9.8 Release Notes (2020-03-27)
### 0.2.9.9 Release Notes (2020-03-27)
____________________________________________________________________________________
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
xml:space="preserve"
width="212"
height="205"
viewBox="0 0 212 205"
sodipodi:docname="logo_airGR.svg"
inkscape:export-filename="E:\Data\boulot\misc\logiciels\airGR\website\airGR_gitlab\fig\bitmap.png"
inkscape:export-xdpi="89.786667"
inkscape:export-ydpi="89.786667"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs6" /><sodipodi:namedview
pagecolor="#d5d5d5"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1132"
id="namedview4"
showgrid="false"
inkscape:zoom="1.907168"
inkscape:cx="22.19895"
inkscape:cy="173.8796"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g12" /><g
id="g10"
inkscape:groupmode="layer"
inkscape:label="logo_airGR"
transform="matrix(1.25,0,0,-1.25,0,205)"><g
id="g12"><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
id="path5"
d="m 168.80393,32.929668 c 0.8056,-4.5776 -2.2568,-8.9544 -6.8464,-9.7584 L 32.206333,0.28886846 c -4.584,-0.8104 -8.956,2.25360004 -9.7656,6.83120004 L 0.66393313,130.65367 c -0.8128,4.5872 2.25439997,8.9648 6.83839997,9.7752 l 129.7535969,22.8752 c 4.576,0.812 8.9544,-2.2536 9.7568,-6.8392 l 21.7912,-123.535202 z" /><path
d="m 127.84593,65.68993 c 0,0 3.52825,-1.064599 5.5791,-2.102233 0.7101,-0.358506 1.9412,-1.077342 2.82909,-2.020979 0.86967,-0.923602 1.29231,-1.858492 1.29231,-1.858492 l 13.90604,-23.444419 -22.47491,-0.0099 -10.50897,19.735463 c 0,0 -2.15178,3.697308 -3.47542,4.769191 -1.10576,0.895171 -1.57686,1.212512 -2.66879,1.212512 l -5.33973,0 0.004,-25.702951 -19.886297,-0.0088 0,65.657718 39.934727,0 c 0,0 18.18993,-0.32864 18.18993,-17.63323 0,-17.306056 -17.38147,-18.593992 -17.38147,-18.593992 z m -8.65012,21.985615 -12.03882,0.0067 -0.006,-11.163678 12.04464,0.0042 c 0,0 5.57875,0.01714 5.57875,5.678569 0,5.775492 -5.57875,5.47382 -5.57875,5.47382 z"
style="fill:#a4c400;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path16"
inkscape:connector-curvature="0" /><path
d="m 97.361027,126.15984 c -32.193996,0 -58.294078,-17.47948 -58.294078,-39.042466 0,-21.561159 26.100082,-39.040999 58.294078,-39.040999 8.382693,0 16.351123,1.187009 23.554093,3.320214 l -2.44653,4.592839 c 0,0 -0.58913,1.007396 -1.33639,2.121907 -3.43426,-0.398584 -7.06342,-0.596418 -10.84781,-0.596418 -24.471849,0 -44.308232,11.950647 -44.308232,26.690671 0,14.740027 19.836383,26.690672 44.308232,26.690672 5.68586,0 11.02561,-0.44266 15.87312,-1.35205 l 1.19103,2.06652 4.96848,8.59183 c -8.97037,3.77271 -19.58172,5.95728 -30.955993,5.95728 z M 117.1322,58.111335 c 0.50642,0.05828 1.00739,0.123873 1.50581,0.190551 -0.49842,-0.06665 -0.99939,-0.132261 -1.50581,-0.190551 z m 1.50581,0.190551 c 0.2277,0.03135 0.4525,0.06263 0.67731,0.09546 -0.22481,-0.03278 -0.44961,-0.06414 -0.67731,-0.09546 z m 0.67731,0.09546 c 0.478,0.06999 0.952,0.142461 1.42018,0.220795 -0.46818,-0.07835 -0.94326,-0.15084 -1.42018,-0.220795 z m 1.5998,-7.000748 c 0.38693,0.11403 0.7713,0.232084 1.15276,0.351583 -0.38146,-0.119499 -0.76583,-0.237553 -1.15276,-0.351583 z m 34.37712,31.368768 -6.51837,-0.0083 c -0.49077,-9.283736 -5.71537,-15.82178 -14.07256,-19.915114 0.52974,-0.351225 1.08755,-0.781141 1.55281,-1.275185 0.86967,-0.923602 1.29376,-1.858493 1.29376,-1.858493 l 0.37126,-0.62775 c 9.4717,6.148206 15.84032,14.427056 17.3731,23.684882 z M 134.70131,62.841908 c -0.29147,-0.142093 -0.58623,-0.281636 -0.88498,-0.41826 0.29875,0.136624 0.59351,0.276167 0.88498,0.41826 z m -0.88498,-0.41826 c -0.0569,-0.02551 -0.11549,-0.05135 -0.17232,-0.07684 0.0568,0.0255 0.11549,0.05134 0.17232,0.07684 z m -0.17232,-0.07684 c -0.23756,-0.108211 -0.47657,-0.213504 -0.71994,-0.317342 0.24192,0.103835 0.48238,0.209131 0.71994,0.317342 z m -0.71994,-0.317342 c -0.0797,-0.03428 -0.16104,-0.06706 -0.24228,-0.100918 0.0813,0.03387 0.16249,0.06665 0.24228,0.100918 z m -0.24228,-0.100929 c -0.23756,-0.09982 -0.47802,-0.199289 -0.71994,-0.294747 0.24192,0.09546 0.48238,0.194923 0.71994,0.294747 z m -0.71994,-0.294747 c -0.0612,-0.02551 -0.12241,-0.04992 -0.18509,-0.07392 0.0627,0.02408 0.12389,0.0485 0.18509,0.07392 z m -0.18509,-0.07392 c -0.31004,-0.122417 -0.62192,-0.241916 -0.93926,-0.357419 0.31734,0.115503 0.62922,0.235002 0.93926,0.357419 z m -0.93926,-0.357419 c -0.33883,-0.123505 -0.68022,-0.244468 -1.02597,-0.361416 0.34575,0.116948 0.68714,0.237911 1.02597,0.361416 z m -1.02597,-0.361416 c -0.31479,-0.106753 -0.63213,-0.210595 -0.95383,-0.311514 0.3217,0.100918 0.63904,0.204757 0.95383,0.311514 z m -0.95383,-0.311514 c -0.0725,-0.02291 -0.14502,-0.04557 -0.21752,-0.06849 0.0725,0.02291 0.14501,0.04557 0.21752,0.06849 z m -0.21752,-0.06849 c -0.28601,-0.08963 -0.57346,-0.176343 -0.8653,-0.261601 0.29038,0.08526 0.57929,0.17197 0.8653,0.261601 z m -0.8653,-0.261601 c -0.0441,-0.01313 -0.0882,-0.02584 -0.13263,-0.03864 0.0445,0.01271 0.0885,0.02551 0.13263,0.03864 z m -0.13263,-0.03864 c -1.05584,-0.30459 -2.14303,-0.583667 -3.25899,-0.83397 1.11596,0.250303 2.20315,0.52938 3.25899,0.83397 z m -3.25899,-0.83397 c -0.0256,-0.0058 -0.0524,-0.01129 -0.0783,-0.01857 0.0259,0.0076 0.0529,0.0128 0.0783,0.01857 z m -0.0783,-0.01857 c -0.35705,-0.07977 -0.71848,-0.156299 -1.08136,-0.230628 0.36288,0.07433 0.72431,0.150839 1.08136,0.230628 z m 13.60001,-0.237542 c -0.29731,-0.19346 -0.59897,-0.38437 -0.9021,-0.573465 0.30313,0.189095 0.60479,0.380005 0.9021,0.573465 z m -14.72582,-0.0025 c -0.2288,-0.04699 -0.46235,-0.08963 -0.69443,-0.135169 0.23208,0.04557 0.46563,0.08816 0.69443,0.135169 z m -0.69443,-0.135169 c -0.3913,-0.07542 -0.78697,-0.147922 -1.18555,-0.217877 0.39858,0.06999 0.79425,0.142461 1.18555,0.217877 z m -1.18555,-0.217877 c -0.15776,-0.02692 -0.31297,-0.05686 -0.4711,-0.08236 0.15813,0.02551 0.31334,0.05536 0.4711,0.08236 z m 15.66253,-0.241904 c -0.30459,-0.189095 -0.61209,-0.375632 -0.9225,-0.560722 0.31041,0.18509 0.61791,0.371627 0.9225,0.560722 z m -0.9225,-0.560722 c -0.32027,-0.190542 -0.64307,-0.378542 -0.9706,-0.563624 0.32753,0.185082 0.65033,0.373082 0.9706,0.563624 z m -0.9706,-0.563624 c -0.32427,-0.185089 -0.65326,-0.368348 -0.98481,-0.547969 0.33155,0.179621 0.66054,0.36288 0.98481,0.547969 z m -0.99027,-0.551974 c -0.329,-0.178167 -0.65909,-0.354502 -0.99355,-0.528295 0.33446,0.173793 0.66455,0.350128 0.99355,0.528295 z m -1.02634,-0.545053 c -0.32864,-0.170874 -0.65873,-0.33883 -0.99318,-0.503876 0.33445,0.165046 0.66454,0.333002 0.99318,0.503876 z m -1.0176,-0.516629 c -0.33738,-0.167957 -0.67876,-0.333003 -1.02306,-0.496953 0.3443,0.16395 0.68568,0.328996 1.02306,0.496953 z m -1.02306,-0.496953 c -0.34175,-0.162137 -0.6846,-0.321348 -1.0318,-0.478015 0.3472,0.156667 0.69005,0.315878 1.0318,0.478015 z m -1.0318,-0.478015 c -0.0372,-0.01714 -0.0744,-0.03428 -0.11113,-0.04992 0.0367,0.01564 0.074,0.03278 0.11113,0.04992 z m -0.11113,-0.04992 c -0.32463,-0.146467 -0.65034,-0.291837 -0.97934,-0.432476 0.329,0.140639 0.65471,0.286009 0.97934,0.432476 z m -1.03326,-0.455429 c -0.33446,-0.143548 -0.67038,-0.286001 -1.00922,-0.425544 0.33884,0.139543 0.67476,0.281996 1.00922,0.425544 z m -1.00922,-0.425544 c -0.0626,-0.02692 -0.12642,-0.05101 -0.18909,-0.07685 0.0626,0.02584 0.12643,0.04992 0.18909,0.07685 z m -0.18909,-0.07685 c -0.31187,-0.126431 -0.62338,-0.253221 -0.93781,-0.37564 0.31443,0.122419 0.62594,0.249209 0.93781,0.37564 z M 126.60502,53.3412 c -0.34466,-0.135169 -0.69042,-0.26742 -1.04055,-0.397121 0.35013,0.129701 0.69589,0.263415 1.04055,0.397121 z m -1.09447,-0.416797 c -0.35013,-0.128245 -0.70171,-0.256132 -1.05476,-0.38146 0.35305,0.125328 0.70463,0.251751 1.05476,0.38146 z m -1.05476,-0.38146 c -0.0769,-0.0255 -0.15374,-0.05134 -0.22916,-0.07835 0.0755,0.02692 0.15229,0.05285 0.22916,0.07835 z m -0.22916,-0.07835 c -0.31297,-0.10967 -0.62739,-0.217878 -0.94327,-0.32317 0.31588,0.105293 0.6303,0.213503 0.94327,0.32317 z m -1.06314,-0.361425 c -0.35268,-0.11659 -0.70573,-0.232084 -1.06278,-0.3443 0.35705,0.112216 0.7101,0.22771 1.06278,0.3443 z"
style="fill:#009ee0;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path18"
inkscape:connector-curvature="0" /><path
d="m 130.60688,82.748231 19.40099,0 0,-5.543399 -19.40099,0 0,5.543399 z"
style="fill:#009ee0;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path20"
inkscape:connector-curvature="0" /><path
d="m 134.70131,62.841903 c -4.89124,-2.395165 -10.85582,-3.950522 -17.56911,-4.730568 0.74726,-1.114511 1.33639,-2.121907 1.33639,-2.121907 l 2.44653,-4.592839 c 6.34312,1.878886 12.09129,4.49447 17.00402,7.683887 l -0.37126,0.62775 c 0,0 -0.42409,0.93489 -1.29376,1.858492 -0.46526,0.494044 -1.02307,0.923961 -1.55281,1.275185 z"
style="fill:#a4c400;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path22"
inkscape:connector-curvature="0" /><text
transform="scale(1,-1)"
style="font-variant:normal;font-weight:bold;font-size:52.46467209px;font-family:Arial;-inkscape-font-specification:Arial-BoldMT;writing-mode:lr-tb;fill:#003a80;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="text24"
x="19.05007"
y="-36.382011"><tspan
x="19.05007"
y="-36.382011"
id="tspan26">a</tspan></text>
<text
transform="scale(1,-1)"
style="font-variant:normal;font-weight:bold;font-size:52.46467209px;font-family:Arial;-inkscape-font-specification:Arial-BoldMT;writing-mode:lr-tb;fill:#003a80;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="text32"
x="48.254047"
y="-36.382011"><tspan
x="48.254047"
y="-36.382011"
id="tspan34">i</tspan></text>
<g
id="g36"
transform="matrix(0.364338,0,0,-0.364338,15.053432,133.04401)"><path
d="m 101.469,180.512 0,-18.282 19.75,0 0,18.282 -19.75,0 z m 0,84.797 0,-74.672 19.75,0 0,74.672 -19.75,0 z"
style="fill:none;stroke:#003a80;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path38"
inkscape:connector-curvature="0" /></g><text
transform="scale(1,-1)"
style="font-variant:normal;font-weight:bold;font-size:52.46467209px;font-family:Arial;-inkscape-font-specification:Arial-BoldMT;writing-mode:lr-tb;fill:#003a80;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="text40"
x="62.804798"
y="-36.382011"><tspan
x="62.804798"
y="-36.382011"
id="tspan42">r</tspan></text>
<g
id="g44"
transform="matrix(0.364338,0,0,-0.364338,15.053432,133.04401)"><path
d="m 160.313,265.309 -19.75,0 0,-74.672 18.343,0 0,10.609 c 3.145,-5.008 5.969,-8.312 8.469,-9.906 2.508,-1.594 5.359,-2.391 8.547,-2.391 4.5,0 8.836,1.242 13.016,3.719 l -6.125,17.234 c -3.325,-2.156 -6.418,-3.234 -9.282,-3.234 -2.761,0 -5.105,0.762 -7.031,2.281 -1.918,1.524 -3.43,4.278 -4.531,8.266 -1.106,3.98 -1.656,12.324 -1.656,25.031 l 0,23.063 z"
style="fill:none;stroke:#003a80;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path46"
inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
xml:space="preserve"
width="212"
height="205"
viewBox="0 0 212 205"
sodipodi:docname="logo_airGRteaching_square.svg"
inkscape:export-filename="E:\Data\boulot\misc\collegues_aide\00_equipe_hydro\2017-02-22_logo_airgrteaching\01_logo\logo_airGRteaching_square.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs6" /><sodipodi:namedview
pagecolor="#d5d5d5"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1132"
id="namedview4"
showgrid="false"
inkscape:zoom="1.907168"
inkscape:cx="-76.729683"
inkscape:cy="140.45726"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g12" /><g
id="g10"
inkscape:groupmode="layer"
inkscape:label="logo_airGR"
transform="matrix(1.25,0,0,-1.25,0,205)"><g
id="g12"><path
style="fill:#ffffff"
inkscape:connector-curvature="0"
id="path5"
d="m 168.80393,32.929668 c 0.8056,-4.5776 -2.2568,-8.9544 -6.8464,-9.7584 L 32.206333,0.28886846 c -4.584,-0.8104 -8.956,2.25360004 -9.7656,6.83120004 L 0.66393313,130.65367 c -0.8128,4.5872 2.25439997,8.9648 6.83839997,9.7752 l 129.7535969,22.8752 c 4.576,0.812 8.9544,-2.2536 9.7568,-6.8392 l 21.7912,-123.535202 z" /><path
d="m 123.96718,85.410531 c 0,0 3.29492,-0.994196 5.21016,-1.963206 0.66313,-0.334794 1.81282,-1.006103 2.64199,-1.887332 0.81217,-0.862521 1.20685,-1.735598 1.20685,-1.735598 l 12.98643,-21.894021 -20.98863,-0.0084 -9.81402,18.430346 c 0,0 -2.00948,3.452791 -3.24559,4.45379 -1.03263,0.835984 -1.47257,1.132325 -2.49228,1.132325 l -4.9866,0 0.003,-24.003194 -18.571216,-0.0074 0,61.315729 37.293836,0 c 0,0 16.98702,-0.30687 16.98702,-16.46712 0,-16.161602 -16.23202,-17.36437 -16.23202,-17.36437 z m -8.07809,20.531689 -11.24269,0.006 -0.005,-10.42542 11.24814,0.0032 c 0,0 5.20981,0.01603 5.20981,5.30303 0,5.39356 -5.20981,5.11183 -5.20981,5.11183 z"
style="fill:#a4c400;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path16-4"
inkscape:connector-curvature="0" /><path
d="m 95.498255,141.88154 c -30.065001,0 -54.439082,-16.32355 -54.439082,-36.46056 0,-20.135312 24.374081,-36.459217 54.439082,-36.459217 7.828345,0 15.269835,1.108533 21.996455,3.100647 l -2.28475,4.289113 c 0,0 -0.55015,0.940777 -1.24802,1.981589 -3.20713,-0.372225 -6.59631,-0.556982 -10.13041,-0.556982 -22.853538,0 -41.378144,11.160354 -41.378144,24.92561 0,13.76527 18.524606,24.92561 41.378144,24.92561 5.30985,0 10.29646,-0.4134 14.82342,-1.26264 l 1.11225,1.92986 4.6399,8.02364 c -8.37714,3.52322 -18.28674,5.56333 -28.908845,5.56333 z M 113.96194,78.333112 c 0.47296,0.05432 0.94081,0.115687 1.40625,0.177955 -0.46544,-0.06222 -0.93329,-0.123524 -1.40625,-0.177955 z m 1.40625,0.177955 c 0.21264,0.02921 0.42258,0.05853 0.6325,0.08912 -0.20992,-0.03059 -0.41986,-0.05991 -0.6325,-0.08912 z m 0.6325,0.08912 c 0.4464,0.06539 0.88906,0.133036 1.32628,0.206188 -0.43722,-0.07319 -0.8809,-0.140862 -1.32628,-0.206188 z m 1.49402,-6.537787 c 0.36134,0.10649 0.72029,0.216745 1.07653,0.32834 -0.35624,-0.111542 -0.71519,-0.22185 -1.07653,-0.32834 z m 32.10375,29.29435 -6.08731,-0.007 c -0.45831,-8.669759 -5.33742,-14.775426 -13.14194,-18.59809 0.49473,-0.327992 1.01563,-0.729463 1.45012,-1.19085 0.81217,-0.86252 1.20821,-1.735576 1.20821,-1.735576 l 0.34671,-0.58625 c 8.84533,5.741617 14.79279,13.472995 16.22421,22.118596 z M 130.36921,82.750821 c -0.2722,-0.132689 -0.54745,-0.263003 -0.82645,-0.390597 0.279,0.127594 0.55425,0.257908 0.82645,0.390597 z m -0.82645,-0.390597 c -0.053,-0.02383 -0.10786,-0.04799 -0.16094,-0.07172 0.053,0.02383 0.10786,0.04809 0.16094,0.07172 z m -0.16094,-0.07172 c -0.22183,-0.101036 -0.44504,-0.199386 -0.67232,-0.296352 0.22592,0.09692 0.45049,0.195315 0.67232,0.296352 z m -0.67232,-0.296352 c -0.0746,-0.03206 -0.15039,-0.06265 -0.22626,-0.09429 0.0759,0.03164 0.15174,0.06222 0.22626,0.09429 z m -0.22626,-0.09429 c -0.22184,-0.09323 -0.4464,-0.186118 -0.67232,-0.275259 0.22592,0.08912 0.45048,0.182036 0.67232,0.275259 z m -0.67232,-0.275259 c -0.0572,-0.02383 -0.11433,-0.04662 -0.17285,-0.06908 0.0585,0.02247 0.11569,0.04514 0.17285,0.06908 z m -0.17285,-0.06908 c -0.28955,-0.114326 -0.58079,-0.225921 -0.87715,-0.333771 0.29636,0.107839 0.5876,0.219445 0.87715,0.333771 z m -0.87715,-0.333773 c -0.31643,-0.115361 -0.63524,-0.228315 -0.95812,-0.337538 0.32288,0.10918 0.64169,0.222177 0.95812,0.337538 z m -0.95812,-0.337538 c -0.29397,-0.09966 -0.59032,-0.196653 -0.89077,-0.290899 0.30045,0.09429 0.5968,0.191223 0.89077,0.290899 z m -0.89077,-0.290899 c -0.0677,-0.02141 -0.13542,-0.0425 -0.20313,-0.06402 0.0677,0.02141 0.13543,0.0425 0.20313,0.06402 z m -0.20313,-0.06402 c -0.26709,-0.08374 -0.53554,-0.164687 -0.80807,-0.244304 0.27117,0.07963 0.54098,0.160595 0.80807,0.244304 z m -0.80807,-0.244304 c -0.0411,-0.01223 -0.0824,-0.02426 -0.12385,-0.03607 0.0414,0.01192 0.0827,0.02383 0.12385,0.03607 z m -0.12385,-0.03607 c -0.98603,-0.284445 -2.00132,-0.545075 -3.04348,-0.778821 1.04216,0.233746 2.05745,0.494376 3.04348,0.778821 z m -3.04348,-0.778821 c -0.0238,-0.0053 -0.049,-0.01054 -0.0732,-0.0174 0.0241,0.0063 0.0493,0.01203 0.0732,0.0174 z m -0.0732,-0.0174 c -0.33343,-0.07457 -0.67095,-0.145967 -1.00984,-0.215375 0.33889,0.0694 0.67641,0.140862 1.00984,0.215375 z m 12.70064,-0.22184 c -0.27763,-0.180664 -0.55935,-0.358957 -0.84244,-0.53554 0.28309,0.176583 0.56481,0.354876 0.84244,0.53554 z m -13.75198,-0.0021 c -0.21369,-0.04398 -0.43177,-0.08374 -0.64851,-0.126233 0.21674,0.0425 0.43482,0.08237 0.64851,0.126233 z m -0.64851,-0.126233 c -0.36542,-0.07045 -0.73493,-0.138141 -1.10716,-0.203456 0.37223,0.06539 0.74174,0.133025 1.10716,0.203456 z m -1.10716,-0.203456 c -0.14732,-0.02521 -0.29226,-0.05316 -0.43993,-0.07689 0.14767,0.02383 0.29261,0.05168 0.43993,0.07689 z m 14.62676,-0.225932 c -0.28444,-0.176583 -0.57161,-0.350794 -0.86149,-0.523623 0.28988,0.172829 0.57705,0.34704 0.86149,0.523623 z m -0.86149,-0.523623 c -0.29908,-0.177954 -0.60054,-0.353536 -0.90641,-0.526365 0.30587,0.172829 0.60733,0.348411 0.90641,0.526365 z m -0.90641,-0.526365 c -0.30282,-0.172849 -0.61006,-0.343991 -0.91969,-0.511737 0.30963,0.167746 0.61687,0.338888 0.91969,0.511737 z m -0.92479,-0.51547 c -0.30723,-0.166374 -0.61551,-0.331061 -0.92784,-0.493343 0.31233,0.162282 0.62061,0.326969 0.92784,0.493343 z m -0.95846,-0.509005 c -0.30691,-0.159572 -0.61517,-0.316422 -0.92751,-0.470552 0.31234,0.15413 0.6206,0.31098 0.92751,0.470552 z m -0.95027,-0.482459 c -0.31507,-0.156851 -0.63387,-0.31098 -0.9554,-0.464097 0.32153,0.153117 0.64033,0.307246 0.9554,0.464097 z m -0.95543,-0.464063 c -0.31915,-0.15142 -0.63933,-0.300097 -0.96357,-0.446401 0.32424,0.146304 0.64442,0.294981 0.96357,0.446401 z m -0.96357,-0.446401 c -0.0347,-0.01603 -0.0694,-0.03206 -0.10378,-0.04661 0.0344,0.01466 0.0691,0.03059 0.10378,0.04661 z m -0.10378,-0.04661 c -0.30317,-0.136769 -0.60735,-0.272537 -0.91459,-0.403854 0.30724,0.131317 0.61142,0.267085 0.91459,0.403854 z m -0.96495,-0.425307 c -0.31233,-0.134048 -0.62605,-0.267084 -0.94247,-0.397388 0.31642,0.130304 0.63014,0.26334 0.94247,0.397388 z m -0.94247,-0.397388 c -0.0585,-0.02521 -0.11807,-0.04767 -0.17658,-0.07172 0.0585,0.02426 0.11806,0.04662 0.17658,0.07172 z m -0.17658,-0.07172 c -0.29125,-0.11806 -0.58216,-0.236457 -0.8758,-0.350795 0.29364,0.114338 0.58455,0.232735 0.8758,0.350795 z m -0.96358,-0.384133 c -0.32188,-0.126233 -0.64476,-0.249735 -0.97174,-0.370864 0.32698,0.121129 0.64986,0.245992 0.97174,0.370864 z m -1.02209,-0.389247 c -0.32698,-0.119758 -0.65531,-0.239199 -0.98501,-0.356225 0.3297,0.117026 0.65803,0.235107 0.98501,0.356225 z m -0.98501,-0.356225 c -0.0718,-0.02383 -0.14358,-0.04809 -0.21401,-0.07309 0.0703,0.02521 0.14222,0.04935 0.21401,0.07309 z m -0.21401,-0.07309 c -0.29227,-0.102408 -0.58591,-0.203478 -0.88088,-0.301794 0.29497,0.0983 0.58861,0.199375 0.88088,0.301794 z m -0.99284,-0.337526 c -0.32936,-0.108842 -0.65905,-0.216735 -0.99249,-0.321538 0.33344,0.104835 0.66313,0.212654 0.99249,0.321538 z"
style="fill:#009ee0;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path18-9"
inkscape:connector-curvature="0" /><path
d="m 126.54554,101.34076 18.11801,0 0,-5.176808 -18.11801,0 0,5.176808 z"
style="fill:#009ee0;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path20-2"
inkscape:connector-curvature="0" /><path
d="m 130.36921,82.750831 c -4.56778,-2.236734 -10.13791,-3.689248 -16.40727,-4.417719 0.69787,-1.040812 1.24802,-1.981589 1.24802,-1.981589 l 2.28475,-4.289113 c 5.92366,1.754645 11.29168,4.197261 15.87954,7.175756 l -0.34671,0.586229 c 0,0 -0.39604,0.873077 -1.20821,1.735598 -0.43449,0.461376 -0.95539,0.862847 -1.45012,1.190838 z"
style="fill:#a4c400;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path22-4"
inkscape:connector-curvature="0" /><text
style="font-variant:normal;font-weight:bold;font-size:48.99516296px;font-family:Arial;-inkscape-font-specification:Arial-BoldMT;writing-mode:lr-tb;fill:#003a80;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="text24-3"
x="22.366026"
y="-58.040768"
transform="scale(1,-1)"><tspan
x="22.366026"
y="-58.040768"
id="tspan26-5">a</tspan></text>
<text
style="font-variant:normal;font-weight:bold;font-size:48.99516296px;font-family:Arial;-inkscape-font-specification:Arial-BoldMT;writing-mode:lr-tb;fill:#003a80;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="text32-8"
x="49.638721"
y="-58.040768"
transform="scale(1,-1)"><tspan
x="49.638721"
y="-58.040768"
id="tspan34-0">i</tspan></text>
<g
id="g36-4"
transform="matrix(0.34024422,0,0,-0.34024422,18.633682,148.31045)"><path
d="m 101.469,180.512 0,-18.282 19.75,0 0,18.282 -19.75,0 z m 0,84.797 0,-74.672 19.75,0 0,74.672 -19.75,0 z"
style="fill:none;stroke:#003a80;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path38-0"
inkscape:connector-curvature="0" /></g><text
style="font-variant:normal;font-weight:bold;font-size:48.99516296px;font-family:Arial;-inkscape-font-specification:Arial-BoldMT;writing-mode:lr-tb;fill:#003a80;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="text40-0"
x="63.227211"
y="-58.040768"
transform="scale(1,-1)"><tspan
x="63.227211"
y="-58.040768"
id="tspan42-7">r</tspan></text>
<g
id="g44-1"
transform="matrix(0.34024422,0,0,-0.34024422,18.633682,148.31045)"><path
d="m 160.313,265.309 -19.75,0 0,-74.672 18.343,0 0,10.609 c 3.145,-5.008 5.969,-8.312 8.469,-9.906 2.508,-1.594 5.359,-2.391 8.547,-2.391 4.5,0 8.836,1.242 13.016,3.719 l -6.125,17.234 c -3.325,-2.156 -6.418,-3.234 -9.282,-3.234 -2.761,0 -5.105,0.762 -7.031,2.281 -1.918,1.524 -3.43,4.278 -4.531,8.266 -1.106,3.98 -1.656,12.324 -1.656,25.031 l 0,23.063 z"
style="fill:none;stroke:#003a80;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path46-2"
inkscape:connector-curvature="0" /></g><text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.88781357px;line-height:300%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="23.348696"
y="-32.604355"
id="text4148"
sodipodi:linespacing="300%"
transform="scale(1,-1)"><tspan
sodipodi:role="line"
id="tspan4150"
x="23.348696"
y="-32.604355"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.99516296px;line-height:300%;font-family:'Brush Script MT';-inkscape-font-specification:'Brush Script MT, Italic';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1">teaching</tspan></text>
</g></g></svg>
\ No newline at end of file
......@@ -8,16 +8,16 @@ output:
```{r include=FALSE}
formatGR <- '<strong><font color="#0BA6AA">%s</font></strong>'
GR_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/' onclick='window.open(this.href); return false;'>GR</a>")
GR1A_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/annual-hydrologic-model-gr1a/' onclick='window.open(this.href); return false;'>GR1A</a>")
GR2M_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/monthly-model-gr2m/' onclick='window.open(this.href); return false;'>GR2M</a>")
GR4J_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/daily-hydrological-model-gr4j//' onclick='window.open(this.href); return false;'>GR4J</a>")
GR_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/' title='GR models' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>GR</a>")
GR1A_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/annual-hydrologic-model-gr1a/' title='GR1A' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>GR1A</a>")
GR2M_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/monthly-model-gr2m/' title='GR2M' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>GR2M</a>")
GR4J_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/daily-hydrological-model-gr4j/' title='GR4J' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>GR4J</a>")
airGR <- sprintf(formatGR, "airGR")
airGR_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/software/airgr/' onclick='window.open(this.href); return false;'>airGR</a>")
airGR_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/software/airgr/' title='airGR' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>airGR</a>")
airGRteaching <- sprintf(formatGR, "airGRteaching")
CemaNeige_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/snow-model/' onclick='window.open(this.href); return false;'>CemaNeige</a>")
CemaNeige_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/snow-model/' title='CemaNeige' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>CemaNeige</a>")
Sunshine <- sprintf(formatGR, "Sunshine")
Sunshine_link <- sprintf(formatGR, "<a href = 'https://sunshine.irstea.fr/' onclick='window.open(this.href); return false;'>Sunshine</a>")
Sunshine_link <- sprintf(formatGR, "<a href = 'https://sunshine.irstea.fr/' title='sunshine.irstea.fr' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>Sunshine</a>")
```
......
......@@ -8,11 +8,11 @@ output:
```{r include=FALSE}
formatGR <- '<strong><font color="#0BA6AA">%s</font></strong>'
GR_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/' onclick='window.open(this.href); return false;'>GR</a>")
GR_link <- sprintf(formatGR, "<a href = 'https://webgr.inrae.fr/en/models/' title='GR models' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>GR</a>")
airGR <- sprintf(formatGR, "airGR")
airGR_link <- sprintf(formatGR, "<a href = 'https://hydrogr.github.io/airGR/' onclick='window.open(this.href); return false;'>airGR</a>")
airGR_link <- sprintf(formatGR, "<a href = 'https://hydrogr.github.io/airGR/' title='airGR' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>airGR</a>")
airGRteaching <- sprintf(formatGR, "airGRteaching")
airGRteaching_link <- sprintf(formatGR, "<a href = 'https://hydrogr.github.io/airGRteaching/' onclick='window.open(this.href); return false;'>airGRteaching</a>")
airGRteaching_link <- sprintf(formatGR, "<a href = 'https://hydrogr.github.io/airGRteaching/' title='airGRteaching' rel='noopener noreferrer nofollow' onclick='window.open(this.href); return false;'>airGRteaching</a>")
```
......
......@@ -110,6 +110,18 @@ SIM <- SimGR(PrepGR = PREP, CalGR = CAL, EffCrit = "KGE2",
<br>
### Formating outputs
The call of the `as.data.frame()` function with `PrepGR`, `CalGR` or `SimGR` objects allows to coerce the outputs to a data frame.
```{r, warning=FALSE}
head(as.data.frame(PREP))
head(as.data.frame(CAL))
head(as.data.frame(SIM))
```
### Pre-defined graphical plots
#### Static plots
......@@ -170,6 +182,7 @@ dyplot(SIM, main = "Simulation")
<br>
### *Shiny* interface
The `r airGRteaching` package also provides the `ShinyGR()` function, which allows to run the *Shiny* interface that is proposed on this page.
......
......@@ -101,7 +101,7 @@ SIM <- SimGR(PrepGR = PREP, Param = CAL, EffCrit = "KGE2",
### Formating outputs
The call of the `as.data.frame()` function with `PrepGR`, `CalGR` or `SimGR` objects allows to coerce the outputs to a data frame .
The call of the `as.data.frame()` function with `PrepGR`, `CalGR` or `SimGR` objects allows to coerce the outputs to a data frame.
```{r, warning=FALSE}
head(as.data.frame(PREP))
......
Markdown is supported
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