From df36d4325f1ac9a74ca7a6dc67b5f42aa6efb5bd Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 31 Mar 2020 16:49:10 -0600 Subject: [PATCH 1/5] Add new 2300 extension compsets, and update externals with needed branches for it --- Externals.cfg | 12 ++++++------ cime_config/config_compsets.xml | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 7ba9559d60..870f87ecf9 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [cam] -tag = cam_cesm2_1_rel_41 +tag = cam_cesm2_1_rel_43 protocol = git repo_url = https://github.com/ESCOMP/CAM local_path = components/cam @@ -15,9 +15,9 @@ local_path = components/cice required = True [cime] -tag = cime5.6.32 +branch = add2300extsspanom protocol = git -repo_url = https://github.com/ESMCI/cime +repo_url = https://github.com/ekluzek/cime local_path = cime required = True @@ -30,9 +30,9 @@ externals = Externals_CISM.cfg required = True [clm] -tag = release-clm5.0.30 +branch = rel2300ext protocol = git -repo_url = https://github.com/ESCOMP/ctsm/ +repo_url = https://github.com/ekluzek/ctsm/ local_path = components/clm externals = Externals_CLM.cfg required = True @@ -45,7 +45,7 @@ local_path = components/mosart required = True [pop] -tag = pop2_cesm2_1_rel_n09 +tag = pop2_cesm2_1_rel_n10 protocol = git repo_url = https://github.com/ESCOMP/POP2-CESM local_path = components/pop diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 486aa8ce9d..f4e8934af5 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -219,6 +219,17 @@ + + + BWSSP585extcmip6 + SSP585EXT_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + + + BWSSP534osextcmip6 + SSP585EXT_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + BWHISTcmip6 From 0a5a233ae5f0c9e1c5f9e89b5fee8eca199159a7 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 31 Mar 2020 23:06:41 -0600 Subject: [PATCH 2/5] Set up REF CASES for extension --- cime_config/config_compsets.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index f4e8934af5..8c8f4ef8e5 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -438,6 +438,7 @@ 2013-01-01 2040-01-01 2015-01-01 + 2101-01-01 @@ -459,6 +460,10 @@ 0321-01-01 0301-01-01 0301-01-01 + 2040-01-01 + 2101-01-01 + 2101-01-01 + 2101-01-01 @@ -481,6 +486,9 @@ hybrid hybrid hybrid + hybrid + hybrid + hybrid @@ -511,6 +519,9 @@ b.e21.B1850.f19_g17.CMIP6-piControl-2deg.001 b.e20.B1850.f19_g17.release_cesm2_1_0.020 b.e21.BWma1850.f19_g17.CMIP6-piControl-WACCM-MA-2deg.001 + b.e21.BWSSP534oscmip6.f09_g17.CMIP6-SSP5-3.4OS-WACCM.001 + b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001 + b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001 @@ -529,6 +540,9 @@ cesm2_init cesm2_init cesm2_init + cesm2_init + cesm2_init + cesm2_init From ca72d2a675a8b1ddb2f50c655d6ebf9e5cd04e4f Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 1 Apr 2020 00:27:04 -0600 Subject: [PATCH 3/5] Change ordering of REF_CASES to put the 2300 extensions first --- cime_config/config_compsets.xml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 8c8f4ef8e5..d0a139e155 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -230,6 +230,11 @@ SSP585EXT_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + BWSSP126extcmip6 + SSP126EXT_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3 + + BWHISTcmip6 @@ -443,6 +448,9 @@ + 2101-01-01 + 2101-01-01 + 2101-01-01 0134-01-01 0501-01-01 0501-01-01 @@ -461,9 +469,6 @@ 0301-01-01 0301-01-01 2040-01-01 - 2101-01-01 - 2101-01-01 - 2101-01-01 @@ -493,10 +498,13 @@ + + b.e21.BWSSP534oscmip6.f09_g17.CMIP6-SSP5-3.4OS-WACCM.001 + b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001 + b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001 - b.e21.B1850_BPRP.f09_g17.CMIP6-piControl.tst.004 b.e21.B1850.f09_g17.CMIP6-esm-piControl.001 b.e20.B1850.f09_g17.pi_control.all.299_merge_v3 @@ -519,9 +527,6 @@ b.e21.B1850.f19_g17.CMIP6-piControl-2deg.001 b.e20.B1850.f19_g17.release_cesm2_1_0.020 b.e21.BWma1850.f19_g17.CMIP6-piControl-WACCM-MA-2deg.001 - b.e21.BWSSP534oscmip6.f09_g17.CMIP6-SSP5-3.4OS-WACCM.001 - b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001 - b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001 From 7ad33ec4b9e813c398fa7b4ea413411f3578edb7 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 1 Apr 2020 00:36:57 -0600 Subject: [PATCH 4/5] Capitolize ESCOMP repos --- Externals.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 870f87ecf9..05ce01d7ca 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -24,7 +24,7 @@ required = True [cism] tag = cism-release-cesm2.1.2_02 protocol = git -repo_url = https://github.com/ESCOMP/cism-wrapper +repo_url = https://github.com/ESCOMP/CISM-wrapper local_path = components/cism externals = Externals_CISM.cfg required = True @@ -32,7 +32,7 @@ required = True [clm] branch = rel2300ext protocol = git -repo_url = https://github.com/ekluzek/ctsm/ +repo_url = https://github.com/ekluzek/CTSM/ local_path = components/clm externals = Externals_CLM.cfg required = True @@ -40,7 +40,7 @@ required = True [mosart] tag = release-cesm2.0.04 protocol = git -repo_url = https://github.com/ESCOMP/mosart +repo_url = https://github.com/ESCOMP/MOSART local_path = components/mosart required = True @@ -55,7 +55,7 @@ required = True [rtm] tag = release-cesm2.0.04 protocol = git -repo_url = https://github.com/ESCOMP/rtm +repo_url = https://github.com/ESCOMP/RTM local_path = components/rtm required = True From ced6a5eb4a5b34b8bba49db51ec4367963212ea1 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 2 Apr 2020 00:52:02 -0600 Subject: [PATCH 5/5] Point to the tagged versions of CIME and CTSM, and remove the specific settings for EXT for REFDIR and REFTYPE as it already defaults correctly --- Externals.cfg | 8 ++++---- cime_config/config_compsets.xml | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 05ce01d7ca..2fd2e3a9a1 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -15,9 +15,9 @@ local_path = components/cice required = True [cime] -branch = add2300extsspanom +tag = cime5.6.33 protocol = git -repo_url = https://github.com/ekluzek/cime +repo_url = https://github.com/ESMCI/cime local_path = cime required = True @@ -30,9 +30,9 @@ externals = Externals_CISM.cfg required = True [clm] -branch = rel2300ext +tag = release-clm5.0.32 protocol = git -repo_url = https://github.com/ekluzek/CTSM/ +repo_url = https://github.com/ESCOMP/CTSM/ local_path = components/clm externals = Externals_CLM.cfg required = True diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index d0a139e155..dd22f02bc8 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -491,9 +491,6 @@ hybrid hybrid hybrid - hybrid - hybrid - hybrid @@ -545,9 +542,6 @@ cesm2_init cesm2_init cesm2_init - cesm2_init - cesm2_init - cesm2_init