Skip to content
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

Update GitHub action to run V4 #695

Merged
merged 10 commits into from
Nov 15, 2023
Merged

Update GitHub action to run V4 #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8f56b92
change test to V4 on HYfeatures
shorvath-noaa Nov 14, 2023
3548aad
add more tests
shorvath-noaa Nov 14, 2023
38c0d04
change dx: param to length_m
shorvath-noaa Nov 14, 2023
147fb07
add LowerColorado yaml file with no DA
shorvath-noaa Nov 14, 2023
323bdc7
store rfc crosswalk info in HYFeatures.py so reading csv file is not …
shorvath-noaa Nov 14, 2023
fed5b5f
comment out all outputs for LowerColorado test cases
shorvath-noaa Nov 14, 2023
dafd616
update check for writing lite_restart in main
shorvath-noaa Nov 14, 2023
8403045
import rfc_gage info from another file
shorvath-noaa Nov 15, 2023
1956044
create separate file for rfc gage info
shorvath-noaa Nov 15, 2023
707a388
remove rfc gage csv files
shorvath-noaa Nov 15, 2023
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
23 changes: 21 additions & 2 deletions .github/workflows/ubuntu-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,26 @@ jobs:
run: |
./compiler.sh no-e

- name: Run Test
- name: Run V3 Test
run: |
cd test/LowerColorado_TX
python -m nwm_routing -f -V3 test_AnA.yaml
python -m nwm_routing -f -V3 test_AnA.yaml
cd ../..

- name: Run V4 Test on NHD
run: |
cd test/LowerColorado_TX
python -m nwm_routing -f -V4 test_AnA_V4_NHD.yaml
cd ../..

- name: Run V4 Test on HYFeature
run: |
cd test/LowerColorado_TX_v4
python -m nwm_routing -f -V4 test_AnA_V4_HYFeature.yaml
cd ../..

- name: Run V4 Test on HYFeature without DA
run: |
cd test/LowerColorado_TX_v4
python -m nwm_routing -f -V4 test_AnA_V4_HYFeature_noDA.yaml
cd ../..
6 changes: 3 additions & 3 deletions src/troute-network/troute/HYFeaturesNetwork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import troute.nhd_io as nhd_io #FIXME
from troute.nhd_network import reverse_dict, extract_connections, reverse_network, reachable
from .rfc_lake_gage_crosswalk import get_rfc_lake_gage_crosswalk

__verbose__ = False
__showtiming__ = False
Expand Down Expand Up @@ -559,10 +560,9 @@ def preprocess_data_assimilation(self, network):
if usgs_da:
self._waterbody_types_df.loc[self._usgs_lake_gage_crosswalk.index,'reservoir_type'] = 2
if rfc_da:
#FIXME: Temporary fix, read in predefined rfc lake gage crosswalk file for rfc reservoirs.
#FIXME: Temporary fix, load predefined rfc lake gage crosswalk info for rfc reservoirs.
# Replace relevant waterbody_types as type 4.
temp_rfc_file = Path(__file__).parent / 'rfc_lake_gage_crosswalk.csv'
rfc_lake_gage_crosswalk = pd.read_csv(temp_rfc_file)
rfc_lake_gage_crosswalk = get_rfc_lake_gage_crosswalk().reset_index()
self._rfc_lake_gage_crosswalk = rfc_lake_gage_crosswalk[rfc_lake_gage_crosswalk['rfc_lake_id'].isin(self.waterbody_dataframe.index)].set_index('rfc_lake_id')
self._waterbody_types_df.loc[self._rfc_lake_gage_crosswalk.index,'reservoir_type'] = 4
else:
Expand Down
317 changes: 0 additions & 317 deletions src/troute-network/troute/rfc_lake_gage_crosswalk.csv
View file
Open in desktop

This file was deleted.

Loading