From a1ca4a804c25e7186896b1f43a12d2281608bb7d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 25 Feb 2021 13:32:49 -0700 Subject: [PATCH 1/2] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5524c9d299..69c8a2446d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-GSL/fv3atm - branch = gsl/develop + #url = https://github.com/NOAA-GSL/fv3atm + #branch = gsl/develop + url = https://github.com/climbfuji/fv3atm + branch = thomp_nc_density [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index c48b45a947..6bee060c61 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c48b45a9473a7f21a66c7c2217fd6e06590d6297 +Subproject commit 6bee060c6187a87363fdb731c60531ab3074c498 From 1a96410ab0b3e46d28892da6d142d5d92423b0e7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 26 Feb 2021 16:18:57 -0700 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 69c8a2446d..5524c9d299 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NOAA-GSL/fv3atm - #branch = gsl/develop - url = https://github.com/climbfuji/fv3atm - branch = thomp_nc_density + url = https://github.com/NOAA-GSL/fv3atm + branch = gsl/develop [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 6bee060c61..730ac5d8d3 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 6bee060c6187a87363fdb731c60531ab3074c498 +Subproject commit 730ac5d8d334438dbef93e974b32cd7872d73404