From 8fc061eb8b79e954093b91ce2c1142844a0e0309 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Fri, 22 Mar 2024 20:13:43 +0000 Subject: [PATCH 01/12] Realization config with successive addition of submodules --- ...i_multi_realization_config_w_sloth_nc.json | 44 ++++++ ...lti_realization_config_w_sloth_pet_nc.json | 60 ++++++++ ...zation_config_w_sloth_pet_noah_cfe_nc.json | 108 +++++++++++++ ...ealization_config_w_sloth_pet_noah_nc.json | 82 ++++++++++ ...ization_config_w_sloth_pet_nom_smp_nc.json | 99 ++++++++++++ ...config_w_sloth_pet_nom_smp_sft_cfe_nc.json | 143 ++++++++++++++++++ ...ion_config_w_sloth_pet_nom_smp_sft_nc.json | 113 ++++++++++++++ 7 files changed, 649 insertions(+) create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_nc.json create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_nc.json create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_nc.json create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_nc.json new file mode 100644 index 0000000000..a5f15cffaa --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_nc.json @@ -0,0 +1,44 @@ +{ + "global": { + "formulations": [ + { + "name": "bmi_multi", + "params": { + "model_type_name": "bmi_multi_sloth", + "forcing_file": "", + "init_config": "", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "modules": [ + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.0 + } + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nc.json new file mode 100644 index 0000000000..d795b12be0 --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nc.json @@ -0,0 +1,60 @@ +{ + "global": { + "formulations": [ + { + "name": "bmi_multi", + "params": { + "model_type_name": "bmi_multi_sloth", + "forcing_file": "", + "init_config": "", + "allow_exceed_end_time": true, + "main_output_variable": "water_potential_evaporation_flux", + "modules": [ + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.0 + } + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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 + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json new file mode 100644 index 0000000000..a3d039a129 --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json @@ -0,0 +1,108 @@ +{ + "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": "QINSUR", + "modules": [ + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.0 + } + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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_fortran", + "params": { + "model_type_name": "bmi_fortran_noahowp", + "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", + "forcing_file": "", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", + "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_cfe", + "library_file": "./extern/cfe/cmake_build/libcfebmi", + "forcing_file": "", + "init_config": "./conus_config/CFE_{{id}}.ini", + "allow_exceed_end_time": true, + "main_output_variable": "Q_OUT", + "registration_function": "register_bmi_cfe", + "variables_names_map": { + "water_potential_evaporation_flux": "ETRAN", + "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", + "ice_fraction_schaake" : "sloth_ice_fraction_schaake", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", + "soil_moisture_profile" : "sloth_smp" + }, + "uses_forcing_file": false + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_nc.json new file mode 100644 index 0000000000..e157cc4a64 --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_nc.json @@ -0,0 +1,82 @@ +{ + "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": "QINSUR", + "modules": [ + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.0 + } + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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_fortran", + "params": { + "model_type_name": "bmi_fortran_noahowp", + "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", + "forcing_file": "", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", + "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 + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json new file mode 100644 index 0000000000..dc152c3309 --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json @@ -0,0 +1,99 @@ +{ + "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": "QINSUR", + "modules": [ + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, + "soil_thickness_layered(1,double,1,node)": 0.0, + "soil_depth_wetting_fronts(1,double,1,node)": 0.0, + "num_wetting_fronts(1,int,1,node)": 1.0, + "global_deficit(1,double,1,node)": 0.0, + "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, + "soil_moisture_layered(1,double,1,node)": 0.0 + } + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_pet.txt", + "allow_exceed_end_time": true, + "main_output_variable": "water_potential_evaporation_flux", + "registration_function":"register_bmi_pet", + "uses_forcing_file": false + } + }, + { + "name": "bmi_fortran", + "params": { + "model_type_name": "bmi_fortran_noahowp", + "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, + "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_smp", + "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_smp.txt", + "allow_exceed_end_time": true, + "main_output_variable": "soil_water_table", + "variables_names_map" : { + "soil_storage" : "sloth_SOIL_STORAGE", + "soil_storage_change" : "sloth_SOIL_STORAGE_CHANGE" + }, + "uses_forcing_file": false + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json new file mode 100644 index 0000000000..d56e77ab04 --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json @@ -0,0 +1,143 @@ +{ + "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_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, + "soil_thickness_layered(1,double,1,node)": 0.0, + "soil_depth_wetting_fronts(1,double,1,node)": 0.0, + "num_wetting_fronts(1,int,1,node)": 1.0, + "global_deficit(1,double,1,node)": 0.0, + "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, + "soil_moisture_layered(1,double,1,node)": 0.0, + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.0 + } + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_pet.txt", + "allow_exceed_end_time": true, + "main_output_variable": "water_potential_evaporation_flux", + "registration_function":"register_bmi_pet", + "uses_forcing_file": false + } + }, + { + "name": "bmi_fortran", + "params": { + "model_type_name": "bmi_fortran_noahowp", + "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, + "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_smp", + "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_smp.txt", + "allow_exceed_end_time": true, + "main_output_variable": "soil_water_table", + "variables_names_map" : { + "soil_storage" : "SOIL_STORAGE", + "soil_storage_change" : "SOIL_STORAGE_CHANGE" + }, + "uses_forcing_file": false + } + }, + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_sft", + "library_file": "./extern/SoilFreezeThaw/SoilFreezeThaw/cmake_build/libsftbmi", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_sft.txt", + "allow_exceed_end_time": true, + "main_output_variable": "num_cells", + "variables_names_map" : { + "ground_temperature" : "TGS" + }, + "uses_forcing_file": false + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_cfe", + "library_file": "./extern/cfe/cmake_build/libcfebmi", + "forcing_file": "", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_cfe.txt", + "allow_exceed_end_time": true, + "main_output_variable": "Q_OUT", + "registration_function": "register_bmi_cfe", + "variables_names_map": { + "water_potential_evaporation_flux" : "water_potential_evaporation_flux", + "atmosphere_water__liquid_equivalent_precipitation_rate" : "APCP_surface", + "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", + "ice_fraction_schaake" : "sloth_ice_fraction_schaake", + "ice_fraction_xinan" : "sloth_ice_fraction_xinan", + "soil_moisture_profile" : "sloth_smp" + }, + "uses_forcing_file": false + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json new file mode 100644 index 0000000000..71b700744c --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json @@ -0,0 +1,113 @@ +{ + "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": "QINSUR", + "modules": [ + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, + "soil_thickness_layered(1,double,1,node)": 0.0, + "soil_depth_wetting_fronts(1,double,1,node)": 0.0, + "num_wetting_fronts(1,int,1,node)": 1.0, + "global_deficit(1,double,1,node)": 0.0, + "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, + "soil_moisture_layered(1,double,1,node)": 0.0 + } + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_pet.txt", + "allow_exceed_end_time": true, + "main_output_variable": "water_potential_evaporation_flux", + "registration_function":"register_bmi_pet", + "uses_forcing_file": false + } + }, + { + "name": "bmi_fortran", + "params": { + "model_type_name": "bmi_fortran_noahowp", + "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, + "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_smp", + "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_smp.txt", + "allow_exceed_end_time": true, + "main_output_variable": "soil_water_table", + "variables_names_map" : { + "soil_storage" : "sloth_SOIL_STORAGE", + "soil_storage_change" : "sloth_SOIL_STORAGE_CHANGE" + }, + "uses_forcing_file": false + } + }, + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_sft", + "library_file": "./extern/SoilFreezeThaw/SoilFreezeThaw/cmake_build/libsftbmi", + "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_sft.txt", + "allow_exceed_end_time": true, + "main_output_variable": "num_cells", + "variables_names_map" : { + "ground_temperature" : "TGS" + }, + "uses_forcing_file": false + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} From c31605971143c3e50dc59bb546ce9219bffd0e6d Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Fri, 29 Mar 2024 17:03:29 +0000 Subject: [PATCH 02/12] Update some realization config files --- ...realization_config_w_sloth_pet_cfe_nc.json | 86 +++++++++++++++++++ ...ization_config_w_sloth_pet_nom_smp_nc.json | 8 +- ...config_w_sloth_pet_nom_smp_sft_cfe_nc.json | 12 +-- ...ion_config_w_sloth_pet_nom_smp_sft_nc.json | 10 ++- 4 files changed, 104 insertions(+), 12 deletions(-) create mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json new file mode 100644 index 0000000000..531e97d948 --- /dev/null +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json @@ -0,0 +1,86 @@ +{ + "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_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel.so", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.0 + } + } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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": "./conus_config/CFE_{{id}}.ini", + "allow_exceed_end_time": true, + "main_output_variable": "Q_OUT", + "registration_function": "register_bmi_cfe", + "variables_names_map": { + "atmosphere_water__liquid_equivalent_precipitation_rate": "precip_rate", + "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", + "ice_fraction_schaake" : "sloth_ice_fraction_schaake", + "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", + "soil_moisture_profile" : "sloth_smp" + }, + "uses_forcing_file": false + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + } +} diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json index dc152c3309..b771b1c505 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json @@ -24,6 +24,8 @@ "soil_thickness_layered(1,double,1,node)": 0.0, "soil_depth_wetting_fronts(1,double,1,node)": 0.0, "num_wetting_fronts(1,int,1,node)": 1.0, + "Qb_topmodel(1,double,1,node)": 0.0, + "Qv_topmodel(1,double,1,node)": 0.0, "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, @@ -37,7 +39,7 @@ "model_type_name": "bmi_c_pet", "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", "forcing_file": "", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_pet.txt", + "init_config": "./conus_config/PET_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "water_potential_evaporation_flux", "registration_function":"register_bmi_pet", @@ -50,7 +52,7 @@ "model_type_name": "bmi_fortran_noahowp", "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", "forcing_file": "", - "init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", "allow_exceed_end_time": true, "main_output_variable": "QINSUR", "variables_names_map": { @@ -71,7 +73,7 @@ "params": { "model_type_name": "bmi_smp", "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_smp.txt", + "init_config": "./conus_smp_configs/SoilMoistureProfile_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "soil_water_table", "variables_names_map" : { diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json index d56e77ab04..9de28ad8a7 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json @@ -24,6 +24,8 @@ "soil_thickness_layered(1,double,1,node)": 0.0, "soil_depth_wetting_fronts(1,double,1,node)": 0.0, "num_wetting_fronts(1,int,1,node)": 1.0, + "Qb_topmodel(1,double,1,node)": 0.0, + "Qv_topmodel(1,double,1,node)": 0.0, "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, @@ -40,7 +42,7 @@ "model_type_name": "bmi_c_pet", "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", "forcing_file": "", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_pet.txt", + "init_config": "./conus_config/PET_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "water_potential_evaporation_flux", "registration_function":"register_bmi_pet", @@ -53,7 +55,7 @@ "model_type_name": "bmi_fortran_noahowp", "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", "forcing_file": "", - "init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", "allow_exceed_end_time": true, "main_output_variable": "QINSUR", "variables_names_map": { @@ -74,7 +76,7 @@ "params": { "model_type_name": "bmi_smp", "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_smp.txt", + "init_config": "./conus_smp_configs/SoilMoistureProfile_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "soil_water_table", "variables_names_map" : { @@ -89,7 +91,7 @@ "params": { "model_type_name": "bmi_sft", "library_file": "./extern/SoilFreezeThaw/SoilFreezeThaw/cmake_build/libsftbmi", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_sft.txt", + "init_config": "./conus_sft_configs/SoilFreezeThaw_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "num_cells", "variables_names_map" : { @@ -104,7 +106,7 @@ "model_type_name": "bmi_c_cfe", "library_file": "./extern/cfe/cmake_build/libcfebmi", "forcing_file": "", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_cfe.txt", + "init_config": "./conus_config/CFE_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "Q_OUT", "registration_function": "register_bmi_cfe", diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json index 71b700744c..da65734b78 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json +++ b/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json @@ -24,6 +24,8 @@ "soil_thickness_layered(1,double,1,node)": 0.0, "soil_depth_wetting_fronts(1,double,1,node)": 0.0, "num_wetting_fronts(1,int,1,node)": 1.0, + "Qb_topmodel(1,double,1,node)": 0.0, + "Qv_topmodel(1,double,1,node)": 0.0, "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, @@ -37,7 +39,7 @@ "model_type_name": "bmi_c_pet", "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", "forcing_file": "", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_pet.txt", + "init_config": "./conus_config/PET_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "water_potential_evaporation_flux", "registration_function":"register_bmi_pet", @@ -50,7 +52,7 @@ "model_type_name": "bmi_fortran_noahowp", "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", "forcing_file": "", - "init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", "allow_exceed_end_time": true, "main_output_variable": "QINSUR", "variables_names_map": { @@ -71,7 +73,7 @@ "params": { "model_type_name": "bmi_smp", "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_smp.txt", + "init_config": "./conus_smp_configs/SoilMoistureProfile_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "soil_water_table", "variables_names_map" : { @@ -86,7 +88,7 @@ "params": { "model_type_name": "bmi_sft", "library_file": "./extern/SoilFreezeThaw/SoilFreezeThaw/cmake_build/libsftbmi", - "init_config": "./extern/SoilFreezeThaw/SoilFreezeThaw/configs/extern/laramie_config_sft.txt", + "init_config": "./conus_sft_configs/SoilFreezeThaw_{{id}}.ini", "allow_exceed_end_time": true, "main_output_variable": "num_cells", "variables_names_map" : { From 00f4282d71d057d5c4dbcaac9d0f2538506251c8 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Mon, 8 Apr 2024 19:16:06 +0000 Subject: [PATCH 03/12] Update and rename realization config files --- ...bmi_multi_realization_config_w_sloth.json} | 0 ...ulti_realization_config_w_sloth_noah.json} | 24 +++++---- ..._realization_config_w_sloth_noah_pet.json} | 38 +++++++------- ...lization_config_w_sloth_noah_pet_cfe.json} | 44 +++++++---------- ...lization_config_w_sloth_noah_pet_smp.json} | 38 +++++++------- ...tion_config_w_sloth_noah_pet_smp_sft.json} | 37 ++++++++------ ..._config_w_sloth_noah_pet_smp_sft_cfe.json} | 49 +++++++++---------- 7 files changed, 117 insertions(+), 113 deletions(-) rename data/baseline/{bmi_multi_realization_config_w_sloth_nc.json => conus_bmi_multi_realization_config_w_sloth.json} (100%) rename data/baseline/{bmi_multi_realization_config_w_sloth_pet_nc.json => conus_bmi_multi_realization_config_w_sloth_noah.json} (59%) rename data/baseline/{bmi_multi_realization_config_w_sloth_pet_noah_nc.json => conus_bmi_multi_realization_config_w_sloth_noah_pet.json} (93%) rename data/baseline/{bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json => conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json} (86%) rename data/baseline/{bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json => conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json} (88%) rename data/baseline/{bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json => conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json} (90%) rename data/baseline/{bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json => conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json} (85%) diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_nc.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth.json similarity index 100% rename from data/baseline/bmi_multi_realization_config_w_sloth_nc.json rename to data/baseline/conus_bmi_multi_realization_config_w_sloth.json diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nc.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json similarity index 59% rename from data/baseline/bmi_multi_realization_config_w_sloth_pet_nc.json rename to data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json index d795b12be0..5845a1af37 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nc.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json @@ -4,11 +4,11 @@ { "name": "bmi_multi", "params": { - "model_type_name": "bmi_multi_sloth", + "model_type_name": "bmi_multi_noahowp", "forcing_file": "", "init_config": "", "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", + "main_output_variable": "QINSUR", "modules": [ { "name": "bmi_c++", @@ -27,17 +27,23 @@ } }, { - "name": "bmi_c", + "name": "bmi_fortran", "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "model_type_name": "bmi_fortran_noahowp", + "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", "forcing_file": "", - "init_config": "./conus_config/PET_{{id}}.ini", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", - "registration_function": "register_bmi_pet", + "main_output_variable": "QINSUR", "variables_names_map": { - "water_potential_evaporation_flux": "potential_evapotranspiration" + "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 } diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_nc.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json similarity index 93% rename from data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_nc.json rename to data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json index e157cc4a64..6e3b8acce8 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_nc.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json @@ -4,11 +4,11 @@ { "name": "bmi_multi", "params": { - "model_type_name": "bmi_multi_noahowp_cfe", + "model_type_name": "bmi_multi_noahowp_pet", "forcing_file": "", "init_config": "", "allow_exceed_end_time": true, - "main_output_variable": "QINSUR", + "main_output_variable": "water_potential_evaporation_flux", "modules": [ { "name": "bmi_c++", @@ -26,29 +26,13 @@ } } }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", - "forcing_file": "", - "init_config": "./conus_config/PET_{{id}}.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_fortran", "params": { "model_type_name": "bmi_fortran_noahowp", "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", "forcing_file": "", - "init_config": "./conus_config/NoahOWP_{{id}}.namelist", + "init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input", "allow_exceed_end_time": true, "main_output_variable": "QINSUR", "variables_names_map": { @@ -63,6 +47,22 @@ }, "uses_forcing_file": false } + }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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 + } } ], "uses_forcing_file": false diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json similarity index 86% rename from data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json rename to data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json index a3d039a129..7444170a9c 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_noah_cfe_nc.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json @@ -8,7 +8,7 @@ "forcing_file": "", "init_config": "", "allow_exceed_end_time": true, - "main_output_variable": "QINSUR", + "main_output_variable": "Q_OUT", "modules": [ { "name": "bmi_c++", @@ -26,22 +26,6 @@ } } }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", - "forcing_file": "", - "init_config": "./conus_config/PET_{{id}}.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_fortran", "params": { @@ -64,6 +48,22 @@ "uses_forcing_file": false } }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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": { @@ -75,14 +75,8 @@ "main_output_variable": "Q_OUT", "registration_function": "register_bmi_cfe", "variables_names_map": { - "water_potential_evaporation_flux": "ETRAN", - "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", + "water_potential_evaporation_flux": "EVAPOTRANS", + "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", "soil_moisture_profile" : "sloth_smp" diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json similarity index 88% rename from data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json rename to data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json index b771b1c505..5dbb82d076 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_nc.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json @@ -4,11 +4,11 @@ { "name": "bmi_multi", "params": { - "model_type_name": "bmi_multi_noahowp_cfe", + "model_type_name": "bmi_multi_noahowp_smp", "forcing_file": "", "init_config": "", "allow_exceed_end_time": true, - "main_output_variable": "QINSUR", + "main_output_variable": "soil_water_table", "modules": [ { "name": "bmi_c++", @@ -21,7 +21,6 @@ "uses_forcing_file": false, "model_params": { "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, - "soil_thickness_layered(1,double,1,node)": 0.0, "soil_depth_wetting_fronts(1,double,1,node)": 0.0, "num_wetting_fronts(1,int,1,node)": 1.0, "Qb_topmodel(1,double,1,node)": 0.0, @@ -29,23 +28,12 @@ "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "soil_moisture_layered(1,double,1,node)": 0.0 + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.1 } } }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", - "forcing_file": "", - "init_config": "./conus_config/PET_{{id}}.ini", - "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", - "registration_function":"register_bmi_pet", - "uses_forcing_file": false - } - }, { "name": "bmi_fortran", "params": { @@ -68,6 +56,22 @@ "uses_forcing_file": false } }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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": { diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json similarity index 90% rename from data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json rename to data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json index da65734b78..e3bae20cee 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_nc.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json @@ -4,11 +4,11 @@ { "name": "bmi_multi", "params": { - "model_type_name": "bmi_multi_noahowp_cfe", + "model_type_name": "bmi_multi_noahowp_sft", "forcing_file": "", "init_config": "", "allow_exceed_end_time": true, - "main_output_variable": "QINSUR", + "main_output_variable": "num_cells", "modules": [ { "name": "bmi_c++", @@ -29,23 +29,12 @@ "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "soil_moisture_layered(1,double,1,node)": 0.0 + "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, + "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, + "sloth_smp(1,double,1,node)": 0.1 } } }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", - "forcing_file": "", - "init_config": "./conus_config/PET_{{id}}.ini", - "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", - "registration_function":"register_bmi_pet", - "uses_forcing_file": false - } - }, { "name": "bmi_fortran", "params": { @@ -68,6 +57,22 @@ "uses_forcing_file": false } }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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": { diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json similarity index 85% rename from data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json rename to data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json index 9de28ad8a7..f77aa6ad45 100644 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_nom_smp_sft_cfe_nc.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json @@ -29,26 +29,12 @@ "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "soil_moisture_layered(1,double,1,node)": 0.0, "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, - "sloth_smp(1,double,1,node)": 0.0 + "sloth_smp(1,double,1,node)": 0.1 } } }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", - "forcing_file": "", - "init_config": "./conus_config/PET_{{id}}.ini", - "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", - "registration_function":"register_bmi_pet", - "uses_forcing_file": false - } - }, { "name": "bmi_fortran", "params": { @@ -71,6 +57,22 @@ "uses_forcing_file": false } }, + { + "name": "bmi_c", + "params": { + "model_type_name": "bmi_c_pet", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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": { @@ -80,8 +82,8 @@ "allow_exceed_end_time": true, "main_output_variable": "soil_water_table", "variables_names_map" : { - "soil_storage" : "SOIL_STORAGE", - "soil_storage_change" : "SOIL_STORAGE_CHANGE" + "soil_storage" : "sloth_SOIL_STORAGE", + "soil_storage_change" : "sloth_SOIL_STORAGE_CHANGE" }, "uses_forcing_file": false } @@ -111,17 +113,10 @@ "main_output_variable": "Q_OUT", "registration_function": "register_bmi_cfe", "variables_names_map": { - "water_potential_evaporation_flux" : "water_potential_evaporation_flux", - "atmosphere_water__liquid_equivalent_precipitation_rate" : "APCP_surface", - "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", + "water_potential_evaporation_flux": "EVAPOTRANS", + "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR", "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 From 3f3a0b4cc0bc83135518575d75c8d0e9f3bc4d42 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Mon, 8 Apr 2024 21:32:33 +0000 Subject: [PATCH 04/12] Minor revision --- ...conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json | 2 +- ...i_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json index 7444170a9c..a1cc63e8c8 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json @@ -75,7 +75,7 @@ "main_output_variable": "Q_OUT", "registration_function": "register_bmi_cfe", "variables_names_map": { - "water_potential_evaporation_flux": "EVAPOTRANS", + "water_potential_evaporation_flux": "potential_evapotranspiration", "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json index f77aa6ad45..eafa48aab8 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json @@ -113,7 +113,7 @@ "main_output_variable": "Q_OUT", "registration_function": "register_bmi_cfe", "variables_names_map": { - "water_potential_evaporation_flux": "EVAPOTRANS", + "water_potential_evaporation_flux": "potential_evapotranspiration", "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR", "ice_fraction_schaake" : "sloth_ice_fraction_schaake", "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", From e56fe588f05bc4d774e93be2e20340cf9e105114 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Tue, 16 Apr 2024 15:16:38 +0000 Subject: [PATCH 05/12] Standardize the path of forcing file --- data/baseline/conus_bmi_multi_realization_config_w_sloth.json | 2 +- .../conus_bmi_multi_realization_config_w_sloth_noah.json | 2 +- .../conus_bmi_multi_realization_config_w_sloth_noah_pet.json | 2 +- ...conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json | 2 +- ...conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json | 2 +- ...s_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json | 2 +- ...i_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth.json index a5f15cffaa..bbcc616d1f 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth.json @@ -32,7 +32,7 @@ } ], "forcing": { - "path": "./NextGen_forcing_2016010100.nc", + "path": "./forcing/NextGen_forcing_2016010100.nc", "provider": "NetCDF" } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json index 5845a1af37..85a0474def 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json @@ -54,7 +54,7 @@ } ], "forcing": { - "path": "./NextGen_forcing_2016010100.nc", + "path": "./forcing/NextGen_forcing_2016010100.nc", "provider": "NetCDF" } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json index 6e3b8acce8..c536c45a15 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json @@ -70,7 +70,7 @@ } ], "forcing": { - "path": "./NextGen_forcing_2016010100.nc", + "path": "./forcing/NextGen_forcing_2016010100.nc", "provider": "NetCDF" } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json index a1cc63e8c8..34d0f5b87d 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json @@ -90,7 +90,7 @@ } ], "forcing": { - "path": "./NextGen_forcing_2016010100.nc", + "path": "./forcing/NextGen_forcing_2016010100.nc", "provider": "NetCDF" } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json index 5dbb82d076..5db51a0ce8 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json @@ -93,7 +93,7 @@ } ], "forcing": { - "path": "./NextGen_forcing_2016010100.nc", + "path": "./forcing/NextGen_forcing_2016010100.nc", "provider": "NetCDF" } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json index e3bae20cee..c0df198cc7 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json @@ -108,7 +108,7 @@ } ], "forcing": { - "path": "./NextGen_forcing_2016010100.nc", + "path": "./forcing/NextGen_forcing_2016010100.nc", "provider": "NetCDF" } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json index eafa48aab8..c3c9d62796 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json @@ -128,7 +128,7 @@ } ], "forcing": { - "path": "./NextGen_forcing_2016010100.nc", + "path": "./forcing/NextGen_forcing_2016010100.nc", "provider": "NetCDF" } }, From 792fbefcd1c0042c151f3e382c2a8ab48a753945 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Mon, 22 Apr 2024 14:00:26 +0000 Subject: [PATCH 06/12] Specifying output directory in realization config file --- data/baseline/conus_bmi_multi_realization_config_w_sloth.json | 3 ++- .../conus_bmi_multi_realization_config_w_sloth_noah.json | 3 ++- .../conus_bmi_multi_realization_config_w_sloth_noah_pet.json | 3 ++- ...onus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json | 3 ++- ...onus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json | 3 ++- ..._bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json | 3 ++- ..._multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth.json index bbcc616d1f..cb6487f850 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth.json @@ -40,5 +40,6 @@ "start_time": "2016-01-01 00:00:00", "end_time": "2016-01-10 23:00:00", "output_interval": 3600 - } + }, + "output_root": "./output_dir/" } diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json index 85a0474def..aa3d7ecc01 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json @@ -62,5 +62,6 @@ "start_time": "2016-01-01 00:00:00", "end_time": "2016-01-10 23:00:00", "output_interval": 3600 - } + }, + "output_root": "./output_dir/" } diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json index c536c45a15..e14135c43b 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json @@ -78,5 +78,6 @@ "start_time": "2016-01-01 00:00:00", "end_time": "2016-01-10 23:00:00", "output_interval": 3600 - } + }, + "output_root": "./output_dir/" } diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json index 34d0f5b87d..0424fa22c1 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json @@ -98,5 +98,6 @@ "start_time": "2016-01-01 00:00:00", "end_time": "2016-01-10 23:00:00", "output_interval": 3600 - } + }, + "output_root": "./output_dir/" } diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json index 5db51a0ce8..916202e35a 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json @@ -101,5 +101,6 @@ "start_time": "2016-01-01 00:00:00", "end_time": "2016-01-10 23:00:00", "output_interval": 3600 - } + }, + "output_root": "./output_dir/" } diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json index c0df198cc7..1213f1c8db 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json @@ -116,5 +116,6 @@ "start_time": "2016-01-01 00:00:00", "end_time": "2016-01-10 23:00:00", "output_interval": 3600 - } + }, + "output_root": "./output_dir/" } diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json index c3c9d62796..f9b0ce619b 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json @@ -136,5 +136,6 @@ "start_time": "2016-01-01 00:00:00", "end_time": "2016-01-10 23:00:00", "output_interval": 3600 - } + }, + "output_root": "./output_dir/" } From 8c67b6f67ca48045996ddba9d6e529a56aeb2ffe Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Mon, 6 May 2024 16:54:42 +0000 Subject: [PATCH 07/12] Correct pet init_config path error --- .../conus_bmi_multi_realization_config_w_sloth_noah_pet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json index e14135c43b..48c5de43df 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json @@ -32,7 +32,7 @@ "model_type_name": "bmi_fortran_noahowp", "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", "forcing_file": "", - "init_config": "./data/bmi/fortran/noah-owp-modular-init-{{id}}.namelist.input", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", "allow_exceed_end_time": true, "main_output_variable": "QINSUR", "variables_names_map": { From c89276c4b1132dde819482dac9c8989eea738a51 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Tue, 2 Jul 2024 20:03:22 +0000 Subject: [PATCH 08/12] Remove an unused vaariable by soil models from sloth --- ...us_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json | 1 - ...mi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json | 1 - 2 files changed, 2 deletions(-) diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json index 1213f1c8db..8fd1c9a1ce 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json @@ -21,7 +21,6 @@ "uses_forcing_file": false, "model_params": { "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, - "soil_thickness_layered(1,double,1,node)": 0.0, "soil_depth_wetting_fronts(1,double,1,node)": 0.0, "num_wetting_fronts(1,int,1,node)": 1.0, "Qb_topmodel(1,double,1,node)": 0.0, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json index f9b0ce619b..ccca39bd48 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json @@ -21,7 +21,6 @@ "uses_forcing_file": false, "model_params": { "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, - "soil_thickness_layered(1,double,1,node)": 0.0, "soil_depth_wetting_fronts(1,double,1,node)": 0.0, "num_wetting_fronts(1,int,1,node)": 1.0, "Qb_topmodel(1,double,1,node)": 0.0, From 53745576ccf279144b92d08ec5d42ab149d423d4 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Wed, 10 Jul 2024 15:15:11 +0000 Subject: [PATCH 09/12] Simplify some realization configs --- ...multi_realization_config_w_sloth_noah_pet_smp.json | 5 +---- ...i_realization_config_w_sloth_noah_pet_smp_sft.json | 5 +---- ...alization_config_w_sloth_noah_pet_smp_sft_cfe.json | 10 ++-------- ...ation_config_w_sloth_noah_pet_smp_sft_cfe_trt.json | 11 ++--------- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json index 916202e35a..5dd8bac260 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json @@ -27,10 +27,7 @@ "Qv_topmodel(1,double,1,node)": 0.0, "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, - "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, - "sloth_smp(1,double,1,node)": 0.1 + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472 } } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json index 8fd1c9a1ce..c7f3edf143 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json @@ -27,10 +27,7 @@ "Qv_topmodel(1,double,1,node)": 0.0, "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, - "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, - "sloth_smp(1,double,1,node)": 0.1 + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472 } } }, diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json index ccca39bd48..558fd9961e 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json @@ -27,10 +27,7 @@ "Qv_topmodel(1,double,1,node)": 0.0, "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, - "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, - "sloth_smp(1,double,1,node)": 0.1 + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472 } } }, @@ -113,10 +110,7 @@ "registration_function": "register_bmi_cfe", "variables_names_map": { "water_potential_evaporation_flux": "potential_evapotranspiration", - "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR", - "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", - "soil_moisture_profile" : "sloth_smp" + "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR" }, "uses_forcing_file": false } diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe_trt.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe_trt.json index 7c9abb4af8..492f82c25a 100644 --- a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe_trt.json +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe_trt.json @@ -21,17 +21,13 @@ "uses_forcing_file": false, "model_params": { "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, - "soil_thickness_layered(1,double,1,node)": 0.0, "soil_depth_wetting_fronts(1,double,1,node)": 0.0, "num_wetting_fronts(1,int,1,node)": 1.0, "Qb_topmodel(1,double,1,node)": 0.0, "Qv_topmodel(1,double,1,node)": 0.0, "global_deficit(1,double,1,node)": 0.0, "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, - "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, - "sloth_smp(1,double,1,node)": 0.1 + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472 } } }, @@ -114,10 +110,7 @@ "registration_function": "register_bmi_cfe", "variables_names_map": { "water_potential_evaporation_flux": "potential_evapotranspiration", - "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR", - "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", - "soil_moisture_profile" : "sloth_smp" + "atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR" }, "uses_forcing_file": false } From 7554d22362b8815b5cb136a454c415105895cd3c Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Thu, 1 Aug 2024 16:53:52 +0000 Subject: [PATCH 10/12] Realization with alternative module ordering --- ...n_config_w_sloth_noah_pet_cfe_smp_sft.json | 134 +++++++++++++++++ ...nfig_w_sloth_noah_pet_cfe_smp_sft_trt.json | 137 ++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100644 data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json create mode 100644 data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json new file mode 100644 index 0000000000..551f8c7a63 --- /dev/null +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json @@ -0,0 +1,134 @@ +{ + "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_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, + "soil_depth_wetting_fronts(1,double,1,node)": 0.0, + "num_wetting_fronts(1,int,1,node)": 1.0, + "Qb_topmodel(1,double,1,node)": 0.0, + "Qv_topmodel(1,double,1,node)": 0.0, + "global_deficit(1,double,1,node)": 0.0, + "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472 + } + } + }, + { + "name": "bmi_fortran", + "params": { + "model_type_name": "bmi_fortran_noahowp", + "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", + "forcing_file": "", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", + "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", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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", + "forcing_file": "", + "init_config": "./conus_config/CFE_{{id}}.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_water__liquid_equivalent_precipitation_rate": "QINSUR" + }, + "uses_forcing_file": false + } + }, + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_smp", + "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", + "init_config": "./conus_smp_configs/SoilMoistureProfile_{{id}}.ini", + "allow_exceed_end_time": true, + "main_output_variable": "soil_water_table", + "variables_names_map" : { + "soil_storage" : "sloth_SOIL_STORAGE", + "soil_storage_change" : "sloth_SOIL_STORAGE_CHANGE" + }, + "uses_forcing_file": false + } + }, + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_sft", + "library_file": "./extern/SoilFreezeThaw/SoilFreezeThaw/cmake_build/libsftbmi", + "init_config": "./conus_sft_configs/SoilFreezeThaw_{{id}}.ini", + "allow_exceed_end_time": true, + "main_output_variable": "num_cells", + "variables_names_map" : { + "ground_temperature" : "TGS" + }, + "uses_forcing_file": false + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./forcing/NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + }, + "output_root": "./output_dir/" +} diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json new file mode 100644 index 0000000000..27618ed12a --- /dev/null +++ b/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json @@ -0,0 +1,137 @@ +{ + "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_c++", + "params": { + "model_type_name": "bmi_c++_sloth", + "library_file": "./extern/sloth/cmake_build/libslothmodel", + "init_config": "/dev/null", + "allow_exceed_end_time": true, + "main_output_variable": "z", + "uses_forcing_file": false, + "model_params": { + "soil_moisture_wetting_fronts(1,double,1,node)": 0.0, + "soil_depth_wetting_fronts(1,double,1,node)": 0.0, + "num_wetting_fronts(1,int,1,node)": 1.0, + "Qb_topmodel(1,double,1,node)": 0.0, + "Qv_topmodel(1,double,1,node)": 0.0, + "global_deficit(1,double,1,node)": 0.0, + "sloth_SOIL_STORAGE(1,double,m,node)": 0.8, + "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472 + } + } + }, + { + "name": "bmi_fortran", + "params": { + "model_type_name": "bmi_fortran_noahowp", + "library_file": "./extern/noah-owp-modular/cmake_build/libsurfacebmi", + "forcing_file": "", + "init_config": "./conus_config/NoahOWP_{{id}}.namelist", + "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", + "forcing_file": "", + "init_config": "./conus_config/PET_{{id}}.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", + "forcing_file": "", + "init_config": "./conus_config/CFE_{{id}}.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_water__liquid_equivalent_precipitation_rate": "QINSUR" + }, + "uses_forcing_file": false + } + }, + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_smp", + "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", + "init_config": "./conus_smp_configs/SoilMoistureProfile_{{id}}.ini", + "allow_exceed_end_time": true, + "main_output_variable": "soil_water_table", + "variables_names_map" : { + "soil_storage" : "sloth_SOIL_STORAGE", + "soil_storage_change" : "sloth_SOIL_STORAGE_CHANGE" + }, + "uses_forcing_file": false + } + }, + { + "name": "bmi_c++", + "params": { + "model_type_name": "bmi_sft", + "library_file": "./extern/SoilFreezeThaw/SoilFreezeThaw/cmake_build/libsftbmi", + "init_config": "./conus_sft_configs/SoilFreezeThaw_{{id}}.ini", + "allow_exceed_end_time": true, + "main_output_variable": "num_cells", + "variables_names_map" : { + "ground_temperature" : "TGS" + }, + "uses_forcing_file": false + } + } + ], + "uses_forcing_file": false + } + } + ], + "forcing": { + "path": "./forcing/NextGen_forcing_2016010100.nc", + "provider": "NetCDF" + } + }, + "time": { + "start_time": "2016-01-01 00:00:00", + "end_time": "2016-01-10 23:00:00", + "output_interval": 3600 + }, + "output_root": "./output_dir/", + "routing": { + "t_route_config_file_with_path": "./data/baseline/routing_config_CONUS.yaml" + } +} From c6666ed21ebc107555d3dc805dca7bdbe4d160fd Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Mon, 23 Sep 2024 20:45:34 +0000 Subject: [PATCH 11/12] Remove one unnecessary realization config --- ...realization_config_w_sloth_pet_cfe_nc.json | 86 ------------------- 1 file changed, 86 deletions(-) delete mode 100644 data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json diff --git a/data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json b/data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json deleted file mode 100644 index 531e97d948..0000000000 --- a/data/baseline/bmi_multi_realization_config_w_sloth_pet_cfe_nc.json +++ /dev/null @@ -1,86 +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_c++", - "params": { - "model_type_name": "bmi_c++_sloth", - "library_file": "./extern/sloth/cmake_build/libslothmodel.so", - "init_config": "/dev/null", - "allow_exceed_end_time": true, - "main_output_variable": "z", - "uses_forcing_file": false, - "model_params": { - "sloth_ice_fraction_schaake(1,double,m,node)": 0.0, - "sloth_ice_fraction_xinanjiang(1,double,1,node)": 0.0, - "sloth_smp(1,double,1,node)": 0.0 - } - } - }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", - "forcing_file": "", - "init_config": "./conus_config/PET_{{id}}.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": "./conus_config/CFE_{{id}}.ini", - "allow_exceed_end_time": true, - "main_output_variable": "Q_OUT", - "registration_function": "register_bmi_cfe", - "variables_names_map": { - "atmosphere_water__liquid_equivalent_precipitation_rate": "precip_rate", - "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", - "ice_fraction_schaake" : "sloth_ice_fraction_schaake", - "ice_fraction_xinanjiang" : "sloth_ice_fraction_xinanjiang", - "soil_moisture_profile" : "sloth_smp" - }, - "uses_forcing_file": false - } - } - ], - "uses_forcing_file": false - } - } - ], - "forcing": { - "path": "./NextGen_forcing_2016010100.nc", - "provider": "NetCDF" - } - }, - "time": { - "start_time": "2016-01-01 00:00:00", - "end_time": "2016-01-10 23:00:00", - "output_interval": 3600 - } -} From 089737f38e56ee196995f2d735523916523c8ff1 Mon Sep 17 00:00:00 2001 From: Shengting Cui Date: Mon, 23 Sep 2024 21:18:13 +0000 Subject: [PATCH 12/12] Move realization config files from data/baseline to data/baseline/realizations --- .../conus_bmi_multi_realization_config_w_sloth.json | 0 .../conus_bmi_multi_realization_config_w_sloth_noah.json | 0 .../conus_bmi_multi_realization_config_w_sloth_noah_pet.json | 0 .../conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json | 0 ...bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json | 0 ...multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json | 0 .../conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json | 0 ...nus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json | 0 ...bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah_pet.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json (100%) rename data/baseline/{ => realizations}/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json (100%) diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_cfe_smp_sft_trt.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft.json diff --git a/data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json b/data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json similarity index 100% rename from data/baseline/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json rename to data/baseline/realizations/conus_bmi_multi_realization_config_w_sloth_noah_pet_smp_sft_cfe.json