Skip to content

NGWPC PI-6 Delivery: Replace and Route #857

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

Jump to bottom
Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

NGWPC PI-6 Delivery: Replace and Route #857

wants to merge 26 commits into from

Conversation

taddyb
Copy link

@taddyb taddyb commented Jul 9, 2025 •
edited
Loading

Note: The following commit hashes are related to previous NGWPC deliverables

Commits starting at 39e6817 are related to this PI.

Most commits in the history contain PR information related to the changes made

Additions

Removals

Changes

Testing

  1. Tested through NGWPC demonstrations

Screenshots

Notes

Todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows project standards (link if applicable)
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Visually tested in supported browsers and devices (see checklist below 👇)
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist

Target Environment support

  • Windows
  • Linux
  • Browser

Accessibility

  • Keyboard friendly
  • Screen reader friendly

Other

  • Is useable without CSS
  • Is useable without JS
  • Flexible from small to large screens
  • No linting errors or warnings
  • JavaScript tests are passing

taddyb and others added 26 commits April 9, 2025 15:11
@taddyb
PI4 feature integration tests (#8)
a4eab3d 
* added integration tests

* removed api data

* removed duplicate test

* updated LICENSE
@taddyb
PI4 feature unit test updates (#9)
1ce34c2 
* added t-route unit tests

* removing outdated tests

* upate LICENSE
@taddyb
Pi4 running troute using HF v2.2 (#10)
b902551 
* added files for RnR enhancements to the API, test data, docs

* removed unneccessary files, updated LICENSE
@taddyb @quercoak
JIRA 5916: Port forecast formatting code into T-Route RnR workspace p…
39e6817 
…ackage (#11)

* initial commit

* patch: updated functions to make code more testable. Added error handling

* pr changes

* changing name of variable in main to be consistent

* feat: pydantic updates

* fix: commited pydantic changes too soon

---------

Co-authored-by: Quercus <[email protected]>
@taddyb
updated troute-config to move to pydantic v2 (#12)
df9ee12 
* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed
@taddyb
JIRA 5920: Integrating the RnR domain logic into troute-rnr (#13)
d0e8e05 
* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed
@taddyb
JIRA 5917: Replacing the T-Route RnR API with a namespace package (#14)
07dd7d6 
* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* moved troute run out of the format file

* removed API

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed

* ensuring merge-conflict is resolved properly and code works
@taddyb
JIRA 5918: Validate t-route runs with testing (#15)
acba741 
* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* moved troute run out of the format file

* added tests for the t-route formatting

* got restart test working

* updated examples

* added new test figure

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed

* JIRA 5917: Replacing the T-Route RnR API with a namespace package (#14)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* moved troute run out of the format file

* removed API

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed

* ensuring merge-conflict is resolved properly and code works

* added tests for the t-route formatting

* got restart test working

* removed unneccessary csvs
@taddyb
Jira 5919: Validate T-Route outputs against the max inundation file (#16
2c45996 
)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* moved troute run out of the format file

* added tests for the t-route formatting

* got restart test working

* updated examples

* adding post_process script for rnr formatting

* saving output file

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed

* JIRA 5917: Replacing the T-Route RnR API with a namespace package (#14)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* moved troute run out of the format file

* removed API

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed

* ensuring merge-conflict is resolved properly and code works

* JIRA 5918: Validate t-route runs with testing (#15)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* moved troute run out of the format file

* added tests for the t-route formatting

* got restart test working

* updated examples

* added new test figure

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed

* JIRA 5917: Replacing the T-Route RnR API with a namespace package (#14)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added icefabric hooks to get shortest paths on demand

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* moved troute run out of the format file

* removed API

* updated troute-config to move to pydantic v2 (#12)

* updated troute-config to move to pydantic v2

* fixed incorrect pyproject

* patch: forgot to upload a change in the data assimilation file

* fixed incorrect pyproject

* missed model rebuild

* added comments for why typing tests were removed

* ensuring merge-conflict is resolved properly and code works

* added tests for the t-route formatting

* got restart test working

* removed unneccessary csvs

* added legacy rnr code for formatting input flows

* adding t-route support from rnr inputs

* added tests for the t-route formatting

* got restart test working
@taddyb
added uv version of compiler.sh (#17)
e3cdfa6 
* added uv version of compiler.sh

* removing icefabric from dependencies. Will provide wheels
@taddyb
Patch: remove aws s3 cred references (#18)
2b6e024 
* added uv version of compiler.sh

* removing icefabric from dependencies. Will provide wheels

* removed S3/boto3 aws reliance

* removed a boto3 reference
@taddyb
Patch 05162025 (#19)
28e8288 
* removed redis, fixed copy/paste error

* patching post process script and pyyaml imports to ensure code works
@taddyb
PATCH: remove print from settings
5af0d09
@taddyb
Patch 06052025: Adding clearer error statements, and solving WFOs whi…
9673a1f 
…ch are out of CONUS (#20)

* patch: solved error for missing reach id

* solved num_messages bug
@taddyb
Update main.py (#21)
968cbcb
@taddyb
JIRA 6401: Formatting the output.csv file in based on OWP suggestions (…
fb44ef4 
…#22)

* updated post_processing to include filtering by time

* added a function to format the .nc files after creation to contain RFC metadata

* reformatted the post_process file to be what OWP specified
@taddyb
Added a try/catch for t-route (#23)
d70945f
@taddyb
patch: adding prints for error handling to except value erros
fb2a0ce
@taddyb
added finally statement to ensure messages are acknowledged
35f8906
adding valueError to skip units other than kcfs
3c36558
adding try-except format to read_rfc_flows
8477ad8
@FRahmani368
Revert "adding valueError to skip units other than kcfs"
97316ce 
This reverts commit 3c36558.
@FRahmani368
Revert "Revert "adding valueError to skip units other than kcfs""
d4935a4 
This reverts commit 97316ce.
@FRahmani368
Revert "adding valueError to skip units other than kcfs"
aea3120 
This reverts commit 3c36558.
@FRahmani368
Revert " adding try-except format to read_rfc_flows"
07200af 
This reverts commit 8477ad8.
@taddyb
patch: added ValueError handling for incorrect stage
78a44bc
@taddyb taddyb mentioned this pull request Jul 9, 2025
Open
21 tasks
@taddyb taddyb marked this pull request as ready for review July 10, 2025 15:38
hellkite500
hellkite500 reviewed Jul 11, 2025
View reviewed changes
compiler_uv.sh
@@ -0,0 +1,128 @@
#TODO add options for clean/noclean, make/nomake, cython/nocython
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest keeping a single "compiler" script and simply adding an option to switch between python installer utilities.

hellkite500
hellkite500 reviewed Jul 11, 2025
View reviewed changes
...rvoirs/build/temp.linux-x86_64-cpython-310/src/troute-network/troute/network/reach_structs.h
@@ -0,0 +1,27 @@
#ifndef REACH_STRUCTS_H
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this build dir be .gitignoreed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hellkite500 hellkite500 hellkite500 left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@taddyb @hellkite500 @FRahmani368