From 029bdac6e51f2d3637b630b156526e86a2cf4682 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Thu, 25 Jun 2020 02:33:24 +0000 Subject: [PATCH 1/7] point to the dycore branch with Toms fix --- .gitmodules | 4 ++-- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..cabd9d737 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +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/junwang-noaa/GFDL_atmos_cubed_sphere + branch = Tomsfix [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..5c7e0261e 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 205cc762231f6b558c9bc2253debf41aab6cd89b +Subproject commit 5c7e0261e40c7016dce35002c5ba5d72659c683d From 17c58e21fe2246f2296e0969d61cbbf8a5d30f59 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 25 Jun 2020 02:41:13 +0000 Subject: [PATCH 2/7] Toms fix --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 5c7e0261e..9aba70514 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 5c7e0261e40c7016dce35002c5ba5d72659c683d +Subproject commit 9aba705141423b05dc1a92be666f11f7f6af4d76 From b64d3c268d54d86171b50ff972f9f15530351bc2 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 9 Jul 2020 20:31:11 +0000 Subject: [PATCH 3/7] update Toms regional DA fix --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 9aba70514..681ef6e1e 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 9aba705141423b05dc1a92be666f11f7f6af4d76 +Subproject commit 681ef6e1e46a4c44b01699d5461b245ea5ff38fd From 7eab335e76a2e946d89221cb5ad7fa0a70398189 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 9 Jul 2020 20:32:32 +0000 Subject: [PATCH 4/7] merge to fv3 develop branch --- ccpp/framework | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/framework b/ccpp/framework index b14e3e041..d31bdb7ac 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit b14e3e0415205ea4d3004bfb5241cc34da702db8 +Subproject commit d31bdb7ac597bc75fb3252cb49edccfce7eb4000 diff --git a/ccpp/physics b/ccpp/physics index 01c2257ab..571ff99bd 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 01c2257ab1538b3e9a51fed5a5b10f4dda5bfddf +Subproject commit 571ff99bdadb418ef978c1ed329023548c3a26ae From caf8b58110f9f255f7b60e3bb9c46e7d50152fa9 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Fri, 10 Jul 2020 13:12:48 +0000 Subject: [PATCH 5/7] add Dans Changes for when INTERNAL_FILE_NML is not used and update ccpp framework/physics --- atmos_cubed_sphere | 2 +- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 681ef6e1e..5492806c0 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 681ef6e1e46a4c44b01699d5461b245ea5ff38fd +Subproject commit 5492806c06086cac7e7957a151b665e31a2fe05a diff --git a/ccpp/framework b/ccpp/framework index d31bdb7ac..b14e3e041 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit d31bdb7ac597bc75fb3252cb49edccfce7eb4000 +Subproject commit b14e3e0415205ea4d3004bfb5241cc34da702db8 diff --git a/ccpp/physics b/ccpp/physics index 571ff99bd..01c2257ab 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 571ff99bdadb418ef978c1ed329023548c3a26ae +Subproject commit 01c2257ab1538b3e9a51fed5a5b10f4dda5bfddf From aa7105542ba54190381217e76d84abfd8451719a Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Mon, 13 Jul 2020 15:06:49 +0000 Subject: [PATCH 6/7] remove hardcoded levp=65 for source_FV3GFS --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 5492806c0..32d6dc0ab 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 5492806c06086cac7e7957a151b665e31a2fe05a +Subproject commit 32d6dc0ab3b3a0757aa0e7b6b05255b3c832c700 From f2146731a0aaa119cafad794a3c4022f24c07b12 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 14 Jul 2020 16:57:25 +0000 Subject: [PATCH 7/7] point back to EMC dycore repo --- .gitmodules | 4 ++-- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index cabd9d737..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/junwang-noaa/GFDL_atmos_cubed_sphere - branch = Tomsfix + 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 32d6dc0ab..b108ed294 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 32d6dc0ab3b3a0757aa0e7b6b05255b3c832c700 +Subproject commit b108ed294f4c9f98233a23a37408db664f6344e5