From 7558c29156ef957b12cde0cccf0c913f6168084c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 10 Sep 2020 21:01:29 -0600 Subject: [PATCH 1/2] Update .gitmodules and submodule pointer for ccpp-framework for code review and testing --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..635b20008 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = master + #url = https://github.com/NCAR/ccpp-framework + #branch = master + url = https://github.com/climbfuji/ccpp-framework + branch = bugfix_python3_lists [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index 836558713..2cd287cdd 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 8365587133b40b1faa2831ac395bf098c3dac4a6 +Subproject commit 2cd287cddc585bae6f0bffc7852b5aeae2423810 From e2d95761d2b28d85cf1b0303b6ad3e00158e4d78 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 14 Sep 2020 13:22:30 -0600 Subject: [PATCH 2/2] Revert change to .gitmodules and update submodule pointer for fv3atm --- .gitmodules | 6 ++---- ccpp/framework | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 635b20008..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - #branch = master - url = https://github.com/climbfuji/ccpp-framework - branch = bugfix_python3_lists + url = https://github.com/NCAR/ccpp-framework + branch = master [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index 2cd287cdd..f06e053db 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 2cd287cddc585bae6f0bffc7852b5aeae2423810 +Subproject commit f06e053db04eaea602d43d6221081ba54fb6cc95