Update develop from master; improves readUCI & general cleanup #41
Conversation
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
eliminate *.SEQ files for *.CSV files for easier maintenance. Fix several bugs in GRW* & ZRW* UCI file reads.
Remove SEQ files for PERLND, IMPLND, and RCHRES. New CSV files are designed for maintenance.
Uses the PyQt5 FileDialog to prompt for the name of the H5 file to run. If the H5 file does not exist, the user can enter the name of a UCI file and/or WDM file to import to H5.
New config file. Bug fixes for read_UCI Cleanup on HSP2 files
This was referenced Sep 22, 2020
aufdenkampe
pushed a commit
that referenced
this pull request
Sep 20, 2021
* Address bugs in GQUAL and HTRCH * Updates to original PLANK module * Classify OXRX + RQUAL updates * Customize main to handle revised RQUAL * Cumulative updates for 8/10/21 * Revisions based on testing of OXRX * Address issue with initial reach outflow rates; implement unit conv. in ADCALC * GQUAL module - correct handling of metric units case * GQUAL: address numba issues with OSEDx lists; simplify conversion calcs * GQUAL - fix conflict / overwrite issue for "SSED4" time series * HTRCH - restore njit decorator * Nearly complete implementation of WQ classes and rqual wrapper * Update main and configuration for revised WQ implementation * Clean-up in OXRX, PLANK * GQUAL - adjustments to address merge conflicts w/ Respec's develop branch * Attempt to address errors generated by RQUAL jitclass implementation * GQUAL - address conditionals and simplify unit conversions for sed-associated quals * GENER and COPY support in readUCI * Move get_timeseries function to utilities * general clean up Pep 8 doc string Raise proper error rather than print/return for error handling * Read GENER in get_uci Modify get_uci function to read the GENER block information for HDF5 and store in new variable ddgener * partial implementation of COPY module * modify main to use COPY module Modify config and main execution loop to create instances of Copy class and store in dictionary within the main function. * Fix Copy type hints * Fix types in COPY doc strings * RQUAL - successful numba compilation of all WQ modules Testing against HSPF still ongoing * revised doc string for COPY * partial GENER module implementation * ReadUCI fix NETWORK SMEMSB1 ParseTable.csv specified only single digit in the NETWORK.SMEMSB1 parameter, but there should be up two digits. * add leading zeros on GENER UCI dictionary keys * clean up testing pieces * function to get timeseries from Gener instances based on links table * RQUAL / WQ: updates to support WQ mass links and expanded output * HTRCH: fix issue with (lack of) conversion to metric (tgrnd, tstop, muddep) * Fix missed merge conflict change * Remove leftover debugging print * PLANK: fix bug related to benthic algae * PLANK: fixed sloughing initialization issue Co-authored-by: Todd Redder <tredder75@gmail.com>
PaulDudaRESPEC
pushed a commit
that referenced
this pull request
Mar 12, 2025
Update develop from master; improves readUCI & general cleanup
PaulDudaRESPEC
pushed a commit
that referenced
this pull request
Mar 12, 2025
* Address bugs in GQUAL and HTRCH * Updates to original PLANK module * Classify OXRX + RQUAL updates * Customize main to handle revised RQUAL * Cumulative updates for 8/10/21 * Revisions based on testing of OXRX * Address issue with initial reach outflow rates; implement unit conv. in ADCALC * GQUAL module - correct handling of metric units case * GQUAL: address numba issues with OSEDx lists; simplify conversion calcs * GQUAL - fix conflict / overwrite issue for "SSED4" time series * HTRCH - restore njit decorator * Nearly complete implementation of WQ classes and rqual wrapper * Update main and configuration for revised WQ implementation * Clean-up in OXRX, PLANK * GQUAL - adjustments to address merge conflicts w/ Respec's develop branch * Attempt to address errors generated by RQUAL jitclass implementation * GQUAL - address conditionals and simplify unit conversions for sed-associated quals * GENER and COPY support in readUCI * Move get_timeseries function to utilities * general clean up Pep 8 doc string Raise proper error rather than print/return for error handling * Read GENER in get_uci Modify get_uci function to read the GENER block information for HDF5 and store in new variable ddgener * partial implementation of COPY module * modify main to use COPY module Modify config and main execution loop to create instances of Copy class and store in dictionary within the main function. * Fix Copy type hints * Fix types in COPY doc strings * RQUAL - successful numba compilation of all WQ modules Testing against HSPF still ongoing * revised doc string for COPY * partial GENER module implementation * ReadUCI fix NETWORK SMEMSB1 ParseTable.csv specified only single digit in the NETWORK.SMEMSB1 parameter, but there should be up two digits. * add leading zeros on GENER UCI dictionary keys * clean up testing pieces * function to get timeseries from Gener instances based on links table * RQUAL / WQ: updates to support WQ mass links and expanded output * HTRCH: fix issue with (lack of) conversion to metric (tgrnd, tstop, muddep) * Fix missed merge conflict change * Remove leftover debugging print * PLANK: fix bug related to benthic algae * PLANK: fixed sloughing initialization issue Co-authored-by: Todd Redder <tredder75@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 includes commits for refactoring
readUCIas described in #40.This also includes some general cleanup of files.