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

Fix Ngen Integration worklfow #23

Merged
merged 11 commits into from
Aug 30, 2024
Merged

Fix Ngen Integration worklfow #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
30203e9
Update realization_config_smp_cfe.json
madMatchstick Aug 28, 2024
a877217
Update realization_config_smp_topmodel.json
madMatchstick Aug 28, 2024
1201810
Update realization_config_smp_cfe.json
madMatchstick Aug 28, 2024
913ceb9
Update ngen_integration.yaml
madMatchstick Aug 29, 2024
2473cce
Update ngen_integration.yaml
madMatchstick Aug 30, 2024
86662c7
Update ngen_integration.yaml
madMatchstick Aug 30, 2024
2fa1128
Update ngen_integration.yaml
madMatchstick Aug 30, 2024
882e005
Update ngen_integration.yaml
madMatchstick Aug 30, 2024
775556a
Update realization_config_smp_cfe.json
madMatchstick Aug 30, 2024
e105b8e
Update realization_config_smp_topmodel.json
madMatchstick Aug 30, 2024
751ccdf
Update ngen_integration.yaml
madMatchstick Aug 30, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/ngen_integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ jobs:
mkdir ${{runner.temp}}/smp
mv ./* ${{runner.temp}}/smp

- name: Build CFE
uses: actions/checkout@v4
with:
repository: noaa-owp/cfe

# Checkout and build CFE
- name: Checkout the commit
uses: actions/checkout@v4
Expand Down Expand Up @@ -116,6 +111,11 @@ jobs:
run: |
rm -rf extern/cfe/cfe/*
mv ${{runner.temp}}/cfe/* extern/cfe/cfe

#jlg: this is needed to atm to pull in updated configs
- name: PET (checkout master -- remove later)
run: |
git submodule update --remote extern/evapotranspiration/evapotranspiration

- name: Run Ngen Test for SMP
run: |
Expand Down
6 changes: 3 additions & 3 deletions realizations/realization_config_smp_cfe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"model_type_name": "bmi_c_pet",
"library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi",
"forcing_file": "",
"init_config": "./extern/cfe/cfe/configs/cat_87_bmi_config_pet_pass.txt",
"init_config": "./extern/evapotranspiration/evapotranspiration/configs/pet_config_cat_87_pass.txt",
"allow_exceed_end_time": true,
"main_output_variable": "water_potential_evaporation_flux",
"registration_function":"register_bmi_pet",
Expand All @@ -60,7 +60,7 @@
"model_type_name": "bmi_c_cfe",
"library_file": "./extern/cfe/cfe/cmake_build/libcfebmi",
"forcing_file": "",
"init_config": "./extern/cfe/cfe/configs/cat_87_bmi_config_cfe_pass.txt",
"init_config": "./extern/cfe/cfe/configs/cfe_config_cat_87_pass.txt",
"allow_exceed_end_time": true,
"main_output_variable": "Q_OUT",
"registration_function": "register_bmi_cfe",
Expand Down Expand Up @@ -112,7 +112,7 @@
}
],
"forcing": {
"path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv",
"path": "./extern/cfe/cfe/forcings/cat87_01Dec2015_ngen.csv",
"provider": "CsvPerFeature"
}
}
Expand Down
4 changes: 2 additions & 2 deletions realizations/realization_config_smp_topmodel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"model_type_name": "bmi_c_pet",
"library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi",
"forcing_file": "",
"init_config": "./extern/cfe/cfe/configs/cat_87_bmi_config_pet_pass.txt",
"init_config": "./extern/evapotranspiration/evapotranspiration/configs/pet_config_cat_87_pass.txt",
"allow_exceed_end_time": true,
"main_output_variable": "water_potential_evaporation_flux",
"registration_function":"register_bmi_pet",
Expand Down Expand Up @@ -101,7 +101,7 @@
}
],
"forcing": {
"path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv",
"path": "./extern/cfe/cfe/forcings/cat87_01Dec2015_ngen.csv",
"provider": "CsvPerFeature"
}
}
Expand Down
Loading