Develop step #187
Merged
Develop step #187
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
This Python 3.9 environment is basically the same I used for demos and testing in Jan. 2022.
incorrect timeseries key assignment for inorganic nutrient species
test passing the TS and modifying the last step value
…hars of string x are x[0:3], NOT x[0:2]
…g to make an impact till we figure out how to call the parser properly
…ch, added domain specific specl filter in HYDR
tests for spec actions
…ated as registers that get zeroed
…special case of ModelVariable, and then ModelVariable can form the base class for simple numerical data holders like UVQUAN
Develop spec lean
* Moved the HSP2, HSP2IO, and HSP2tools top level packages to hsp2.hsp2, hsp2.hsp2io, and hsp2.hsp2tools respectively. * Corrected the imports in python and Jupyter notebooks to use the new locations. * HSP2 can be run in all of the CompareHSP2.ipynb in tests/, however some do not have the HSPF results to compare to. * The Jupyter notebooks in examples/ need some work to find input data and where to write output.
Move to single python package "hsp2" Nice work, thanks @timcera !
…me print statements related to new om implementation
Merge Develop in Main in preparation for new release
numpy <2.0
Rebase against master to include package changes
Reformatted the files in the repository according to rules in a new file ".pre-commit-config.yaml". Have to install pre-commit either through pip or conda and then "pre-commit install" to install the git hooks. The pre-commit lints or reformats many file types by using separate linters and autoformaters that are installed as part of pre-commit. Uses "ruff" for Python files, but presently configured only for autoformatting. Turned off "ruff" linting because it found over 300 problems, some of which there weren't easy answers for.
Added .pre-commit-config.yaml with coding standard rules enforced at each commit
…ecl and simple main loop prototype
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.
Notes: @PaulDudaRESPEC @timcera
This is mostly an information PR. There are no major changes to the
STATEdata model orspecl/opsframework. There are 2 code introductions building on that framework, however, the introduction of theopscomponent typeEquation, and a prototype main loop in the filedemo_step_specl_state.py. A summary of the files follow:examplesfolder to containstate_specl_ops, which is a folder of code demos that can be run by pasting into a command line python window.stateenvironment.ops modelcomponentEquationwhich is built on the same engine asspeclcompare_eq_to_specl.pyloads h5 files and hbn files from various hsp2 and hspf variants oftest10, and does a quick comparison of sedtrn output data for RCHRES5. You must first run thehsp2version oftest10speclandtest10eqto generate theh5files for those model runs since the largeh5files are deliberately omitted by.gitignore.cd tests/test10specl/HSP2results; hsp2 import_uci test10spec.uci test10specl.h5; hsp2 run test10specl.h5cd tests/test10eq/HSP2results; hsp2 import_uci test10eq.uci test10eq.h5; hsp2 run test10eq.h5src/hsp2/hsp2/sedtrn_step.pyshows a rough prototype of a tightly-coupled main execution loop, to replace the loosely coupled current hsp2 implementation.calls this loop. You must first run the code indemo_specl_initialize.py` to run this.jit'ed executables in tidy self-contained files, rather than as part of a larger SEDTRN.py file.STATEand the object-oriented handlers for state data.