From 3913aff0589e7fa1ad68339f5e0bb571d56c3723 Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Wed, 1 Nov 2023 12:05:28 -0400 Subject: [PATCH 1/3] update vendored cfe submodule note, with this update, extern/cfe/CMakeList.txt is now out of date and will not build all portions of cfe. --- extern/cfe/cfe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/cfe/cfe b/extern/cfe/cfe index 946a0e8b37..a85e2c1276 160000 --- a/extern/cfe/cfe +++ b/extern/cfe/cfe @@ -1 +1 @@ -Subproject commit 946a0e8b37d858c168bb4e492d113628ab61be0c +Subproject commit a85e2c1276a5cb39ebd21bca0c7f205e29aec274 From 39260427a22363ab03cacb3fe7d379a9b5e8ba4c Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Wed, 1 Nov 2023 12:53:06 -0400 Subject: [PATCH 2/3] update cfe CMake list --- extern/cfe/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extern/cfe/CMakeLists.txt b/extern/cfe/CMakeLists.txt index 8f2f375458..af4a293dbb 100644 --- a/extern/cfe/CMakeLists.txt +++ b/extern/cfe/CMakeLists.txt @@ -13,16 +13,16 @@ set(CFE_LIB_DESC_CMAKE "OWP CFE BMI Module Shared Library") add_compile_definitions(BMI_ACTIVE) if(WIN32) - add_library(cfebmi cfe/src/bmi_cfe.c cfe/src/cfe.c cfe/src/giuh.c) + add_library(cfebmi cfe/src/bmi_cfe.c cfe/src/cfe.c cfe/src/giuh.c cfe/src/conceptual_reservoir.c) else() - add_library(cfebmi SHARED cfe/src/bmi_cfe.c cfe/src/cfe.c cfe/src/giuh.c) + add_library(cfebmi SHARED cfe/src/bmi_cfe.c cfe/src/cfe.c cfe/src/giuh.c cfe/src/conceptual_reservoir.c) endif() target_include_directories(cfebmi PRIVATE cfe/include) set_target_properties(cfebmi PROPERTIES VERSION ${PROJECT_VERSION}) -set_target_properties(cfebmi PROPERTIES PUBLIC_HEADER cfe/bmi_cfe.h) +set_target_properties(cfebmi PROPERTIES PUBLIC_HEADER cfe/include/bmi_cfe.h) # Code requires minimum of C99 standard to compile set_target_properties(cfebmi PROPERTIES C_STANDARD 99 C_STANDARD_REQUIRED ON) From 0fb1ffc1d4f70cffda4259be5a6364323a2bf170 Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Thu, 11 Jan 2024 13:51:47 -0500 Subject: [PATCH 3/3] chore: update cfe cfg var ice_fraction_xinan -> ice_fraction_xinanjiang --- data/example_bmi_multi_realization_config.json | 4 ++-- data/example_bmi_multi_realization_config_w_netcdf.json | 4 ++-- data/example_bmi_multi_realization_config_w_nfp.json | 2 +- data/example_bmi_multi_realization_config_w_noah_pet_cfe.json | 4 ++-- data/example_bmi_multi_realization_config_w_routing.json | 2 +- .../example_bmi_multi_realization_config_w_routing.json | 4 ++-- data/test_bmi_multi_realization_config.json | 4 ++-- data/test_bmi_multi_realization_config_w_netcdf.json | 4 ++-- data/test_bmi_multi_realization_config_w_noah_pet_cfe.json | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/example_bmi_multi_realization_config.json b/data/example_bmi_multi_realization_config.json index 26e84563d3..9a0fcc6f6b 100644 --- a/data/example_bmi_multi_realization_config.json +++ b/data/example_bmi_multi_realization_config.json @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinan(1,double,1,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, "sloth_smp(1,double,1,node)": 0.0 } } @@ -68,7 +68,7 @@ "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", "land_surface_air__pressure": "PRES_surface", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" }, "uses_forcing_file": false diff --git a/data/example_bmi_multi_realization_config_w_netcdf.json b/data/example_bmi_multi_realization_config_w_netcdf.json index dcefc97ea4..b82c82f48f 100644 --- a/data/example_bmi_multi_realization_config_w_netcdf.json +++ b/data/example_bmi_multi_realization_config_w_netcdf.json @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinan(1,double,1,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, "sloth_smp(1,double,1,node)": 0.0 } } @@ -68,7 +68,7 @@ "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", "land_surface_air__pressure": "PRES_surface", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" }, "uses_forcing_file": false diff --git a/data/example_bmi_multi_realization_config_w_nfp.json b/data/example_bmi_multi_realization_config_w_nfp.json index 61b26f25c0..66b8cb81bf 100644 --- a/data/example_bmi_multi_realization_config_w_nfp.json +++ b/data/example_bmi_multi_realization_config_w_nfp.json @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "ice_fraction_schaake(1,double,m,node)": 0.0, - "ice_fraction_xinan(1,double,1,node)": 0.0, + "ice_fraction_xinanjiang(1,double,1,node)": 0.0, "soil_moisture_profile(1,double,1,node)": 0.0, "land_surface_air__temperature(1,double,K,node)": 285.8000183105469, "atmosphere_water__liquid_equivalent_precipitation_rate(1,double,mm/s,node)": 0.1, 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 e7c27e5c92..a7275e8cf3 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 @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinan(1,double,1,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, "sloth_smp(1,double,1,node)": 0.0 } } @@ -84,7 +84,7 @@ "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", "land_surface_air__pressure": "PRES_surface", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" }, "uses_forcing_file": false diff --git a/data/example_bmi_multi_realization_config_w_routing.json b/data/example_bmi_multi_realization_config_w_routing.json index 87d4b12870..eb8a225929 100644 --- a/data/example_bmi_multi_realization_config_w_routing.json +++ b/data/example_bmi_multi_realization_config_w_routing.json @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "ice_fraction_schaake(1,double,m,node)": 0.0, - "ice_fraction_xinan(1,double,none,node)": 0.0, + "ice_fraction_xinanjiang(1,double,none,node)": 0.0, "soil_moisture_profile(1,double,none,node)": 0.0 } } diff --git a/data/gauge_01073000/example_bmi_multi_realization_config_w_routing.json b/data/gauge_01073000/example_bmi_multi_realization_config_w_routing.json index 8566e5e60b..0ddfc92ff5 100644 --- a/data/gauge_01073000/example_bmi_multi_realization_config_w_routing.json +++ b/data/gauge_01073000/example_bmi_multi_realization_config_w_routing.json @@ -26,7 +26,7 @@ }, "model_params": { "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinan(1,double,1,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, "sloth_smp(1,double,1,node)": 0.0 } } @@ -80,7 +80,7 @@ "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR", "water_potential_evaporation_flux": "water_potential_evaporation_flux", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" }, "uses_forcing_file": false diff --git a/data/test_bmi_multi_realization_config.json b/data/test_bmi_multi_realization_config.json index 5d052a6bdf..2433fa8e68 100644 --- a/data/test_bmi_multi_realization_config.json +++ b/data/test_bmi_multi_realization_config.json @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinan(1,double,1,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, "sloth_smp(1,double,1,node)": 0.0 } } @@ -68,7 +68,7 @@ "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", "land_surface_air__pressure": "PRES_surface", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" }, "uses_forcing_file": false diff --git a/data/test_bmi_multi_realization_config_w_netcdf.json b/data/test_bmi_multi_realization_config_w_netcdf.json index 4b20bbe49c..9449fe5037 100644 --- a/data/test_bmi_multi_realization_config_w_netcdf.json +++ b/data/test_bmi_multi_realization_config_w_netcdf.json @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinan(1,double,1,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, "sloth_smp(1,double,1,node)": 0.0 } } @@ -68,7 +68,7 @@ "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", "land_surface_air__pressure": "PRES_surface", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" }, "uses_forcing_file": false diff --git a/data/test_bmi_multi_realization_config_w_noah_pet_cfe.json b/data/test_bmi_multi_realization_config_w_noah_pet_cfe.json index bfd1ffd737..27da953205 100644 --- a/data/test_bmi_multi_realization_config_w_noah_pet_cfe.json +++ b/data/test_bmi_multi_realization_config_w_noah_pet_cfe.json @@ -21,7 +21,7 @@ "uses_forcing_file": false, "model_params": { "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinan(1,double,1,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, "sloth_smp(1,double,1,node)": 0.0 } } @@ -84,7 +84,7 @@ "land_surface_radiation~incoming~shortwave__energy_flux": "DSWRF_surface", "land_surface_air__pressure": "PRES_surface", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" }, "uses_forcing_file": false