From ac8f47ad342dfdda9cc66ac8b1fd8af0130b1b3d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 9 Jun 2020 13:30:32 -0600 Subject: [PATCH 1/2] Update .gitmodules and submodule pointer for ccpp-physics for code review and testing --- .gitmodules | 7 ++++--- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index c67c61fa3..dd1cee527 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,6 +8,7 @@ branch = gsd/develop [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NOAA-GSD/ccpp-physics - branch = gsd/develop - + #url = https://github.com/NOAA-GSD/ccpp-physics + #branch = gsd/develop + url = https://github.com/climbfuji/ccpp-physics + branch = rollback_thompson diff --git a/ccpp/physics b/ccpp/physics index 84047fea1..4619424a2 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 84047fea16d37d9b07ae0b560d0bd6fe45652e09 +Subproject commit 4619424a2040d51cf63d2b92dde10c3a42cb02fe From 4dfe7375f237270131685afaf236d255261f2508 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 12 Jun 2020 14:51:38 -0600 Subject: [PATCH 2/2] Revert change to .gitmodules and update submodule pointer for ccpp-physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index dd1cee527..bdc0ffbf1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,5 @@ branch = gsd/develop [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NOAA-GSD/ccpp-physics - #branch = gsd/develop - url = https://github.com/climbfuji/ccpp-physics - branch = rollback_thompson + url = https://github.com/NOAA-GSD/ccpp-physics + branch = gsd/develop diff --git a/ccpp/physics b/ccpp/physics index 4619424a2..783ccf99a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4619424a2040d51cf63d2b92dde10c3a42cb02fe +Subproject commit 783ccf99af3c0cb79d45935f917b239216873352