From e4ead8aefefb4313eb1bc7ed7a6b9138f602cff0 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Thu, 21 Sep 2023 14:58:51 -0400 Subject: [PATCH 01/10] bug fixed for mraerosol --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..5c06659fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + url = https://github.com/AnningCheng-NOAA/ccpp-physics + branch = mrfd [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 8b963d8c9a31d5794723ace1649d36db924a9ccf Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Fri, 22 Sep 2023 16:19:22 -0400 Subject: [PATCH 02/10] point to the right hash --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 31a99de05..5377c7c0a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 31a99de05048187b61a2ea8381417b8dbd8db7e0 +Subproject commit 5377c7c0ab39f275804749a50f31f0e03f7abab4 From 729cb5bb0a029cfdcf8e3cc770cc2d560bc9356e Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Thu, 12 Oct 2023 13:56:12 -0400 Subject: [PATCH 03/10] merge to top of develop branch in fv3atm --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 5377c7c0a..e703d3b6e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5377c7c0ab39f275804749a50f31f0e03f7abab4 +Subproject commit e703d3b6e4a4976b659bf9da5e772ce0e573a812 From f6410202a4e5b06bf1573f82488af26bcc8cbc44 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Thu, 12 Oct 2023 13:59:39 -0400 Subject: [PATCH 04/10] update upp revision --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 520cc233f..fae617ba4 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 520cc233f7919dbbe5dc7fc0246354ae95caa2dc +Subproject commit fae617ba485dbbadc8fc10f512a6a0c29c81741a From ba7bd4b8aa106abca587190deaf23286a4e15ad3 Mon Sep 17 00:00:00 2001 From: jkbk2004 Date: Thu, 12 Oct 2023 14:51:13 -0500 Subject: [PATCH 05/10] sync up hash 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 52bf918c1..caba092f6 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 52bf918c194b7d906776447c6324bc75558133db +Subproject commit caba092f682c9713a485e782b8f9ba6480adaca2 From d125fb0ddd2947ce2c8fe58129d6b75b6cb1aaaa Mon Sep 17 00:00:00 2001 From: jkbk2004 Date: Thu, 12 Oct 2023 18:21:00 -0500 Subject: [PATCH 06/10] hash update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index e703d3b6e..9822325b5 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e703d3b6e4a4976b659bf9da5e772ce0e573a812 +Subproject commit 9822325b51bf934419ae6c8aec587591fed83ed2 From 910a2d3cd53f5d6a722db6e033efd5beaebdb23d Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Tue, 17 Oct 2023 11:22:57 -0400 Subject: [PATCH 07/10] merged PR#109 --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5c06659fe..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/AnningCheng-NOAA/ccpp-physics - branch = mrfd + 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 9822325b5..b127d9bbe 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9822325b51bf934419ae6c8aec587591fed83ed2 +Subproject commit b127d9bbe9ea78a96d4d2f40a674881ccecd2790 From c26ce95a7d9b0628b14c2052ab0564a0d7cbdb69 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Tue, 17 Oct 2023 11:34:34 -0400 Subject: [PATCH 08/10] point to the right physics --- .gitmodules | 4 ++-- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..22c723ac1 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/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/framework b/ccpp/framework index 1b6352fb2..3a8f27885 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 1b6352fb24f053b738bde72eed0ddf0b60ec7c0f +Subproject commit 3a8f27885f680251653b72d9c86ecfd96de23b06 diff --git a/ccpp/physics b/ccpp/physics index b127d9bbe..c83cd1714 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b127d9bbe9ea78a96d4d2f40a674881ccecd2790 +Subproject commit c83cd1714c9674f87944a48d82c287ce1660d226 From b81f53f9c7e57785acab00bd2836bacabe1c9af9 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Tue, 17 Oct 2023 11:39:01 -0400 Subject: [PATCH 09/10] correct physics now --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index c83cd1714..69c9764f3 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c83cd1714c9674f87944a48d82c287ce1660d226 +Subproject commit 69c9764f3ad33ec94ecc5c45891ad9745da5c569 From 331d83d1b308e7274835cff65391e14a39b54b37 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Tue, 17 Oct 2023 11:43:07 -0400 Subject: [PATCH 10/10] correct framework --- ccpp/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/framework b/ccpp/framework index 3a8f27885..1b6352fb2 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 3a8f27885f680251653b72d9c86ecfd96de23b06 +Subproject commit 1b6352fb24f053b738bde72eed0ddf0b60ec7c0f