From ea71b79011ddbc1e022e203b7e15d6d1c90d314f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 22 Jun 2020 07:35:54 -0600 Subject: [PATCH 1/4] Update for GFDL_atmos_cubed_sphere (dycore GNU bugfix) (#131) --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 3ff1ed2ad..205cc7622 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 3ff1ed2adb10bbe892c9d9d010bb5b11c66ce425 +Subproject commit 205cc762231f6b558c9bc2253debf41aab6cd89b From c73d3847b6a9fb4580039bc995aa17a53a29b145 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 25 Jun 2020 07:46:06 -0600 Subject: [PATCH 2/4] Update .gitmodules and submodule pointer for GFDL_atmos_cubed_sphere and ccpp-physics for code review and testing --- .gitmodules | 10 +++++++--- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index bdc0ffbf1..5aae3af21 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-GSD/GFDL_atmos_cubed_sphere - branch = gsd/develop + #url = https://github.com/NOAA-GSD/GFDL_atmos_cubed_sphere + #branch = gsd/develop + url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere + branch = update_gsd_develop_from_dev_emc_20200625 [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NOAA-GSD/ccpp-framework @@ -9,4 +11,6 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NOAA-GSD/ccpp-physics - branch = gsd/develop + #branch = gsd/develop + url = https://github.com/benwgreen/ccpp-physics + branch = bwg_mod_for_frac diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 9e1c85631..d1620e2cf 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 9e1c856314356366bc41a86231575de04c4f8b47 +Subproject commit d1620e2cf263ab9d59b8e485c24622a0b8412b08 diff --git a/ccpp/physics b/ccpp/physics index 10eaa1afb..37719daee 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 10eaa1afb58fc28b6d72da57b93225e95e0b1eb2 +Subproject commit 37719daee48f16e7be2c510ab0a3425e856c1eef From fb31f767ec2448b244df148bc5d430d1f6badac2 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 25 Jun 2020 07:58:19 -0600 Subject: [PATCH 3/4] Update .gitmodules and submodule pointer for ccpp-physics --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5aae3af21..114a7e883 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,5 +12,5 @@ path = ccpp/physics url = https://github.com/NOAA-GSD/ccpp-physics #branch = gsd/develop - url = https://github.com/benwgreen/ccpp-physics - branch = bwg_mod_for_frac + url = https://github.com/climbfuji/ccpp-physics + branch = ben_bwg_mod_for_frac diff --git a/ccpp/physics b/ccpp/physics index 37719daee..728c076a6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 37719daee48f16e7be2c510ab0a3425e856c1eef +Subproject commit 728c076a64f921670e8be18d1b0c0d79de6e3254 From ff91cff2d60d4097b9cd9cf78d94504222db6be3 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 25 Jun 2020 11:41:54 -0600 Subject: [PATCH 4/4] Revert change to .gitmodules and update submodule pointer for GFDL_atmos_cubed_sphere and ccpp-physics --- .gitmodules | 10 +++------- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 114a7e883..bdc0ffbf1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - #url = https://github.com/NOAA-GSD/GFDL_atmos_cubed_sphere - #branch = gsd/develop - url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere - branch = update_gsd_develop_from_dev_emc_20200625 + url = https://github.com/NOAA-GSD/GFDL_atmos_cubed_sphere + branch = gsd/develop [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NOAA-GSD/ccpp-framework @@ -11,6 +9,4 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NOAA-GSD/ccpp-physics - #branch = gsd/develop - url = https://github.com/climbfuji/ccpp-physics - branch = ben_bwg_mod_for_frac + branch = gsd/develop diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index d1620e2cf..658b1395e 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit d1620e2cf263ab9d59b8e485c24622a0b8412b08 +Subproject commit 658b1395e315446cc15cc494b310f831e793ce73 diff --git a/ccpp/physics b/ccpp/physics index 728c076a6..022ae370b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 728c076a64f921670e8be18d1b0c0d79de6e3254 +Subproject commit 022ae370bcfe95689cb0935fb6da8f6e24b6bb7f