From 2d61b86a3d7010be93af0d67f4d01fa6d0993029 Mon Sep 17 00:00:00 2001 From: AhmadJan-NOAA Date: Thu, 11 Jan 2024 14:22:46 -0500 Subject: [PATCH] Cleanup_after_CI_PR (#9) * updated yaml and removed some realization files. * modified instructions to copy files for topmodel ngen run. --- .github/workflows/ngen_integration.yaml | 4 +- INSTALL.md | 1 + configs/realization_config_smp_ngenCI.json | 73 ------------ ...ealization_config_smp_topmodel_ngenCI.json | 109 ------------------ realizations/realization_config_smp.json | 2 +- .../realization_config_smp_topmodel.json | 6 +- 6 files changed, 7 insertions(+), 188 deletions(-) delete mode 100644 configs/realization_config_smp_ngenCI.json delete mode 100644 configs/realization_config_smp_topmodel_ngenCI.json diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index 2a4f9b2..85184dc 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -91,11 +91,11 @@ jobs: - name: Run Ngen Test for SMP run: | mv ${{ steps.ngen_id1.outputs.build-dir }} ./ngen-build/ - inputfile='extern/SoilMoistureProfiles/SoilMoistureProfiles/configs/realization_config_smp_ngenCI.json' + inputfile='extern/SoilMoistureProfiles/SoilMoistureProfiles/realizations/realization_config_smp.json' ./ngen-build/ngen ./data/catchment_data.geojson "cat-27" ./data/nexus_data.geojson "nex-26" $inputfile - name: Run Ngen Test with Topmodel run: | cp extern/topmodel/topmodel/data/*.dat data - inputfile='extern/SoilMoistureProfiles/SoilMoistureProfiles/configs/realization_config_smp_topmodel_ngenCI.json' + inputfile='extern/SoilMoistureProfiles/SoilMoistureProfiles/realizations/realization_config_smp_topmodel.json' ./ngen-build/ngen ./data/catchment_data.geojson "cat-27" ./data/nexus_data.geojson "nex-26" $inputfile diff --git a/INSTALL.md b/INSTALL.md index 38b3793..ced76db 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -41,6 +41,7 @@ mkdir smp && cd smp (in the nextgen directory) ln -s ../extern ln -s ../data ln -s extern/SoilMoistureProfiles/SoilMoistureProfiles/realizations +cp extern/topmodel/topmodel/data/* data ``` ### Run - Standalone example diff --git a/configs/realization_config_smp_ngenCI.json b/configs/realization_config_smp_ngenCI.json deleted file mode 100644 index bce2dc9..0000000 --- a/configs/realization_config_smp_ngenCI.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "time": { - "start_time": "2015-12-01 00:00:00", - "end_time": "2015-12-01 03:00:00", - "output_interval": 3600 - }, - "catchments": { - "cat-27": { - "formulations": [ - { - "name": "bmi_multi", - "params": { - "model_type_name": "bmi_multi_sloth_smp", - "forcing_file": "", - "init_config": "", - "allow_exceed_end_time": true, - "main_output_variable": "soil_storage", - "output_variables" : [ - "soil_water_table" - ], - "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_SOIL_STORAGE(1,double,m,node)": 0.8, - "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "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, - "Qb_topmodel(1,double,1,node)": 0.0, - "Qv_topmodel(1,double,1,node)": 0.0, - "global_deficit(1,double,1,node)": 0.0 - } - } - }, - { - "name": "bmi_c++", - "params": { - "model_type_name": "bmi_smp", - "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", - "init_config": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/configs/config_conceptual.txt", - "allow_exceed_end_time": true, - "main_output_variable": "soil_storage", - "variables_names_map" : { - "soil_storage" : "sloth_SOIL_STORAGE", - "soil_storage_change" : "sloth_SOIL_STORAGE_CHANGE" - }, - "output_variables" : [ - "soil_storage", - "soil_water_table" - ], - "uses_forcing_file": false - } - } - ], - "uses_forcing_file": false - } - } - ], - "forcing": { - "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv", - "provider": "CsvPerFeature" - } - } - } -} diff --git a/configs/realization_config_smp_topmodel_ngenCI.json b/configs/realization_config_smp_topmodel_ngenCI.json deleted file mode 100644 index adc26f8..0000000 --- a/configs/realization_config_smp_topmodel_ngenCI.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "time": { - "start_time": "2015-12-01 00:00:00", - "end_time": "2015-12-01 03:00:00", - "output_interval": 3600 - }, - "catchments": { - "cat-27": { - "formulations": [ - { - "name": "bmi_multi", - "params": { - "model_type_name": "bmi_multi_sloth_smp", - "forcing_file": "", - "init_config": "", - "allow_exceed_end_time": true, - "main_output_variable": "soil_storage", - "output_variables" : [ - "soil_water_table" - ], - "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_SOIL_STORAGE(1,double,m,node)": 0.8, - "sloth_SOIL_STORAGE_CHANGE(1,double,m,node)": -0.000472, - "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 - } - } - }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", - "forcing_file": "", - "init_config": "./extern/cfe/cfe/configs/cat_87_bmi_config_pet_pass.txt", - "allow_exceed_end_time": true, - "main_output_variable": "water_potential_evaporation_flux", - "registration_function":"register_bmi_pet", - "uses_forcing_file": false - } - }, - { - "name": "bmi_c", - "params": { - "model_type_name": "bmi_c_topmodel", - "library_file": "./extern/topmodel/cmake_build/libtopmodelbmi", - "init_config": "./extern/topmodel/topmodel/data/topmod.run", - "allow_exceed_end_time": true, - "main_output_variable": "Qout", - "registration_function": "register_bmi_topmodel", - "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" - }, - "uses_forcing_file": false - } - }, - { - "name": "bmi_c++", - "params": { - "model_type_name": "bmi_smp", - "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", - "init_config": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/configs/config_topmodel.txt", - "allow_exceed_end_time": true, - "main_output_variable": "soil_storage", - "variables_names_map" : { - "soil_storage" : "sloth_SOIL_STORAGE", - "soil_storage_change" : "sloth_SOIL_STORAGE_CHANGE", - "Qb_topmodel" : "land_surface_water__baseflow_volume_flux", - "Qv_topmodel" : "soil_water_root-zone_unsat-zone_top__recharge_volume_flux", - "global_deficit" : "soil_water__domain_volume_deficit" - }, - "output_variables" : [ - "soil_storage", - "soil_water_table" - ], - "uses_forcing_file": false - } - } - ], - "uses_forcing_file": false - } - } - ], - "forcing": { - "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv", - "provider": "CsvPerFeature" - } - } - } -} diff --git a/realizations/realization_config_smp.json b/realizations/realization_config_smp.json index 0e67a07..bce2dc9 100644 --- a/realizations/realization_config_smp.json +++ b/realizations/realization_config_smp.json @@ -44,7 +44,7 @@ "name": "bmi_c++", "params": { "model_type_name": "bmi_smp", - "library_file": "./extern/SoilMoistureProfiles/cmake_build/libsmpbmi", + "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", "init_config": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/configs/config_conceptual.txt", "allow_exceed_end_time": true, "main_output_variable": "soil_storage", diff --git a/realizations/realization_config_smp_topmodel.json b/realizations/realization_config_smp_topmodel.json index 7d51c2c..57febaf 100644 --- a/realizations/realization_config_smp_topmodel.json +++ b/realizations/realization_config_smp_topmodel.json @@ -41,7 +41,7 @@ "name": "bmi_c", "params": { "model_type_name": "bmi_c_pet", - "library_file": "./extern/evapotranspiration/cmake_build/libpetbmi", + "library_file": "./extern/evapotranspiration/evapotranspiration/cmake_build/libpetbmi", "forcing_file": "", "init_config": "./extern/cfe/cfe/configs/cat_87_bmi_config_pet_pass.txt", "allow_exceed_end_time": true, @@ -55,7 +55,7 @@ "params": { "model_type_name": "bmi_c_topmodel", "library_file": "./extern/topmodel/cmake_build/libtopmodelbmi", - "init_config": "./data/topmod.run", + "init_config": "./extern/topmodel/topmodel/data/topmod.run", "allow_exceed_end_time": true, "main_output_variable": "Qout", "registration_function": "register_bmi_topmodel", @@ -77,7 +77,7 @@ "name": "bmi_c++", "params": { "model_type_name": "bmi_smp", - "library_file": "./extern/SoilMoistureProfiles/cmake_build/libsmpbmi", + "library_file": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/cmake_build/libsmpbmi", "init_config": "./extern/SoilMoistureProfiles/SoilMoistureProfiles/configs/config_topmodel.txt", "allow_exceed_end_time": true, "main_output_variable": "soil_storage",