Skip to content

Commit

Permalink
Make changes to accomodate upstream master change using extensionless…
Browse files Browse the repository at this point in the history
… lib file name.
  • Loading branch information
stcui007 committed Aug 4, 2022
1 parent acd4a49 commit e6139ba
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 188 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/module_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,7 @@ jobs:
- name: Run surfacebmi, cfebmi and petbmi
run: |
inputfile='data/example_bmi_multi_realization_config_w_noah_pet_cfe__linux.json'
if [ ${{ runner.os }} == 'macOS' ]
then
inputfile=data/example_bmi_multi_realization_config_w_noah_pet_cfe__macos.json
fi
inputfile='data/example_bmi_multi_realization_config_w_noah_pet_cfe.json'
./cmake_build/ngen data/catchment_data.geojson "cat-27" data/nexus_data.geojson "nex-26" $inputfile
# Run t-route/pybind integration test
Expand Down
6 changes: 3 additions & 3 deletions data/example_bmi_multi_realization_config_w_noah_pet_cfe.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"name": "bmi_fortran",
"params": {
"model_type_name": "bmi_fortran_noahowp",
"library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi.so",
"library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi",
"forcing_file": "",
"init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input",
"allow_exceed_end_time": true,
Expand All @@ -36,7 +36,7 @@
"name": "bmi_c",
"params": {
"model_type_name": "bmi_c_pet",
"library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi.so",
"library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi",
"forcing_file": "",
"init_config": "./data/bmi/c/pet/{{id}}_bmi_config.ini",
"allow_exceed_end_time": true,
Expand All @@ -52,7 +52,7 @@
"name": "bmi_c",
"params": {
"model_type_name": "bmi_c_cfe",
"library_file": "./extern/cfe/cmake_build/libcfebmi.so",
"library_file": "./extern/cfe/cmake_build/libcfebmi",
"forcing_file": "",
"init_config": "./data/bmi/c/cfe/{{id}}_bmi_config.ini",
"allow_exceed_end_time": true,
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit e6139ba

Please sign in to comment.