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

Merge develop into master for v0.9.1 release #50

Merged
merged 144 commits into from
Apr 30, 2021
Merged

Merge develop into master for v0.9.1 release #50

merged 144 commits into from
Apr 30, 2021

Conversation

TongZhai
Copy link
Contributor

Water quality and regression testing

rheaphy and others added 30 commits April 6, 2020 13:46
Added water quality and other activity modules that are under development.
Create `develop-WaterQuality` for work on non-hydrolic modules
Update develop-WaterQuality from Master
Update WaterQuality feature branch from develop
adding JupyterLab extension depdendencies
…ting

SNOW.py, SaveTable.csv -- full implementation of degree-day option
…inements for flags based on additional testing
aufdenkampe and others added 8 commits April 28, 2021 09:25
Timeseries with irregular timestep do not conform to the requirement for setting the index.freq argument. This results in a value error. This commit adds a try except to allow for the reader to handle timeseries with irregular timesteps. However as of this commit, the model with not be able to run these timeseries. Additional effort is needed to handle timesteps with irregular timesteps.
Renames internal functions with prepending underscore to indicate they are private functions as per PEP8.
- handle special h5 IQUAL constituent name matching with HBN names
@aufdenkampe aufdenkampe changed the title Develop Merge develop into master for v0.9.0 release Apr 28, 2021
ptomasula and others added 16 commits April 28, 2021 17:59
rename bits_to_date to indicate it is an internal function.
Adds deprecation warning to functions replaced by the updated WDMReader.
Merge develop_readWDM into develop to read time series by block & group
- based on operation, activity, and opn id, plus constituent name and time unit
- this shows most rchres-hydr outputs are matching
- Removed repeating block of install instructions.
- Updated name of Conda environment and added description for `environment_dev.yml`
Merge LimnoTech readWDM & other updates to RESPEC develop
readWDM.py -- commented out a few instances of njit to be compatible with other versions of numba
@PaulDudaRESPEC PaulDudaRESPEC merged commit 2f03d02 into master Apr 30, 2021
@aufdenkampe
Copy link
Collaborator

@PaulDudaRESPEC, thanks for reviewing and merging our PR #52!

I just realized that with that PR, __version__ = '0.9.1' as set in HSP2/__init__.py.

This is OK, but I wanted you to know that after merging with master that we should tag the next release as 0.9.1.

I had set that version number in our develop_readWDM branch a while ago to help me with comparing outputs with your develop. I think it's good to preserve that distinction in our git history.

@PaulDudaRESPEC
Copy link
Member

Good! I plan to do a little more testing and then start drafting a new release.

@aufdenkampe aufdenkampe changed the title Merge develop into master for v0.9.0 release Merge develop into master for v0.9.1 release Apr 30, 2021
PaulDudaRESPEC pushed a commit that referenced this pull request Oct 19, 2021
Pull in WQ update from Todd into testing branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants