From 50e23a941520f2ee6cf4cb48a283facf41be9e55 Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 28 Apr 2020 15:29:35 +0000 Subject: [PATCH 01/10] point submodules to personal branches; add one file in suites for FV3WAM --- .gitmodules | 8 +-- ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml | 86 +++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml diff --git a/.gitmodules b/.gitmodules index d253f6966..28fd33954 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [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/XiaqiongZhou-NOAA/GFDL_atmos_cubed_sphere + branch = dev/rt_multigases [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = master + url = https://github.com/XiaqiongZhou-NOAA/ccpp-physics + branch = rt_multigases diff --git a/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml new file mode 100644 index 000000000..295ac4ce2 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml @@ -0,0 +1,86 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + rrtmg_lw_post + GFS_rrtmg_post + + + + + GFS_suite_interstitial_phys_reset + GFS_suite_stateout_reset + get_prs_fv3 + GFS_suite_interstitial_1 + GFS_surface_generic_pre + GFS_surface_composites_pre + dcyc2t3 + GFS_surface_composites_inter + GFS_suite_interstitial_2 + + + + sfc_diff + GFS_surface_loop_control_part1 + sfc_ocean + lsm_noah + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + GFS_PBL_generic_pre + hedmf + GFS_PBL_generic_post + GFS_GWD_generic_pre + cires_ugwp + cires_ugwp_post + GFS_GWD_generic_post + rayleigh_damp + GFS_suite_stateout_update + ozphys + GFS_DCNV_generic_pre + get_phi_fv3 + GFS_suite_interstitial_3 + samfdeepcnv + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + samfshalcnv + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + cnvc90 + GFS_MP_generic_pre + zhaocarr_gscond + zhaocarr_precpd + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + From e7d6ce29af584b0dac2588df9ba07688609a5a78 Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 28 Apr 2020 15:44:37 +0000 Subject: [PATCH 02/10] update submoule right revisions --- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index f9d4483a4..7957722c2 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit f9d4483a45fa9b538184b1bd607faf203511be92 +Subproject commit 7957722c2069c8b6453e60b2aeab693e6b9200f2 diff --git a/ccpp/physics b/ccpp/physics index 20d7e9d68..531d55774 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 20d7e9d687f0ec44d76a6c2b754a44a2fbbad0d9 +Subproject commit 531d5577436abfd49801d5b4ade9f1ec9a8907d9 From 14fd5a9a8fcc21ed3550c5f9de5bcc9c7c675d1e Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Mon, 22 Jun 2020 17:17:08 +0000 Subject: [PATCH 03/10] point to new submodules --- 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 7957722c2..73b40e701 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 7957722c2069c8b6453e60b2aeab693e6b9200f2 +Subproject commit 73b40e70181948cb3df4290d2670bf5e183bf281 diff --git a/ccpp/framework b/ccpp/framework index 092c293cc..d31bdb7ac 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 092c293ccd615833b85740135d90007e19817095 +Subproject commit d31bdb7ac597bc75fb3252cb49edccfce7eb4000 diff --git a/ccpp/physics b/ccpp/physics index 531d55774..d4c6755eb 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 531d5577436abfd49801d5b4ade9f1ec9a8907d9 +Subproject commit d4c6755eb74f7b4fd7604fef8846161dceb1a52b From eb2b1f9484ec769a0379d418861128ba18bb1983 Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 30 Jun 2020 12:50:53 +0000 Subject: [PATCH 04/10] Point FV3 dycore to the new version --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 73b40e701..886cd7f10 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 73b40e70181948cb3df4290d2670bf5e183bf281 +Subproject commit 886cd7f10abd6e0df4186a298fb5a23e745cc3fd From 2c7340e011a46a8dd7c208c3772cf41edcf738bc Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 30 Jun 2020 16:51:38 +0000 Subject: [PATCH 05/10] Point FV3 dycore to new version --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 886cd7f10..85b64a7df 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 886cd7f10abd6e0df4186a298fb5a23e745cc3fd +Subproject commit 85b64a7df49c801439e75f130052adb067a787c6 From 795322a85c891d49bd15cdb2d11d8def5b836e8e Mon Sep 17 00:00:00 2001 From: "xiaqiong.zhou" Date: Wed, 1 Jul 2020 18:35:07 +0000 Subject: [PATCH 06/10] Point dycore to the new version --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 85b64a7df..83f3e5946 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 85b64a7df49c801439e75f130052adb067a787c6 +Subproject commit 83f3e59461094c76ce10a08b7cc9aee3669f2111 From 39be538744e7682ed976c40a8a257f24593a2286 Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Thu, 2 Jul 2020 15:07:33 +0000 Subject: [PATCH 07/10] Updates submodules --- 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 83f3e5946..e7a76c722 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 83f3e59461094c76ce10a08b7cc9aee3669f2111 +Subproject commit e7a76c72200aaf3a58fb0337b52a916fcf48b93e 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 d4c6755eb..44d389150 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d4c6755eb74f7b4fd7604fef8846161dceb1a52b +Subproject commit 44d389150a005d6b0ec40bf62fdb65266949dd7c From aab54447ad5bd127c684c51f6532b54599820d8d Mon Sep 17 00:00:00 2001 From: XiaqiongZhou-NOAA <48254930+XiaqiongZhou-NOAA@users.noreply.github.com> Date: Mon, 6 Jul 2020 13:48:56 -0400 Subject: [PATCH 08/10] Update suite_FV3_GFS_2017_fv3wam.xml Change the CCPP physics version number. --- ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml index 295ac4ce2..89f21fd7c 100644 --- a/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml +++ b/ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml @@ -1,6 +1,6 @@ - + From 4298478d51733de7e3fef4cddfa19086d0dfc95b Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 7 Jul 2020 08:31:40 -0500 Subject: [PATCH 09/10] Point submodule to public versions --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 28fd33954..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/XiaqiongZhou-NOAA/GFDL_atmos_cubed_sphere - branch = dev/rt_multigases + 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 branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/XiaqiongZhou-NOAA/ccpp-physics - branch = rt_multigases + url = https://github.com/NCAR/ccpp-physics + branch = master From 49edc0d96b35c87899ff609c38613ac8a8a256d8 Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 7 Jul 2020 08:38:43 -0500 Subject: [PATCH 10/10] point submodules to publice versions --- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index e7a76c722..2f116fd02 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit e7a76c72200aaf3a58fb0337b52a916fcf48b93e +Subproject commit 2f116fd021dcd965d24fc33e8eada21c83473750 diff --git a/ccpp/physics b/ccpp/physics index 44d389150..01c2257ab 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 44d389150a005d6b0ec40bf62fdb65266949dd7c +Subproject commit 01c2257ab1538b3e9a51fed5a5b10f4dda5bfddf