From 70c156f0c6cc457a854b7bbfbfb8ddd2011ab918 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 4 Jun 2022 20:57:14 -0600 Subject: [PATCH 1/6] Update .gitmodules and submodule pointer for ccpp-physics for code review and testing --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..bd8be123a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + #url = https://github.com/NCAR/ccpp-physics + #branch = main + url = https://github.com/climbfuji/ccpp-physics + branch = bugfix/gf_decomp_b4b [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 77bcfb1b3..63f4b93c4 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 77bcfb1b39f7e737ccffee842031dae228240227 +Subproject commit 63f4b93c47854571a6c874ed0829210069315e9a From d8c09eccec3c6c37eb5d4c33d9221089479aa6fe Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 6 Jun 2022 22:41:45 +0000 Subject: [PATCH 2/6] moninshoc.meta missing mfpbl.f dependency --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..9574c2b33 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/SamuelTrahanNOAA/ccpp-physics + branch = bugfix/sam-broke-moorthi [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 77bcfb1b3..efd0b3ba1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 77bcfb1b39f7e737ccffee842031dae228240227 +Subproject commit efd0b3ba16db5e0d35cdfc5ed515c11ec68f1579 From b31ba5cb36c4727c0b8c912513d9c5b7ae9e67a8 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 9 Jun 2022 15:25:39 +0000 Subject: [PATCH 3/6] point dycore to Teds branch --- .gitmodules | 6 ++++-- atmos_cubed_sphere | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..5944dafd5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - branch = dev/emc + #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + #branch = dev/emc + url = https://github.com/MicroTed/GFDL_atmos_cubed_sphere + branch = regional_bc_test [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index fad4c9f1f..442d61dbb 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit fad4c9f1fc29c0cbb47df9a07a573249155a1c42 +Subproject commit 442d61dbbbb2fe0ef683f684376aff8278e1ed37 From 456652957a0fa6a1c4685ccab73310c6228f260b Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 10 Jun 2022 18:27:17 +0000 Subject: [PATCH 4/6] Point to sam's ccpp-physics --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index bd8be123a..1730469c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,7 +10,7 @@ path = ccpp/physics #url = https://github.com/NCAR/ccpp-physics #branch = main - url = https://github.com/climbfuji/ccpp-physics + url = https://github.com/SamuelTrahanNOAA/ccpp-physics branch = bugfix/gf_decomp_b4b [submodule "upp"] path = upp From 0d21c7fd54913ce24b587faea8a2b3c11c460e68 Mon Sep 17 00:00:00 2001 From: Samuel Trahan Date: Fri, 17 Jun 2022 13:34:16 +0000 Subject: [PATCH 5/6] Point to NCAR main branch of ccpp/physics, and revert .gitmodules to emc develop --- .gitmodules | 10 ++++------ ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index abf42b9f1..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,17 +1,15 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - #branch = dev/emc - url = https://github.com/MicroTed/GFDL_atmos_cubed_sphere - branch = regional_bc_test + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/SamuelTrahanNOAA/ccpp-physics - branch = bugfix/gf_decomp_b4b + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 92741d960..f25b5c402 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 92741d960b4dbfcc46a5145523baa650988db29b +Subproject commit f25b5c402490835fe68d2693351d3e42cc3ed3cf From c899a2a1f6e76c41ad1ccda7eb16a5c9a8d6b499 Mon Sep 17 00:00:00 2001 From: Samuel Trahan Date: Fri, 17 Jun 2022 14:10:39 +0000 Subject: [PATCH 6/6] point to dev/emc atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 442d61dbb..49f30ee71 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 442d61dbbbb2fe0ef683f684376aff8278e1ed37 +Subproject commit 49f30ee71f5034311e65de3cbb19e2181d59b71e