From 936a56e6ab442970844d85a1efc24f48be0e8abc Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 16 Mar 2026 11:18:29 -0400 Subject: [PATCH 1/2] update ccpp/physics and .gitmodules --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 56dee3ba7..7a8f685db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = develop [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + #url = https://github.com/NCAR/ccpp-physics + #branch = main + url = https://github.com/grantfirl/ccpp-physics + branch = NRL_combo_20260316 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index fff5748fb..08726c8c2 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fff5748fb0141921592dff1c78c9ead413261cdf +Subproject commit 08726c8c24a68f8eed68155639f0032fcda1200f From 4f95e8dfa66744891b5388171784c204e121bc29 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 17 Mar 2026 10:28:15 -0400 Subject: [PATCH 2/2] update ccpp/physics after merge --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7a8f685db..56dee3ba7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = develop [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = NRL_combo_20260316 + 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 08726c8c2..3f4ad81b7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 08726c8c24a68f8eed68155639f0032fcda1200f +Subproject commit 3f4ad81b726ba03f46160641284a24cf67fe0eaa