Cleanup_after_CI_PR (#9)

* updated yaml and removed some realization files. * modified instructions to copy files for topmodel ngen run.
NOAA-OWP · Jan 11, 2024 · 2d61b86 · 2d61b86
1 parent d4aacb2
commit 2d61b86
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 188 deletions.
diff --git 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
@@ -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
diff --git a/configs/realization_config_smp_topmodel_ngenCI.json b/configs/realization_config_smp_topmodel_ngenCI.json
diff --git 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
@@ -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",