From aa29b7ce28734935303f846ba6d8cc3698deed44 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 2 Nov 2023 15:33:52 -0400 Subject: [PATCH 1/2] update ccpp/physics and .gitmodules for ufs/dev PR#69 --- .gitmodules | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1b9e6c12a..8cd79bdc8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,7 +7,7 @@ #url = https://github.com/NCAR/ccpp-physics #branch = main url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR88 + branch = ufs-dev-PR69 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index e1ccc99c6..c326b7a9b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e1ccc99c6eb48b6700513c4bb4315fca131fbd6a +Subproject commit c326b7a9b7166eac2800329360d4e1366751c0db From 61d5bdf8295e7aef3c78058ec0f871582cf6f93a Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 11 Jan 2024 17:30:49 +0000 Subject: [PATCH 2/2] update .gitmodules and ccpp/physics submodule pointer --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8cd79bdc8..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR69 + 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 c326b7a9b..be2e7bbea 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c326b7a9b7166eac2800329360d4e1366751c0db +Subproject commit be2e7bbea91d8e7bf999957f9d48981147120562