From c1ab9ef5da91547d29c5bda615a859223ed4922b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 26 Jun 2020 09:27:19 -0600 Subject: [PATCH 1/2] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 6 ++++-- atmos_cubed_sphere | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..6d328da22 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - branch = dev/emc + #url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + #branch = dev/emc + url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere + branch = regional_mpibugfix [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 205cc7622..8e64423d0 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 205cc762231f6b558c9bc2253debf41aab6cd89b +Subproject commit 8e64423d0cddee9ac9c276a73fe8072a159beef0 From 70a29f7caad8190424536d216ebcb7d172fd50e6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 29 Jun 2020 09:20:50 -0600 Subject: [PATCH 2/2] Revert change to .gitmodules and update submodule pointer for GFDL_atmos_cubed_sphere --- .gitmodules | 6 ++---- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6d328da22..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - #url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - #branch = dev/emc - url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere - branch = regional_mpibugfix + url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 8e64423d0..61a6c1d77 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 8e64423d0cddee9ac9c276a73fe8072a159beef0 +Subproject commit 61a6c1d776871791a75d7145c7de3b573769241d