From d54901d054e25ddfe6efb18b89fe4125299d6b68 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 28 Sep 2021 11:03:50 -0600 Subject: [PATCH 1/2] Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics --- .gitmodules | 12 ++++++++---- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index a54f243ae..a4ed4fecb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,13 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + #url = https://github.com/NCAR/ccpp-framework + #branch = main + url = https://github.com/julieschramm/ccpp-framework + branch = feature/julie_retires [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/climbfuji/ccpp-physics + branch = mike_ugwp_and_julie_codeowner \ No newline at end of file diff --git a/ccpp/framework b/ccpp/framework index bc1826932..fa2abe026 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit bc18269320395826896072308f3d50cf056880ff +Subproject commit fa2abe02650f4597fb09631434f6ad10d27a88eb diff --git a/ccpp/physics b/ccpp/physics index c3ff637b6..d93540168 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c3ff637b6b8c3c68e34aa835d161a852ed962d64 +Subproject commit d935401681e94a4779f87bb769ecb8a17b220e79 From f47f13094a54f3d878d948f481992a8f2fac94b5 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 29 Sep 2021 07:59:13 -0600 Subject: [PATCH 2/2] Revert change to .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics --- .gitmodules | 12 ++++-------- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index a4ed4fecb..a54f243ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,13 +4,9 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = main - url = https://github.com/julieschramm/ccpp-framework - branch = feature/julie_retires + 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/climbfuji/ccpp-physics - branch = mike_ugwp_and_julie_codeowner \ No newline at end of file + url = https://github.com/NCAR/ccpp-physics + branch = main diff --git a/ccpp/framework b/ccpp/framework index fa2abe026..6874fc9b4 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit fa2abe02650f4597fb09631434f6ad10d27a88eb +Subproject commit 6874fc9b49237b70df7af9b513ea10df697c27d6 diff --git a/ccpp/physics b/ccpp/physics index d93540168..e22fd68f3 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d935401681e94a4779f87bb769ecb8a17b220e79 +Subproject commit e22fd68f340ec17f884b38bd24b871e36a86e29f