Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Major improvements of the tool to evaluate groundwater recharge. #119

Merged
merged 34 commits into from
Dec 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
11e1a11
Renamed method GLUE
jnsebgosselin Dec 8, 2017
f5d8725
Prevent GWHAT from craching when model nbr is 0
jnsebgosselin Dec 8, 2017
12fc5b2
Merge remote-tracking branch 'refs/remotes/origin/master' into improv…
jnsebgosselin Dec 8, 2017
c03cce7
Move the gui to compute recharge to its own module
jnsebgosselin Dec 9, 2017
0fce937
Move the code a a new gwrecharge module
jnsebgosselin Dec 9, 2017
8aab133
Added methods to set H and V spacing.
jnsebgosselin Dec 9, 2017
b241b79
Added a progressbar for rechg calculations
jnsebgosselin Dec 9, 2017
e93c564
Refactoring
jnsebgosselin Dec 10, 2017
089d16e
Removed useless import
jnsebgosselin Dec 10, 2017
817cc78
Removed mpl.use('Qt5Agg')
jnsebgosselin Dec 10, 2017
3e94511
calcul recharge moved in cython
jnsebgosselin Dec 10, 2017
b45d4ab
Plot GLUE water levels made free of pyplot
jnsebgosselin Dec 10, 2017
1b8e8ae
Cleaned code that was moved to cython
jnsebgosselin Dec 10, 2017
59e776f
Cleaned code that was moved to cython
jnsebgosselin Dec 10, 2017
3731f06
Renamed and cleaned method opt_Sy
jnsebgosselin Dec 10, 2017
e014ddb
if __name__ == '__main__':
jnsebgosselin Dec 10, 2017
4450d5d
Moved method to functions
jnsebgosselin Dec 10, 2017
529603f
On the way to plot the results correctly
jnsebgosselin Dec 10, 2017
f3aa682
Merge remote-tracking branch 'refs/remotes/origin/master' into improv…
jnsebgosselin Dec 11, 2017
2b4ee38
Converted code to new icons API
jnsebgosselin Dec 11, 2017
b914996
Added build setup to CI
jnsebgosselin Dec 11, 2017
8ecf69c
Updated the requirements
jnsebgosselin Dec 11, 2017
9af796b
Git ignor .bat files
jnsebgosselin Dec 11, 2017
9c0e1d1
Minor pep8 changes
jnsebgosselin Dec 11, 2017
99aa731
Added FigureManagers
jnsebgosselin Dec 11, 2017
43abff5
Added parent to the fig. manager
jnsebgosselin Dec 11, 2017
0f81bae
Trying to fix build on Travis
jnsebgosselin Dec 11, 2017
d5c05ce
Fix Travis try#2
jnsebgosselin Dec 11, 2017
491d2c7
Added a gw rechg demo in the docs.
jnsebgosselin Dec 11, 2017
8b122b0
Commented the auto save to GLUE.npy
jnsebgosselin Dec 11, 2017
75b39b9
Moved gwrecharge_post to backup
jnsebgosselin Dec 11, 2017
24f3d4b
Refine the plots
jnsebgosselin Dec 11, 2017
b99b377
Updated the demo animation.
jnsebgosselin Dec 11, 2017
49d4eac
Improved how the figure windows are managed
jnsebgosselin Dec 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ BRFOutput.txt
GLUE.npy
*.par
*.wif
*.bat

url.txt
urlsinglestation.txt
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ install:
- pip install coveralls
- pip install matplotlib
- pip install scipy
- pip install beautifulsoup4
- pip install cython
- python setup.py build_ext --inplace

script:
python runtests.py
Expand Down
5 changes: 3 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@ install:
- python -m pip install coveralls
- python -m pip install matplotlib
- python -m pip install scipy
- python -m pip install beautifulsoup4
- python -m pip install cython

build: false

test_script:
- python setup.py build_ext --inplace
- python runtests.py

on_success:
- coveralls

on_finish:
on_finish:
# - ps: $blockRdp = $false; iex ((new-object net.webclient).DownloadString('https://github.com/raw/appveyor/ci/master/scripts/enable-rdp.ps1'))
10 changes: 7 additions & 3 deletions docs/groundwater_recharge.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
Estimating Groundwater Recharge
===============================================

.. figure:: img/Work-in-progress.*
.. _gwrecharge_eval_demo:
.. figure:: img/demo/demo_eval_recharge.*
:align: center
:width: 65%
:alt: http://breakingbad.wikia.com/wiki/File:Work-in-progress-1024x603.png.
:width: 100%
:alt: alternate text
:figclass: align-center

Presentation of the tool to evaluate ground-water recharge in GWHAT
available under the tab :guilabel:`Analyze Hydrograph`.
Binary file added docs/img/demo/demo_eval_recharge.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img/demo/demo_eval_recharge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading