Index: doc/_build/doctrees/calib_report.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/environment.pickle =================================================================== diff -u -r57079a87ca2afc81ab7ab3100f1120e83a407cac -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/framework.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/index.doctree =================================================================== diff -u -r57079a87ca2afc81ab7ab3100f1120e83a407cac -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/testrunner_wflowhbv.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/wf_DynamicFramework.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/wflow_floodmap.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/wflow_gr4.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/wflow_hbv.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/wflow_sbm.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/doctrees/wflow_wave.doctree =================================================================== diff -u -r17204bab60afe29dcf6eb71d01aa091617147e99 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_00.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_00.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_00.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_01.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_01.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_01.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_02.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_02.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_02.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_03.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_03.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_03.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_04.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_04.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_04.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_05.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_05.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_05.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_06.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_06.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_06.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_07.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_07.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_07.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_08.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_08.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_08.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_09.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_09.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_09.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_10.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_10.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_10.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_11.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_11.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_11.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_12.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_12.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_12.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_13.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_13.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_13.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_00.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_00.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_00.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_01.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_01.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_01.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_02.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_02.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_02.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_03.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_03.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_03.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_04.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_04.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_04.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_05.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_05.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_05.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_06.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_06.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_06.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_07.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_07.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_07.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_08.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_08.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_08.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_09.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_09.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_09.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_10.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_10.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_10.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_11.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_11.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_11.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_12.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_12.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_12.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_13.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_13.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/calibplot_lunew_13.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/kin-dyn.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/kin-dyn.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/kin-dyn.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/m-plot.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/m-plot.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/m-plot.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/s-curve-freezingsoil.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/s-curve-freezingsoil.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/s-curve-freezingsoil.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/s-curve-soil.hires.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/s-curve-soil.pdf =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: doc/_build/plot_directive/plots/s-curve-soil.png =================================================================== diff -u -r2f17058524a2631c08051465fe6f54f0a8d098c4 -r652aea29305298e160136ae309f1f80c94569bec Binary files differ Index: wflow-py/UnitTests/TestFrameWork.py =================================================================== diff -u --- wflow-py/UnitTests/TestFrameWork.py (revision 0) +++ wflow-py/UnitTests/TestFrameWork.py (revision 652aea29305298e160136ae309f1f80c94569bec) @@ -0,0 +1,48 @@ +__author__ = 'schelle' + +import unittest +import wflow.wflow_sceleton as wf +import os +""" +Run sceleton for 10 steps and checks if the outcome is approx that of the reference run +""" + +class MyTest(unittest.TestCase): + + def testapirun(self): + startTime = 1 + stopTime = 10 + currentTime = 1 + + # set runid, clonemap and casename. Also define the ini file + runId = "unittest" + configfile="wflow_sceleton.ini" + wflow_cloneMap = 'wflow_catchment.map' + caseName="wflow_sceleton" + + myModel = wf.WflowModel(wflow_cloneMap, caseName,runId,configfile) + # initialise the framework + dynModelFw = wf.wf_DynamicFramework(myModel, stopTime,startTime) + + # Load model config from files and check directory structure + dynModelFw.createRunId(NoOverWrite=False) + # Run the initial part of the model (reads parameters and sets initial values) + dynModelFw._runInitial() # Runs initial part + + dynModelFw._runResume() # gets the state variables + + for ts in range(startTime,stopTime): + dynModelFw._runDynamic(ts,ts) # runs for all timesteps + dynModelFw.logger.info("Doing step: " + str(ts)) + dynModelFw._runSuspend() # saves the state variables + dynModelFw._wf_shutdown() + + # nore read the csv results acn check of they match the first run + # Sum should be approx c 4.569673676 + my_data = wf.genfromtxt(os.path.join(caseName,runId,"tes.csv"), delimiter=',') + + self.assertAlmostEquals(4.569673676,my_data[:,2].sum()) + + +if __name__ == '__main__': + unittest.main() Index: wflow-py/_version.py =================================================================== diff -u -r57079a87ca2afc81ab7ab3100f1120e83a407cac -r652aea29305298e160136ae309f1f80c94569bec --- wflow-py/_version.py (.../_version.py) (revision 57079a87ca2afc81ab7ab3100f1120e83a407cac) +++ wflow-py/_version.py (.../_version.py) (revision 652aea29305298e160136ae309f1f80c94569bec) @@ -1,2 +1,2 @@ -VERSION="85-91M $Id: mkversion.py 550 2012-11-27 19:17:46Z schelle $" -MVERSION="1.0-RC5-dev-85-91M" +VERSION="85-92M $Id: mkversion.py 550 2012-11-27 19:17:46Z schelle $" +MVERSION="1.0-RC5-dev-85-92M" Index: wflow-py/mkversion.py =================================================================== diff -u -r57079a87ca2afc81ab7ab3100f1120e83a407cac -r652aea29305298e160136ae309f1f80c94569bec --- wflow-py/mkversion.py (.../mkversion.py) (revision 57079a87ca2afc81ab7ab3100f1120e83a407cac) +++ wflow-py/mkversion.py (.../mkversion.py) (revision 652aea29305298e160136ae309f1f80c94569bec) @@ -19,3 +19,7 @@ a.write("__all__ = [\"wflow_funcs\",\"wflow_adapt\",\"wflow_lib\",\"pcrut\",\"wf_DynamicFramework\",\"stats\"]\n") a.write("__version__=\"" + manualmainversion + "\"\n") a.write("__release__=\"" + manualversion + "\"\n") + +print "=============================================================================" +print "Now install wflow using setup.py install and regenerate the documentation...." +print "=============================================================================" \ No newline at end of file Index: wflow-py/wflow/__init__.py =================================================================== diff -u -r57079a87ca2afc81ab7ab3100f1120e83a407cac -r652aea29305298e160136ae309f1f80c94569bec --- wflow-py/wflow/__init__.py (.../__init__.py) (revision 57079a87ca2afc81ab7ab3100f1120e83a407cac) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision 652aea29305298e160136ae309f1f80c94569bec) @@ -1,3 +1,3 @@ __all__ = ["wflow_funcs","wflow_adapt","wflow_lib","pcrut","wf_DynamicFramework","stats"] __version__="1.0-dev" -__release__="1.0-RC5-dev-85-91M" +__release__="1.0-RC5-dev-85-92M" Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r0f890faa40b9d70240219d09b0727cd4756fc8cf -r652aea29305298e160136ae309f1f80c94569bec --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 0f890faa40b9d70240219d09b0727cd4756fc8cf) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 652aea29305298e160136ae309f1f80c94569bec) @@ -461,7 +461,6 @@ self.logger.warn("Could not read sample id-map for timeseries: " + samplemapname) for a in toprint: - if "samplemap" not in a: b = a.replace('self','self._userModel()') fn = os.path.join(caseName,runId,self._userModel().config.get(thissection,a))