From a590aceb5fc45223507ee937e90c11bee8cdfa31 Mon Sep 17 00:00:00 2001 From: "Jianping.Huang" Date: Thu, 1 Dec 2022 21:09:14 +0000 Subject: [PATCH 1/3] adding hr_ave_chem_v1 to atmos_cubed_sphere --- .gitmodules | 6 ++++-- atmos_cubed_sphere | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..10d02b3a2 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/JianpingHuang-NOAA/GFDL_atmos_cubed_sphere + branch = hr_ave_chem_v1 [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index aa42f6e13..5f5c8d1bf 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit aa42f6e135839492b0a3b80fc3f2c25d766ad437 +Subproject commit 5f5c8d1bf1472e3e7bc050cf6db3456feac5df24 From 4d441c3e34f2c22b7135c437907edf20dff32604 Mon Sep 17 00:00:00 2001 From: Brian Curtis Date: Tue, 6 Dec 2022 09:01:30 -0600 Subject: [PATCH 2/3] Update atmos_cubed_sphere hash --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 5f5c8d1bf..ad67495d2 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 5f5c8d1bf1472e3e7bc050cf6db3456feac5df24 +Subproject commit ad67495d2742b86fc2bc7505f21154da9182e542 From ef7889a542ad02d67e86ae8718b2660e3a48a966 Mon Sep 17 00:00:00 2001 From: Brian Curtis Date: Wed, 7 Dec 2022 13:50:24 +0000 Subject: [PATCH 3/3] revert .gitmodules changes and update atmos_cubed_sphere hash to f04433c --- .gitmodules | 6 ++---- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 10d02b3a2..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [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/JianpingHuang-NOAA/GFDL_atmos_cubed_sphere - branch = hr_ave_chem_v1 + 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 diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index ad67495d2..f04433c81 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit ad67495d2742b86fc2bc7505f21154da9182e542 +Subproject commit f04433c81709478db2e6d584e51270ae09f77a79