From e6139ba76cded7c40249d4a12e043462e9630ee3 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Thu, 4 Aug 2022 18:42:49 +0000 Subject: [PATCH] Make changes to accomodate upstream master change using extensionless lib file name. --- .github/workflows/module_integration.yml | 6 +- ...lti_realization_config_w_noah_pet_cfe.json | 6 +- ...lization_config_w_noah_pet_cfe__linux.json | 90 ------------------- ...lization_config_w_noah_pet_cfe__macos.json | 90 ------------------- 4 files changed, 4 insertions(+), 188 deletions(-) delete mode 100644 data/example_bmi_multi_realization_config_w_noah_pet_cfe__linux.json delete mode 100644 data/example_bmi_multi_realization_config_w_noah_pet_cfe__macos.json diff --git a/.github/workflows/module_integration.yml b/.github/workflows/module_integration.yml index 2f8a255eb2..189f478f5f 100644 --- a/.github/workflows/module_integration.yml +++ b/.github/workflows/module_integration.yml @@ -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 diff --git a/data/example_bmi_multi_realization_config_w_noah_pet_cfe.json b/data/example_bmi_multi_realization_config_w_noah_pet_cfe.json index 05c9cd9cbb..cf98b045a2 100644 --- a/data/example_bmi_multi_realization_config_w_noah_pet_cfe.json +++ b/data/example_bmi_multi_realization_config_w_noah_pet_cfe.json @@ -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, @@ -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, @@ -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, diff --git a/data/example_bmi_multi_realization_config_w_noah_pet_cfe__linux.json b/data/example_bmi_multi_realization_config_w_noah_pet_cfe__linux.json deleted file mode 100644 index 05c9cd9cbb..0000000000 --- a/data/example_bmi_multi_realization_config_w_noah_pet_cfe__linux.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "global": { - "formulations": [ - { - "name": "bmi_multi", - "params": { - "model_type_name": "bmi_multi_noahowp_cfe", - "forcing_file": "", - "init_config": "", - "allow_exceed_end_time": true, - "main_output_variable": "Q_OUT", - "modules": [ - { - "name": "bmi_fortran", - "params": { - "model_type_name": "bmi_fortran_noahowp", - "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi.so", - "forcing_file": "", - "init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input", - "allow_exceed_end_time": true, - "main_output_variable": "QINSUR", - "variables_names_map": { - "PRCPNONC": "atmosphere_water__liquid_equivalent_precipitation_rate", - "Q2": "atmosphere_air_water~vapor__relative_saturation", - "SFCTMP": "land_surface_air__temperature", - "UU": "land_surface_wind__x_component_of_velocity", - "VV": "land_surface_wind__y_component_of_velocity", - "LWDN": "land_surface_radiation~incoming~longwave__energy_flux", - "SOLDN": "land_surface_radiation~incoming~shortwave__energy_flux", - "SFCPRS": "land_surface_air__pressure" - }, - "uses_forcing_file": false - } - }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi.so", - "forcing_file": "", - "init_config": "./data/bmi/c/pet/{{id}}_bmi_config.ini", - "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", - "registration_function": "register_bmi_pet", - "variables_names_map": { - "water_potential_evaporation_flux": "potential_evapotranspiration" - }, - "uses_forcing_file": false - } - }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_cfe", - "library_file": "./extern/cfe/cmake_build/libcfebmi.so", - "forcing_file": "", - "init_config": "./data/bmi/c/cfe/{{id}}_bmi_config.ini", - "allow_exceed_end_time": true, - "main_output_variable": "Q_OUT", - "registration_function": "register_bmi_cfe", - "variables_names_map": { - "water_potential_evaporation_flux": "potential_evapotranspiration", - "atmosphere_air_water~vapor__relative_saturation": "SPFH_2maboveground", - "land_surface_air__temperature": "TMP_2maboveground", - "land_surface_wind__x_component_of_velocity": "UGRD_10maboveground", - "land_surface_wind__y_component_of_velocity": "VGRD_10maboveground", - "land_surface_radiation~incoming~longwave__energy_flux": "DLWRF_surface", - "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", - "land_surface_air__pressure": "PRES_surface" - }, - "uses_forcing_file": false - } - } - ], - "uses_forcing_file": false - } - } - ], - "forcing": { - "file_pattern": ".*{{id}}.*..csv", - "path": "./data/forcing/", - "provider": "CsvPerFeature" - } - }, - "time": { - "start_time": "2015-12-01 00:00:00", - "end_time": "2015-12-30 23:00:00", - "output_interval": 3600 - } -} diff --git a/data/example_bmi_multi_realization_config_w_noah_pet_cfe__macos.json b/data/example_bmi_multi_realization_config_w_noah_pet_cfe__macos.json deleted file mode 100644 index 79cf530b94..0000000000 --- a/data/example_bmi_multi_realization_config_w_noah_pet_cfe__macos.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "global": { - "formulations": [ - { - "name": "bmi_multi", - "params": { - "model_type_name": "bmi_multi_noahowp_cfe", - "forcing_file": "", - "init_config": "", - "allow_exceed_end_time": true, - "main_output_variable": "Q_OUT", - "modules": [ - { - "name": "bmi_fortran", - "params": { - "model_type_name": "bmi_fortran_noahowp", - "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi.dylib", - "forcing_file": "", - "init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input", - "allow_exceed_end_time": true, - "main_output_variable": "QINSUR", - "variables_names_map": { - "PRCPNONC": "atmosphere_water__liquid_equivalent_precipitation_rate", - "Q2": "atmosphere_air_water~vapor__relative_saturation", - "SFCTMP": "land_surface_air__temperature", - "UU": "land_surface_wind__x_component_of_velocity", - "VV": "land_surface_wind__y_component_of_velocity", - "LWDN": "land_surface_radiation~incoming~longwave__energy_flux", - "SOLDN": "land_surface_radiation~incoming~shortwave__energy_flux", - "SFCPRS": "land_surface_air__pressure" - }, - "uses_forcing_file": false - } - }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi.dylib", - "forcing_file": "", - "init_config": "./data/bmi/c/pet/{{id}}_bmi_config.ini", - "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", - "registration_function": "register_bmi_pet", - "variables_names_map": { - "water_potential_evaporation_flux": "potential_evapotranspiration" - }, - "uses_forcing_file": false - } - }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_cfe", - "library_file": "./extern/cfe/cmake_build/libcfebmi.dylib", - "forcing_file": "", - "init_config": "./data/bmi/c/cfe/{{id}}_bmi_config.ini", - "allow_exceed_end_time": true, - "main_output_variable": "Q_OUT", - "registration_function": "register_bmi_cfe", - "variables_names_map": { - "water_potential_evaporation_flux": "potential_evapotranspiration", - "atmosphere_air_water~vapor__relative_saturation": "SPFH_2maboveground", - "land_surface_air__temperature": "TMP_2maboveground", - "land_surface_wind__x_component_of_velocity": "UGRD_10maboveground", - "land_surface_wind__y_component_of_velocity": "VGRD_10maboveground", - "land_surface_radiation~incoming~longwave__energy_flux": "DLWRF_surface", - "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", - "land_surface_air__pressure": "PRES_surface" - }, - "uses_forcing_file": false - } - } - ], - "uses_forcing_file": false - } - } - ], - "forcing": { - "file_pattern": ".*{{id}}.*..csv", - "path": "./data/forcing/", - "provider": "CsvPerFeature" - } - }, - "time": { - "start_time": "2015-12-01 00:00:00", - "end_time": "2015-12-30 23:00:00", - "output_interval": 3600 - } -}