From b0988c40d6241d4e7b93ebe0f93c829ee73717ab Mon Sep 17 00:00:00 2001 From: Dom Heinzeller <climbfuji@ymail.com> Date: Fri, 17 Apr 2020 07:31:49 -0600 Subject: [PATCH] Revert change to .gitmodules and update submodule pointers for fv3atm, NEMS --- .gitmodules | 13 ++++--------- FV3 | 2 +- NEMS | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index d3477c149b..34d37ff395 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,11 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NOAA-EMC/fv3atm - #branch = develop - url = https://github.com/climbfuji/fv3atm - branch = update_develop_from_dtc_develop_20200414 + url = https://github.com/NOAA-EMC/fv3atm + branch = develop [submodule "NEMS"] path = NEMS - #url = https://github.com/NOAA-EMC/NEMS - #branch = develop - url = https://github.com/climbfuji/NEMS - branch = rahul_feature_s4_with_submodule_pointer_update_pyprodutil + url = https://github.com/NOAA-EMC/NEMS + branch = develop [submodule "FMS"] path = FMS url = https://github.com/NOAA-GFDL/FMS @@ -21,4 +17,3 @@ [submodule "stochastic_physics"] path = stochastic_physics url = https://github.com/noaa-psd/stochastic_physics - diff --git a/FV3 b/FV3 index 9705280dc6..92a1b38e54 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 9705280dc6eec229906518657398c45541790b57 +Subproject commit 92a1b38e54373b5e791ba19518e69f053f12a55f diff --git a/NEMS b/NEMS index 4a59826b89..8e1f15ca10 160000 --- a/NEMS +++ b/NEMS @@ -1 +1 @@ -Subproject commit 4a59826b89a27de85b123f53a1fff2833197db0a +Subproject commit 8e1f15ca1040dfe7398e6f5a54f450b2dae00f80