From 526d81f07d71ce9a703bebe7e5cf45f208981f4c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 5 May 2022 14:13:05 -0400 Subject: [PATCH 1/3] edit .gitmodules and update submodule pointers to PR branches --- .gitmodules | 12 ++++++++---- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..2365a755f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,12 +4,16 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + url = https://github.com/mkavulich/ccpp-framework + branch = feature/track_variables_through_suite + #url = https://github.com/NCAR/ccpp-framework + #branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/MicroTed/ccpp-physics + branch = nssl_restart_ccn + #url = https://github.com/NCAR/ccpp-physics + #branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index c95101b40..3f1dd5b2f 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit c95101b40df4cf7109c3d34651792d89455690bf +Subproject commit 3f1dd5b2fae853e65f49339e77b4217e7aae2606 diff --git a/ccpp/physics b/ccpp/physics index 3405ff171..5eeee8d90 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3405ff171d7fa55d6aa7fb45b316146516c6e3ca +Subproject commit 5eeee8d9075684839a445f88d9404f263328d3f3 From fc8433bece56989999378ba82b67c8f8d9fb6c4f Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 10 May 2022 16:38:32 -0400 Subject: [PATCH 2/3] update submodule pointers for CCPP --- ccpp/framework | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/framework b/ccpp/framework index 3f1dd5b2f..948b62090 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 3f1dd5b2fae853e65f49339e77b4217e7aae2606 +Subproject commit 948b62090223625b386474e83be5df06d301aaaa diff --git a/ccpp/physics b/ccpp/physics index 5eeee8d90..b3e094483 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5eeee8d9075684839a445f88d9404f263328d3f3 +Subproject commit b3e094483e3b56cf0e4cb463a07cc5deb509779c From 71d82dcdb4d3ef83f78d56f6bfcf6798e4a7ebf1 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 11 May 2022 08:42:17 -0400 Subject: [PATCH 3/3] revert .gitmodules and update CCPP submodule pointers --- .gitmodules | 12 ++++-------- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2365a755f..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,16 +4,12 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/mkavulich/ccpp-framework - branch = feature/track_variables_through_suite - #url = https://github.com/NCAR/ccpp-framework - #branch = main + url = https://github.com/NCAR/ccpp-framework + branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/MicroTed/ccpp-physics - branch = nssl_restart_ccn - #url = https://github.com/NCAR/ccpp-physics - #branch = main + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index 948b62090..1968d572b 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 948b62090223625b386474e83be5df06d301aaaa +Subproject commit 1968d572bdc05ae612a6177bbd41cd2ac9759dd4 diff --git a/ccpp/physics b/ccpp/physics index b3e094483..99f32c55b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b3e094483e3b56cf0e4cb463a07cc5deb509779c +Subproject commit 99f32c55b66160cfd75f5002d9b5ba7320e443a2