diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index 4214643..37b0921 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -45,11 +45,6 @@ jobs: mkdir ${{runner.temp}}/smp mv ./* ${{runner.temp}}/smp - - name: Build CFE - uses: actions/checkout@v4 - with: - repository: noaa-owp/cfe - # Checkout and build CFE - name: Checkout the commit uses: actions/checkout@v4 @@ -116,6 +111,11 @@ jobs: run: | rm -rf extern/cfe/cfe/* mv ${{runner.temp}}/cfe/* extern/cfe/cfe + + #jlg: this is needed to atm to pull in updated configs + - name: PET (checkout master -- remove later) + run: | + git submodule update --remote extern/evapotranspiration/evapotranspiration - name: Run Ngen Test for SMP run: | diff --git a/realizations/realization_config_smp_cfe.json b/realizations/realization_config_smp_cfe.json index ef57238..cd72dd4 100644 --- a/realizations/realization_config_smp_cfe.json +++ b/realizations/realization_config_smp_cfe.json @@ -47,7 +47,7 @@ "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", + "init_config": "./extern/evapotranspiration/evapotranspiration/configs/pet_config_cat_87_pass.txt", "allow_exceed_end_time": true, "main_output_variable": "water_potential_evaporation_flux", "registration_function":"register_bmi_pet", @@ -60,7 +60,7 @@ "model_type_name": "bmi_c_cfe", "library_file": "./extern/cfe/cfe/cmake_build/libcfebmi", "forcing_file": "", - "init_config": "./extern/cfe/cfe/configs/cat_87_bmi_config_cfe_pass.txt", + "init_config": "./extern/cfe/cfe/configs/cfe_config_cat_87_pass.txt", "allow_exceed_end_time": true, "main_output_variable": "Q_OUT", "registration_function": "register_bmi_cfe", @@ -112,7 +112,7 @@ } ], "forcing": { - "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv", + "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015_ngen.csv", "provider": "CsvPerFeature" } } diff --git a/realizations/realization_config_smp_topmodel.json b/realizations/realization_config_smp_topmodel.json index 3e87f6f..307b2b1 100644 --- a/realizations/realization_config_smp_topmodel.json +++ b/realizations/realization_config_smp_topmodel.json @@ -43,7 +43,7 @@ "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", + "init_config": "./extern/evapotranspiration/evapotranspiration/configs/pet_config_cat_87_pass.txt", "allow_exceed_end_time": true, "main_output_variable": "water_potential_evaporation_flux", "registration_function":"register_bmi_pet", @@ -101,7 +101,7 @@ } ], "forcing": { - "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv", + "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015_ngen.csv", "provider": "CsvPerFeature" } }