From 30203e9921fc144c32c6040b37fc5b3ebdf4d76a Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:32:08 -0400 Subject: [PATCH 01/11] Update realization_config_smp_cfe.json --- realizations/realization_config_smp_cfe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/realizations/realization_config_smp_cfe.json b/realizations/realization_config_smp_cfe.json index ef57238..a97d0dd 100644 --- a/realizations/realization_config_smp_cfe.json +++ b/realizations/realization_config_smp_cfe.json @@ -112,7 +112,7 @@ } ], "forcing": { - "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv", + "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015.csv", "provider": "CsvPerFeature" } } From a87721742be2e313982725098ab4bf2f31a078c2 Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:32:45 -0400 Subject: [PATCH 02/11] Update realization_config_smp_topmodel.json --- realizations/realization_config_smp_topmodel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/realizations/realization_config_smp_topmodel.json b/realizations/realization_config_smp_topmodel.json index 3e87f6f..68c02c8 100644 --- a/realizations/realization_config_smp_topmodel.json +++ b/realizations/realization_config_smp_topmodel.json @@ -101,7 +101,7 @@ } ], "forcing": { - "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015-.csv", + "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015.csv", "provider": "CsvPerFeature" } } From 12018105e9087e9c62151e2d4da39fc88da43ee6 Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:49:48 -0400 Subject: [PATCH 03/11] Update realization_config_smp_cfe.json --- realizations/realization_config_smp_cfe.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/realizations/realization_config_smp_cfe.json b/realizations/realization_config_smp_cfe.json index a97d0dd..7abb8a0 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", From 913ceb92a326d29a0f4c78558d45066bf5ff94f8 Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Thu, 29 Aug 2024 12:36:08 -0400 Subject: [PATCH 04/11] Update ngen_integration.yaml --- .github/workflows/ngen_integration.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index 4214643..c8b4d3c 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -116,6 +116,11 @@ jobs: run: | rm -rf extern/cfe/cfe/* mv ${{runner.temp}}/cfe/* extern/cfe/cfe + + - name: Move PET Files Including cmake_build to Appropriate Directory + run: | + rm -rf extern/evapotranspiration/evapotranspiration/* + mv ${{runner.temp}}/evaportranspiration/* extern/evapotranspiration/evapotranspiration - name: Run Ngen Test for SMP run: | From 2473ccea9c74f561a30269f39803a31a7c12597d Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:25:33 -0400 Subject: [PATCH 05/11] Update ngen_integration.yaml --- .github/workflows/ngen_integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index c8b4d3c..44157bd 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -120,7 +120,7 @@ jobs: - name: Move PET Files Including cmake_build to Appropriate Directory run: | rm -rf extern/evapotranspiration/evapotranspiration/* - mv ${{runner.temp}}/evaportranspiration/* extern/evapotranspiration/evapotranspiration + mv ${{runner.temp}}/evaportranspiration/evapotranspiration/* extern/evapotranspiration/evapotranspiration - name: Run Ngen Test for SMP run: | From 86662c703990bbe56f7b772fcd860bfec02177cf Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:33:49 -0400 Subject: [PATCH 06/11] Update ngen_integration.yaml --- .github/workflows/ngen_integration.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index 44157bd..4b09388 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -88,6 +88,12 @@ jobs: with: mod-dir: "extern/evapotranspiration/evapotranspiration" targets: "petbmi" + + - name: Save PET to a Temp Directory + run: | + # Move files to a temporary directory + mkdir ${{runner.temp}}/evapotranspiration + mv ./* ${{runner.temp}}/evapotranspiration - name: Build SLoTH id: submod_build_4 @@ -120,7 +126,7 @@ jobs: - name: Move PET Files Including cmake_build to Appropriate Directory run: | rm -rf extern/evapotranspiration/evapotranspiration/* - mv ${{runner.temp}}/evaportranspiration/evapotranspiration/* extern/evapotranspiration/evapotranspiration + mv ${{runner.temp}}/evaportranspiration/* extern/evapotranspiration/evapotranspiration - name: Run Ngen Test for SMP run: | From 2fa11282303619054fb37e9fab188832ef0986f3 Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:40:57 -0400 Subject: [PATCH 07/11] Update ngen_integration.yaml --- .github/workflows/ngen_integration.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index 4b09388..f272acc 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -89,11 +89,11 @@ jobs: mod-dir: "extern/evapotranspiration/evapotranspiration" targets: "petbmi" - - name: Save PET to a Temp Directory - run: | - # Move files to a temporary directory - mkdir ${{runner.temp}}/evapotranspiration - mv ./* ${{runner.temp}}/evapotranspiration + # - name: Save PET to a Temp Directory + # run: | + # # Move files to a temporary directory + # mkdir ${{runner.temp}}/evapotranspiration + # mv ./* ${{runner.temp}}/evapotranspiration - name: Build SLoTH id: submod_build_4 @@ -123,10 +123,10 @@ jobs: rm -rf extern/cfe/cfe/* mv ${{runner.temp}}/cfe/* extern/cfe/cfe - - name: Move PET Files Including cmake_build to Appropriate Directory - run: | - rm -rf extern/evapotranspiration/evapotranspiration/* - mv ${{runner.temp}}/evaportranspiration/* extern/evapotranspiration/evapotranspiration + # - name: Move PET Files Including cmake_build to Appropriate Directory + # run: | + # rm -rf extern/evapotranspiration/evapotranspiration/* + # mv ${{runner.temp}}/evaportranspiration/* extern/evapotranspiration/evapotranspiration - name: Run Ngen Test for SMP run: | From 882e005fc589d3cf426a5f17c177a195306b89d3 Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:56:58 -0400 Subject: [PATCH 08/11] Update ngen_integration.yaml --- .github/workflows/ngen_integration.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index f272acc..521a40e 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -127,6 +127,9 @@ jobs: # run: | # rm -rf extern/evapotranspiration/evapotranspiration/* # mv ${{runner.temp}}/evaportranspiration/* extern/evapotranspiration/evapotranspiration + - name: PET (checkout master -- remove later) + run: | + git submodule update --remote extern/evapotranspiration/evapotranspiration - name: Run Ngen Test for SMP run: | From 775556af555e6ad332511c57be3a5179561dd25e Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:04:06 -0400 Subject: [PATCH 09/11] Update realization_config_smp_cfe.json --- realizations/realization_config_smp_cfe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/realizations/realization_config_smp_cfe.json b/realizations/realization_config_smp_cfe.json index 7abb8a0..cd72dd4 100644 --- a/realizations/realization_config_smp_cfe.json +++ b/realizations/realization_config_smp_cfe.json @@ -112,7 +112,7 @@ } ], "forcing": { - "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015.csv", + "path": "./extern/cfe/cfe/forcings/cat87_01Dec2015_ngen.csv", "provider": "CsvPerFeature" } } From e105b8e321d514b0626f178f2d773bf8b6f4e970 Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:05:45 -0400 Subject: [PATCH 10/11] Update realization_config_smp_topmodel.json --- realizations/realization_config_smp_topmodel.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/realizations/realization_config_smp_topmodel.json b/realizations/realization_config_smp_topmodel.json index 68c02c8..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" } } From 751ccdfdadc06b7aae87592de167fc15f3554afa Mon Sep 17 00:00:00 2001 From: JessicaGarrett-NOAA <30940444+madMatchstick@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:16:14 -0400 Subject: [PATCH 11/11] Update ngen_integration.yaml --- .github/workflows/ngen_integration.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index 521a40e..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 @@ -88,12 +83,6 @@ jobs: with: mod-dir: "extern/evapotranspiration/evapotranspiration" targets: "petbmi" - - # - name: Save PET to a Temp Directory - # run: | - # # Move files to a temporary directory - # mkdir ${{runner.temp}}/evapotranspiration - # mv ./* ${{runner.temp}}/evapotranspiration - name: Build SLoTH id: submod_build_4 @@ -123,10 +112,7 @@ jobs: rm -rf extern/cfe/cfe/* mv ${{runner.temp}}/cfe/* extern/cfe/cfe - # - name: Move PET Files Including cmake_build to Appropriate Directory - # run: | - # rm -rf extern/evapotranspiration/evapotranspiration/* - # mv ${{runner.temp}}/evaportranspiration/* extern/evapotranspiration/evapotranspiration + #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