From 2b61cd4d75e7f23406609d065511f829964ee769 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Aug 2020 14:57:16 -0600 Subject: [PATCH 1/2] Update .gitmodules and submodule pointer for ccpp-physics --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index bdc0ffbf1..737bc028f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +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/hannahcbarnes/ccpp-physics + branch = HFIP_GFchanges \ No newline at end of file diff --git a/ccpp/physics b/ccpp/physics index f7cd37518..1c7b52ab8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f7cd37518e40d19fc4e046ed88ae6e24b6e2a717 +Subproject commit 1c7b52ab85ecaf370e56f0b5f3e7e4a351c4170f From 6e824a0f35064642d89d73f3fba5a0786143b80a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Aug 2020 18:16:37 -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 737bc028f..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/hannahcbarnes/ccpp-physics - branch = HFIP_GFchanges \ No newline at end of file + url = https://github.com/NOAA-GSD/ccpp-physics + branch = gsd/develop diff --git a/ccpp/physics b/ccpp/physics index 1c7b52ab8..ae9e0e293 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1c7b52ab85ecaf370e56f0b5f3e7e4a351c4170f +Subproject commit ae9e0e293ae5e450de4dcb94f62cde7c7f29c161