From 0002c8873ad3ae133c28587f08677bd9f439ea27 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 24 Apr 2020 14:23:46 -0600 Subject: [PATCH 1/4] 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 8a3a77983d..01366d6d69 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 = add_aux_output [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 537df51b95..893d935472 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 537df51b9562a41bae95adbb48d7bc9ce251f4fe +Subproject commit 893d935472ec82cf5f32461890cbeea4e0719e48 From d3bf557608887b0886f5403e652fc04ef830cc8c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 24 Apr 2020 15:40:46 -0600 Subject: [PATCH 2/4] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 893d935472..e4d2ba87e6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 893d935472ec82cf5f32461890cbeea4e0719e48 +Subproject commit e4d2ba87e68574b8ec2ec424832cc927a6ea8bf3 From a6cd5ad71840923e9ebfe00052d902d062860422 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 28 Apr 2020 14:40:58 -0600 Subject: [PATCH 3/4] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 2 +- FV3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 01366d6d69..1cf0d60292 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ #url = https://github.com/NOAA-GSD/fv3atm #branch = gsd/develop url = https://github.com/climbfuji/fv3atm - branch = add_aux_output + branch = combine_joe_mynnpbl_update_and_aux_output_dom [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index e4d2ba87e6..f0e8419676 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit e4d2ba87e68574b8ec2ec424832cc927a6ea8bf3 +Subproject commit f0e84196768d19c4c51cb2fcb55f3c5c4a4f2a6b From c3ce49ae3e99b1db0220d11160d0c2750640cbbf Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 29 Apr 2020 11:19:35 -0600 Subject: [PATCH 4/4] 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 1cf0d60292..8a3a77983d 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 = combine_joe_mynnpbl_update_and_aux_output_dom + 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 f0e8419676..df3f9e421f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit f0e84196768d19c4c51cb2fcb55f3c5c4a4f2a6b +Subproject commit df3f9e421feb41d1d8f5679bc32387150d584c22