From 040dd666e63dda7ffcfcae30a6f16ef79d14a55e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Aug 2020 14:59:35 -0600 Subject: [PATCH 1/2] Update .gitmodules and submodule pointer for fv3atm --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index ffe6e98ef4..9cfd7b1a39 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-GSD/fv3atm - branch = gsd/develop + #url = https://github.com/NOAA-GSD/fv3atm + #branch = gsd/develop + url = https://github.com/climbfuji/fv3atm + branch = HFIP_GFchanges [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index a8d8d937b4..2b61cd4d75 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit a8d8d937b454eea24cfa12951e74b7b957a89872 +Subproject commit 2b61cd4d75e7f23406609d065511f829964ee769 From 18377372907035dedc304aab9664e2a38a3e5ce8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 13 Aug 2020 18:17:46 -0600 Subject: [PATCH 2/2] Revert change to .gitmodules and update submodule pointer for fv3atm --- .gitmodules | 6 ++---- FV3 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9cfd7b1a39..ffe6e98ef4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NOAA-GSD/fv3atm - #branch = gsd/develop - url = https://github.com/climbfuji/fv3atm - branch = HFIP_GFchanges + url = https://github.com/NOAA-GSD/fv3atm + branch = gsd/develop [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 2b61cd4d75..e904618219 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 2b61cd4d75e7f23406609d065511f829964ee769 +Subproject commit e904618219aee0de8a1962c13fa51c13b1eaa452