From 527665303efd778ac599f0c776774ca96bfa5e50 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 6 Jan 2021 16:29:54 -0700 Subject: [PATCH] Revert change to .gitmodules and update submodule pointers for GFDL_atmos_cubed_sphere and ccpp-physics --- .gitmodules | 12 ++++-------- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index fd97fc2ff..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,12 @@ [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 = cldamt_init_bugfix_for_dev_emc + 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 branch = master [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = master - url = https://github.com/climbfuji/ccpp-physics - branch = simd_update_20201231 \ No newline at end of file + url = https://github.com/NCAR/ccpp-physics + branch = master diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 1222289f3..76489d630 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 1222289f32b156cdd4f8dfc782722dce1d86a248 +Subproject commit 76489d6304c8577a048c3dcccb4082c7195f8c37 diff --git a/ccpp/physics b/ccpp/physics index eba9b6157..4e7465c98 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit eba9b61574b5fbe30c4c01580b5ebf1277bee379 +Subproject commit 4e7465c985597525acea42ead8a3323ea82a9c3e