From 9352a5c49d617182ad24c7185b23a4af63b58276 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 21 Oct 2024 14:52:41 -0400 Subject: [PATCH 1/6] update ccpp/physics after merge --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 11096bf2d..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR216 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index fbd720d85..653db0a99 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fbd720d858c78a8f57a5c6b1bdf25cc39884334e +Subproject commit 653db0a999cbb4aa2cb70f08cf4fcf1046438732 From fa831e48cdff29b01bfb9c8ba267c33e119e25a7 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 22 Oct 2024 11:51:28 -0400 Subject: [PATCH 2/6] update ccpp after testing --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 373d68a92..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR219 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index be90bc3bf..b31898209 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit be90bc3bf0d45b5aeb0a0bc666c2ecddfedf4988 +Subproject commit b3189820956f993d6f2397b5ba3af26e1f687c44 From 8787b9b139e378204cc99db22214366d8e75a0b4 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 22 Oct 2024 13:01:56 -0400 Subject: [PATCH 3/6] add new debug suite to RT compilation --- .github/workflows/ci_run_scm_rts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index b23c03422..2d91785e8 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -22,8 +22,8 @@ jobs: sp_ROOT: /home/runner/NCEPLIBS-sp w3emc_ROOT: /home/runner/myw3emc SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm - suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_HRRR_gf,SCM_GFS_v17_p8_ugwpv1,SCM_GFS_v16_RRTMGP - suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf_ps,SCM_GFS_v17_p8_ugwpv1_ps,SCM_GFS_v16_RRTMGP_ps + suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_HRRR_gf,SCM_GFS_v17_p8_ugwpv1,SCM_GFS_v16_RRTMGP,SCM_GFS_v16_debug + suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf_ps,SCM_GFS_v17_p8_ugwpv1_ps,SCM_GFS_v16_RRTMGP_ps,SCM_GFS_v16_debug_ps dir_rt: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}} dir_bl: /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}} From 473ea75f909ea45378a630393aa18e1d3846c1ec Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 22 Oct 2024 13:26:05 -0400 Subject: [PATCH 4/6] comment out GFS_abort scheme in new SDFs so that RTs can pass; we don't want a failing run (even if it is on purpose) because it will get flagged and fail CI --- ccpp/suites/suite_SCM_GFS_v16_debug.xml | 2 +- ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/suites/suite_SCM_GFS_v16_debug.xml b/ccpp/suites/suite_SCM_GFS_v16_debug.xml index 632eec067..eb07d5a5a 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_debug.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_debug.xml @@ -79,7 +79,7 @@ GFS_interstitialtoscreen GFS_checkland GFS_checktracers - GFS_abort + diff --git a/ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml index 11607b39e..ba443a816 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_debug_ps.xml @@ -60,7 +60,7 @@ GFS_interstitialtoscreen GFS_checkland GFS_checktracers - GFS_abort + From 0165ede8d9cb3268bfa966c5e52ab10004026c53 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 22 Oct 2024 14:29:18 -0400 Subject: [PATCH 5/6] update ccpp/physics after merge --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index e0d1393f1..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR183 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 79ff8feab..128533e5e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 79ff8feab0619601eb546ad41119779f5b82cc05 +Subproject commit 128533e5e1c3efe309d8782ab89ece40deab79b3 From 445cae47812a65fbdf58072849945d944226e8d2 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 22 Oct 2024 15:05:49 -0400 Subject: [PATCH 6/6] update ccpp/physics after merge --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1011978f3..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR223 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index cbe4ce706..f458bf44e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cbe4ce7069d1c39b61b9dc08f662cae36380f4cf +Subproject commit f458bf44e1b5697a0c18b1cd54d48fb875629ed6