From e8944fba95dbef2bc372838f294a9d895fe47da0 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Wed, 10 Nov 2021 08:58:21 -0500 Subject: [PATCH 1/5] changes made in .gitmodules --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a54f243ae..97da92fa2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/AnningCheng-NOAA/ccpp-physics + branch = mr2memL diff --git a/ccpp/physics b/ccpp/physics index eb2875603..9e784fd21 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit eb28756036b280c2c1a741112045fefd5639c6a9 +Subproject commit 9e784fd219a60457130995a8e94fbe582b10153f From 4ff321e3fb1c1fbc0f35499d08b4db8630cce343 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Wed, 17 Nov 2021 12:46:09 -0500 Subject: [PATCH 2/5] 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 9e784fd21..aed5b1e39 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9e784fd219a60457130995a8e94fbe582b10153f +Subproject commit aed5b1e3977d1e4b64c20c97444fee5df2d6892d From c8124a37fff8bf5f11a7db0066e5366e7de418a3 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Thu, 18 Nov 2021 09:32:20 -0500 Subject: [PATCH 3/5] update dycore --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 8a3a75903..d6bfc1573 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 8a3a75903de68ae15527f116087ff2020e86d717 +Subproject commit d6bfc1573d34cb2df20fe658568d9cca5232565d From 0c723c8ccfe9b377bf12d5b7fd481a05932d27b0 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Thu, 18 Nov 2021 15:11:48 -0500 Subject: [PATCH 4/5] point ccpp physics back to NCAR main branch --- .gitmodules | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 97da92fa2..2bed1daa0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/AnningCheng-NOAA/ccpp-physics + url = https://github.com/NCAR/ccpp-physics branch = mr2memL diff --git a/ccpp/physics b/ccpp/physics index aed5b1e39..27a312cd8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit aed5b1e3977d1e4b64c20c97444fee5df2d6892d +Subproject commit 27a312cd87705fe9e0f9ff0d2026744ad3cea14d From 6e3bfe2726e6b2f32c1f98df87d4000a9ac72e48 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Thu, 18 Nov 2021 15:20:50 -0500 Subject: [PATCH 5/5] point ccpp physics back to NCAR main branch --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2bed1daa0..a54f243ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics - branch = mr2memL + branch = main