From 4ac19c7d8ff0270acef35fe83c7d493d96b3baa8 Mon Sep 17 00:00:00 2001 From: Tracy Date: Tue, 30 Dec 2025 22:52:46 +0000 Subject: [PATCH 1/3] updates for ufs/dev PR329 --- .gitmodules | 4 +++- ccpp/framework | 2 +- ccpp/physics | 2 +- scm/src/CCPP_typedefs.meta | 2 +- scm/src/GFS_typedefs.meta | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc0798c32..712d168cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,13 @@ [submodule "ccpp-framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework - branch = main + branch = develop [submodule "ccpp-physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics branch = main + url = https://github.com/hertneky/ccpp-physics + branch = ufs-dev-329 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/framework b/ccpp/framework index 3256121dc..22bc1a5de 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 3256121dc4972d5c78f43f1a16ea1cb118ec6daf +Subproject commit 22bc1a5de8a19996310aedc3482931616cd74a1b diff --git a/ccpp/physics b/ccpp/physics index 9fe0af3aa..00398289d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9fe0af3aadb3fca26d6bc684dfaa9d13ac8a533c +Subproject commit 00398289d0c26cdca7ac08a35d70853b0376ac90 diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta index b266544bc..4fbf96a5b 100644 --- a/scm/src/CCPP_typedefs.meta +++ b/scm/src/CCPP_typedefs.meta @@ -2758,7 +2758,7 @@ [ccpp-table-properties] name = CCPP_typedefs type = module - relative_path = ../../ccpp/physics/physics + dependencies_path = ../../ccpp/physics/physics dependencies = hooks/machine.F,photochem/module_ozphys.F90 dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index bb171ab93..a451fafc2 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -10618,7 +10618,7 @@ [ccpp-table-properties] name = GFS_typedefs type = module - relative_path = ../../ccpp/physics/physics + dependencies_path = ../../ccpp/physics/physics dependencies = hooks/machine.F,hooks/physcons.F90 dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f dependencies = MP/TEMPO/TEMPO/module_mp_tempo_params.F90 From e9bbe5d888f88733abcb2b4f06237732dfeba155 Mon Sep 17 00:00:00 2001 From: Tracy Date: Mon, 5 Jan 2026 17:18:48 +0000 Subject: [PATCH 2/3] update submodule pointer --- .gitmodules | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 712d168cd..56dee3ba7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,8 +6,6 @@ path = ccpp/physics url = https://github.com/NCAR/ccpp-physics branch = main - url = https://github.com/hertneky/ccpp-physics - branch = ufs-dev-329 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules From be81b2e6241c473ad20786658e57e515bd0a4ce7 Mon Sep 17 00:00:00 2001 From: Tracy Date: Mon, 5 Jan 2026 17:27:25 +0000 Subject: [PATCH 3/3] update submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 00398289d..35e9980d8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 00398289d0c26cdca7ac08a35d70853b0376ac90 +Subproject commit 35e9980d8a6a6d8fe970cb286c4174b2b9bc4b6f