Merge LimnoTech RQUAL class approach, GENER, expanded testing to RESPEC develop#61
Merged
PaulDudaRESPEC merged 117 commits intorespec:developfrom Oct 19, 2021
Merged
Merge LimnoTech RQUAL class approach, GENER, expanded testing to RESPEC develop#61PaulDudaRESPEC merged 117 commits intorespec:developfrom
develop#61PaulDudaRESPEC merged 117 commits intorespec:developfrom
Conversation
also addresses #35 (git tracking Jupyter notebooks). The new conda environment substantially improves over the previous version, with a more consolidated HDF5 version (1.10.6) and upgrading JupyterLab to v3.
Steps toward enhanced visualization in Jupyter Lab.
Wq updates tmr
This was referenced Oct 1, 2021
Fix GENER opcode specification trims off last operation
This seems consistent with the previous testing, but needs to be addressed long term. Doesn't appear to be logic in HBN code to different IQUAL constituent (i.e. IQUAL_1, IQUAL_2). Using IQUAL1 as default for time being.
Pull in WQ update from Todd into testing branch
Restore automated testing support for Test10
Fix IQUAL not prefix mapping
…ute reaeration coeff RQUAL.py -- more consistent handling of multiple exit outflows RQUAL_Class.py -- implement output of OXRX flux terms main.py -- use same conversion factor precision as HSPF to more precisely reproduce results utilities.py -- enhance expand_timeseries_names to handle OXIF2 inflow from PQUAL/IQUAL, as done in test10 SaveTable.csv -- change blanks to underscores in OXRX time series names
regression_base.py -- small bug fix in special case for PWTGAS checking
RQUAL.py -- more consistent handling of multiple exit outflows RQUAL_Class.py -- implement output of NUTRX internal flux terms, additional outputs utilities.py -- change blanks to underscores in NUTRX time series names HBNAliases.csv -- add aliases for NUTRX internal flux terms and additional outputs SaveTable.csv -- change blanks to underscores in NUTRX time series names, additional outputs regression_base.py -- special case for concentration values as reach volumes nears zero
PLANK_Class.py -- small fixes to pksums to be consistent with HSPF logic RQUAL.py -- more consistent handling of multiple exit outflows RQUAL_Class.py -- implement output of PLANK internal flux terms, additional outputs utilities.py -- change blanks to underscores in PLANK time series names HBNAliases.csv -- add aliases for PLANK internal flux terms and additional outputs SaveTable.csv -- change blanks to underscores in PLANK time series names, additional outputs regression_base.py -- special case for concentration values as reach volumes near zero
Member
PaulDudaRESPEC
left a comment
PaulDudaRESPEC
left a comment
There was a problem hiding this comment.
I've tested using Test10 with OXRX, NTRX, and PLANK. With a few minor tweaks, all looks good. I'll continue testing using RESPEC develop.
Collaborator
Author
|
@PaulDudaRESPEC, thanks for the careful review! We're excited to get all these new water quality capabilities into the next release! |
This was
linked to
issues
Nov 18, 2021
aufdenkampe
added this to the
v0.10.0 RQUAL Water Quality Modules as Classes + Expanded Testing milestone
PaulDudaRESPEC
added a commit
that referenced
this pull request
Mar 12, 2025
Merge LimnoTech RQUAL class approach, GENER, expanded testing to RESPEC `develop`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR initiates a dialog and testing phase for a large effort to develop and test detailed water quality modules from RQUAL (i.e. OXRX, NUTRX, PLANK, PHCARB) using a class-based approach, as described in this master issue:
... and including PRs:
developLimnoTech/HSPsquared#39This PR also includes implementation of the GENER module:
This PR also includes improved tested capabilities that expands to additional use cases, includes new RQUAL module code from #58, and substantially enhance performance. See:
We don't plan on merging this PR until we have satisfactorily tested the code with several different HSPF test cases.
cc: @tredder75, @ptomasula, @PaulDudaRESPEC