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

Conversation

jnsebgosselin
Copy link
Owner

@jnsebgosselin jnsebgosselin commented Dec 11, 2017

Fixes #80 and Fixes #72

The goal of this PR is to improve the tool to evaluate groundwater recharge. This was included in WHAT in version 4.2.0-beta with some major ninja hacking. This PR cleans this up and includes some major performance improvements with the use of the cython package to improve some routines that were taking too much calculation time in Python.

In summary, this PR:

  • Improves the ground-water recharge calculation time by 2 order of magnitude.
  • Moved all things related to the assessment of groundwater recharge to a new module.
  • Drop the use of the pyplot interface for plotting the results.
  • Moved the calculation in its own thread so it doesn't freeze the GUI.
  • Added a calculation progressbar.

eval_recharge

@jnsebgosselin
Copy link
Owner Author

The plotting of the results is still a little bit slow, but this is going to be for another PR. This one is big enough.

The axis labels are not displayed correctly though, I need to fix that because I can merge.

@jnsebgosselin jnsebgosselin added this to the gwhat-0.2.0 milestone Dec 11, 2017
@jnsebgosselin
Copy link
Owner Author

Ok, that was not the plotting that was slow. I forgot to remove a line of codes that I added for testing and that was saving the results to a numpy binary. This is what was causing the lag in the production of the figures.

@jnsebgosselin
Copy link
Owner Author

jnsebgosselin commented Dec 11, 2017

Here what features are still missing after this patch:

  • Add the option to select the language for the graphs.
  • Add the option to save the results in a csv or xls format
  • Add the option to save the results in a npy format.
  • Add the option to select the range of years over which recharge is assessed.
  • Further improve the calculation time by multiprocessing.

@jnsebgosselin jnsebgosselin merged commit 8785880 into master Dec 11, 2017
@jnsebgosselin jnsebgosselin deleted the improv_rechg_calc branch December 11, 2017 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant