Skip to content

Merge develop into master for v0.9.1 release #50

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.

Sign up for GitHub

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

Merged
PaulDudaRESPEC merged 144 commits into from
Apr 30, 2021
Merged

Merge develop into master for v0.9.1 release #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
989a096
Add non hydrologic modules
rheaphy Apr 6, 2020
ac9e539
Merge pull request #29 from respec/master to `develop-WaterQuality`
aufdenkampe Apr 19, 2020
a40e683
Merge pull request #33 from respec/master
aufdenkampe May 19, 2020
abcd30c
Merge pull request #42 from respec/develop
aufdenkampe Sep 22, 2020
b3eb6e3
main.py and readUCI.py -- small fixes for cases where UCI has no RCHR…
PaulDudaRESPEC Nov 5, 2020
38f7132
small fixes for section ATEMP
PaulDudaRESPEC Nov 5, 2020
e0a09f9
IWATER.py -- fix small bug in IWATER for incorrectly initializing surs
PaulDudaRESPEC Nov 6, 2020
b9a3853
SEDMNT.py and SOLIDS.py -- refinements and testing
PaulDudaRESPEC Nov 6, 2020
e251cb1
readUCI.py -- small fix for network block
PaulDudaRESPEC Nov 9, 2020
2f81096
Merge branch 'develop' into develop-WaterQuality
aufdenkampe Nov 10, 2020
9b65a97
Merge branch 'develop' into develop-WaterQuality
aufdenkampe Nov 10, 2020
cbab468
PSTEMP -- refinements and testing
PaulDudaRESPEC Nov 11, 2020
d63700f
Merge remote-tracking branch 'remotes/origin/develop-WaterQuality' in…
PaulDudaRESPEC Nov 11, 2020
0740df1
IWTGAS and PWTGAS -- refinements and testing
PaulDudaRESPEC Nov 13, 2020
d4700cf
Merge pull request #46 from respec/master
PaulDudaRESPEC Nov 16, 2020
1fcca71
more updates to conda env file
aufdenkampe Nov 16, 2020
5a1eeca
IQUAL -- make operational and preliminary testing
PaulDudaRESPEC Nov 17, 2020
037db7b
Merge remote-tracking branch 'remotes/origin/develop-WaterQuality' in…
PaulDudaRESPEC Nov 17, 2020
d972d8a
refinements to readHBN, readWDM, and readUCI, in response to issue #40
PaulDudaRESPEC Nov 17, 2020
1ec7e36
Merge pull request #47 from respec/develop-WaterQuality
PaulDudaRESPEC Nov 19, 2020
84a2928
Merge remote-tracking branch 'upstream/develop' into develop
aufdenkampe Nov 19, 2020
5c94e20
IQUAL refinements, implementing PQUAL.
PaulDudaRESPEC Nov 20, 2020
edb1379
refinements to POQUAL
PaulDudaRESPEC Nov 22, 2020
c060bdb
Merge remote-tracking branch 'upstream/develop' into develop
aufdenkampe Nov 23, 2020
c3760e5
PQUAL and IQUAL -- better handling of atmospheric deposition
PaulDudaRESPEC Nov 25, 2020
367f7d9
Merge remote-tracking branch 'upstream/develop' into develop
aufdenkampe Nov 30, 2020
78ee18a
PQUAL.py, PWTGAS.py, PSTEMP.py -- refinements based on additional tes…
PaulDudaRESPEC Dec 2, 2020
b441a4e
PQUAL.py, IQUAL.py, IWTGAS.py, PSTEMP.py, SEDMNT.py, SOLIDS.py -- ref…
PaulDudaRESPEC Dec 2, 2020
ed1bffa
IWATER.py, PWATER.py, SNOW.py, SEDMNT.py -- better handling of flags …
PaulDudaRESPEC Dec 3, 2020
50edb71
ADCALC.py, configuration.py, main.py -- first draft of ADCALC, furthe…
PaulDudaRESPEC Dec 8, 2020
4e2af55
Merge remote-tracking branch 'upstream/develop' into develop
aufdenkampe Dec 11, 2020
52d68bd
HTRCH.py, configuration.py, main.py, readUCI.py -- make HTRCH operati…
PaulDudaRESPEC Dec 14, 2020
7690d72
HTRCH.py, ADCALC.py, main.py -- refinements to HTRCH
PaulDudaRESPEC Dec 17, 2020
7f13d02
add optional argument for output specs
PaulDudaRESPEC Dec 18, 2020
dce622d
SEDTRN.py -- initial changes to make functional, not yet tested
PaulDudaRESPEC Dec 23, 2020
e28244e
HYDR.py -- for sedtrn, need full auxil functionality
PaulDudaRESPEC Jan 6, 2021
657648f
SEDTRN.py -- refinements from testing
PaulDudaRESPEC Jan 8, 2021
9b03953
SEDTRN.py -- small fixes for colby method
PaulDudaRESPEC Jan 13, 2021
8a13687
CONS.py, configuration.py, main.py, readUCI.py -- first draft of RCHR…
PaulDudaRESPEC Jan 16, 2021
f8dbaa8
testing/refinements for section CONS
PaulDudaRESPEC Jan 18, 2021
dddd759
wdm conversion fixes
jlkittle Jan 22, 2021
f190fd8
HSP2_Driver.py -- add option for viewing input timeseries in hdf5viewer
PaulDudaRESPEC Jan 22, 2021
07a22c1
GQUAL.py -- first cut at implementing gqual algorithms
PaulDudaRESPEC Jan 22, 2021
f2a0f76
readUCI.py and ParseTable.csv -- handle extended HSPF input tables
PaulDudaRESPEC Jan 29, 2021
0211f1b
GQUAL.py -- further refinements, initial test
PaulDudaRESPEC Feb 4, 2021
60ec197
test 10b update
steveskrip Dec 11, 2020
a948a40
Merge remote-tracking branch 'upstream/develop' into develop
aufdenkampe Feb 4, 2021
5dc3121
Merge pull request #49 from LimnoTech/develop
aufdenkampe Feb 4, 2021
ce8a43d
PQUAL.py, IQUAL.py -- small refinements
PaulDudaRESPEC Feb 5, 2021
2d548af
Merge remote-tracking branch 'remotes/origin/develop' into develop
PaulDudaRESPEC Feb 5, 2021
7a42d70
refinements to maintain both subscripts in time series linkages, need…
PaulDudaRESPEC Feb 8, 2021
8a5ea7b
IWATER.py -- small bug fix for suro under dry conditions
PaulDudaRESPEC Feb 11, 2021
eb6bcac
GQUAL.py and main.py -- small refinements for GQUAL
PaulDudaRESPEC Feb 12, 2021
1ca474d
GQUAL.py -- small adjustments for hydrolysis testing
PaulDudaRESPEC Feb 16, 2021
c5b2a1c
Add process_groups function
ptomasula Feb 19, 2021
a5742e9
GQUAL.py -- further refinements
PaulDudaRESPEC Feb 19, 2021
8c78d7f
Merge pull request #24 from respec/develop
aufdenkampe Feb 22, 2021
152d7ed
Merge branch 'develop' into develop_readWDM
aufdenkampe Feb 22, 2021
90e7ff7
Adding rpo772.wdm
ptomasula Feb 22, 2021
bad3771
Numpy Array chunk allocation approach
ptomasula Feb 22, 2021
129a228
End of block on 511th element of record
ptomasula Feb 22, 2021
0428b58
GQUAL.py -- further refinements for sediment associated quals
PaulDudaRESPEC Feb 22, 2021
762b90c
Add WDM Programmers Guide
aufdenkampe Feb 22, 2021
b6fbef4
Adding rpo772.wdm debugging files
aufdenkampe Feb 22, 2021
ac0f5b6
GQUAL.py -- implement photolysis
PaulDudaRESPEC Feb 26, 2021
0f5a2d1
alternative implementation of process_group:
htaolimno Mar 1, 2021
b600ebf
remove deprecated functions
ptomasula Mar 2, 2021
2561869
renaming internal functions
ptomasula Mar 2, 2021
2e205f1
tidy up readWDM
ptomasula Mar 3, 2021
8b701e9
Searchable WDMProgrammersGuide+Search+Nav.pdf with sidebar navigation
aufdenkampe Mar 4, 2021
65ea251
readUCI.py -- extend to work with multiple GQUALs, in response to iss…
PaulDudaRESPEC Mar 5, 2021
ef2d8df
Upload HSPF v12.2 manual with added sidebar navigation
aufdenkampe Mar 5, 2021
f06c864
Merge pull request #31 from respec/develop
bcous Mar 5, 2021
0cfd7c2
Merge pull request #32 from LimnoTech/develop
bcous Mar 5, 2021
e5d64a1
Numba support
ptomasula Mar 5, 2021
677adaa
Merge branch 'develop_readWDM' of https://github.com/LimnoTech/HSPsqu…
ptomasula Mar 5, 2021
1a62f38
Explicit Int64 assignment for datetime
ptomasula Mar 9, 2021
1b52a17
numba compatible datetime converter
ptomasula Mar 9, 2021
9b19a92
Remove old datetime conversion
ptomasula Mar 12, 2021
b2b32a1
Update __init__.py with version 0.9.0
aufdenkampe Mar 29, 2021
2a8373e
Test10 no longer runs since readWDM time series updates
aufdenkampe Mar 30, 2021
2014cd0
Datetime shift fix
ptomasula Mar 30, 2021
b0edc39
Remove sparse timeseries fill
ptomasula Mar 31, 2021
6592111
Rerun Test10 & Test10b for outputs comparison
aufdenkampe Mar 31, 2021
c4bbff1
rename Test10 notebooks
aufdenkampe Mar 31, 2021
57cf4f9
Created and tested dev conda environment
aufdenkampe Mar 31, 2021
b4331f1
Add HDF5 notebook example
aufdenkampe Mar 31, 2021
a094cfe
Merge branch 'develop' into develop_readWDM
aufdenkampe Mar 31, 2021
ac06aeb
Update version to 0.9.1 Water Qual + better readWDM
aufdenkampe Mar 31, 2021
0f1f7bc
Merge branch 'develop' into develop_readWDM
aufdenkampe Mar 31, 2021
c52eaad
TimeSeries dtypes change in readWDM
aufdenkampe Apr 8, 2021
2d09713
Update HDF5_compare notebook
aufdenkampe Apr 8, 2021
98d44f0
GQUAL.py -- small fix for nexits subscript in response to issue #21
PaulDudaRESPEC Apr 9, 2021
a399327
Merge remote-tracking branch 'remotes/origin/develop' into develop
PaulDudaRESPEC Apr 9, 2021
fb81c8c
Merge remote-tracking branch 'upstream/develop' into develop
aufdenkampe Apr 9, 2021
ca50dd0
Merge branch 'develop' into develop_readWDM
aufdenkampe Apr 9, 2021
543ea20
Stop datetime fix
ptomasula Apr 12, 2021
ae374f1
Adding missing lines to stop datetime fix
ptomasula Apr 12, 2021
c01199a
ADCALC.py -- initialize omat for multiple exits
PaulDudaRESPEC Apr 14, 2021
bbd1159
Organize and add to gitignore
aufdenkampe Apr 14, 2021
1fdd6b6
Merge remote-tracking branch 'upstream/develop' into develop
aufdenkampe Apr 14, 2021
0d910ed
Merge branch 'develop' into develop_readWDM
aufdenkampe Apr 14, 2021
6e6beab
Testing outputs. Fix worked!
aufdenkampe Apr 14, 2021
bdb8b5a
make error messages consistent
PaulDudaRESPEC Apr 21, 2021
c556ff7
implement unit testing for conversion
TongZhai Apr 22, 2021
479e6d6
Sparse time series fill added back
aufdenkampe Apr 23, 2021
15f111b
update unit testing for conversion
TongZhai Apr 23, 2021
8a2dce7
Delete test10.h5
TongZhai Apr 23, 2021
503e95a
Update README.md per new unit testing function
TongZhai Apr 23, 2021
b9e635f
timeseries freq assignment
ptomasula Apr 23, 2021
5d32b3e
instruction for running regression tests
TongZhai Apr 23, 2021
1c450ae
Update conda env & notebooks
aufdenkampe Apr 23, 2021
ee429de
block control word indexing fix
ptomasula Apr 26, 2021
684f20c
revert update to readWDM per conversion regression test
TongZhai Apr 26, 2021
4138f52
ADCALC.py -- small adjustment to omat initialization
PaulDudaRESPEC Apr 27, 2021
6b3ece7
Merge remote-tracking branch 'remotes/origin/develop' into develop
PaulDudaRESPEC Apr 27, 2021
35c8979
Update test_report_conversion.html per ADCALC, SEDTRN, SNOW updates
TongZhai Apr 27, 2021
c9b56be
Merge branch 'master' into develop
TongZhai Apr 27, 2021
2adf2ce
update conversion test instruction and result
TongZhai Apr 27, 2021
fb81100
ensure default soil tmp is recorded when no surface outflow
TongZhai Apr 27, 2021
5cff834
Merge branch 'develop' into develop
aufdenkampe Apr 28, 2021
c585ac8
match HSPF HBN output time period, i.e. end of first time period to e…
TongZhai Apr 28, 2021
e7d8ca2
Merge pull request #36 from respec/develop, with Unit Testing
aufdenkampe Apr 28, 2021
d6b66c6
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
TongZhai Apr 28, 2021
4b55545
Update .gitignore for merge
aufdenkampe Apr 28, 2021
146036c
Error handling for irregular timeseries
ptomasula Apr 28, 2021
c62adb6
renaming private function
ptomasula Apr 28, 2021
b430ced
handle testing of IQUAL constituents
TongZhai Apr 28, 2021
5039cf2
Merge branch 'develop' into develop_readWDM2
ptomasula Apr 28, 2021
e651d08
rename bits_to_date
ptomasula Apr 28, 2021
4f4f15a
remove unnecessary dependencies
ptomasula Apr 28, 2021
12dc1d5
deprecation notices
ptomasula Apr 28, 2021
ba64128
Merge pull request #37 from LimnoTech/develop_readWDM2
ptomasula Apr 28, 2021
0828189
update HBNOutput time series retrieval
TongZhai Apr 29, 2021
06da636
HYDR.py and PWATER.py -- small fixes to match HSPF hydrology results
PaulDudaRESPEC Apr 29, 2021
647ca7f
Update ReadMe to add `docs` + fixes
aufdenkampe Apr 29, 2021
6b04078
IQUAL.py -- change initialization and conversions to better match hsp…
PaulDudaRESPEC Apr 29, 2021
9ceb13f
Add Visual Studio to .gitignore
aufdenkampe Apr 29, 2021
0902bc1
Update .gitignore
aufdenkampe Apr 29, 2021
518ec78
Delete VSWorkspaceState.json
aufdenkampe Apr 29, 2021
b3e9649
Update .gitignore
aufdenkampe Apr 29, 2021
7163599
Removing temporary test files
aufdenkampe Apr 30, 2021
71a88bb
Merge pull request #52 from LimnoTech/develop
PaulDudaRESPEC Apr 30, 2021
b87f74f
HSP2_Driver.py -- argument change for new improved readWDM
PaulDudaRESPEC Apr 30, 2021
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
33 changes: 27 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# Editors & IDEs
.vscode
.vs
.idea

# Jupyter Notebook
.ipynb_checkpoints

# Distribution / packaging
build
build/*
_build
_build/*
.bzr
.coverage
.coverage/*
develop-eggs
dist
dist/*
Expand All @@ -15,19 +21,34 @@ downloads
*.egg-info
eggs
fake-eggs
.hg
htmlcov
.installed.cfg
*.mo
.mr.developer.cfg
parts

# Byte-compiled / optimized / DLL files
*.pyc
__pycache__
__pycache__/*
*.pyo
.svn
*.tmp*

# Unit test / coverage reports
htmlcov
.tox
.tox/*
.coverage
.coverage/*
*.ech
*.log
*.hbnhead
*.units.dbf

# Translations
*.mo

# Stashes, etc.
stats.dat
.ropeproject
.hg
*.tmp*
tests/_LargeFileStash
Loading