From 9322ad14b36f7aea45d1aa87f8fc8c23a8f68b90 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 20 Aug 2020 11:38:11 -0600 Subject: [PATCH 1/4] Add B1850MOM compset, add a pelayout for cheyenne, make MOM, RTM and FMS optional components --- Externals.cfg | 6 +- cime_config/config_compsets.xml | 18 ++- cime_config/config_pes.xml | 197 +++++++++++++++++++------------- 3 files changed, 132 insertions(+), 89 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 9e04cd2b2d..d8e633e66b 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -43,7 +43,7 @@ protocol = git repo_url = https://github.com/ESCOMP/FMS_interface local_path = libraries/FMS externals = Externals_FMS.cfg -required = True +required = False [mom] tag = mi_20200724 @@ -51,7 +51,7 @@ protocol = git repo_url = https://github.com/ESCOMP/MOM_interface local_path = components/mom externals = Externals.cfg -required = True +required = False [mosart] tag = mosart1_0_36 @@ -73,7 +73,7 @@ tag = rtm1_0_71 protocol = git repo_url = https://github.com/ESCOMP/rtm local_path = components/rtm -required = True +required = False [ww3] tag = ww3_200710 diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 5f444c8239..e7a05c2ec6 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -140,6 +140,12 @@ 1850_CAM60_CLM45%SP_CICE_DOCN%SOM_MOSART_SGLC_SWAV_TEST + + + B1850MOM + 1850_CAM60_CLM50%BGC-CROP_CICE_MOM6_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD + + @@ -151,12 +157,12 @@ - 0001-01-01 - 0001-01-01 - 1850-01-01 - 1955-01-01 - 2005-01-01 - 2013-01-01 + 0001-01-01 + 0001-01-01 + 1850-01-01 + 1955-01-01 + 2005-01-01 + 2013-01-01 diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 789e475ffd..408bb48c5b 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -135,69 +135,69 @@ about 12ypd expected - - 288 - 144 - 40 - 108 - 288 - 36 - 36 - 288 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 144 - 288 - 0 - 252 - 0 - + + 288 + 144 + 40 + 108 + 288 + 36 + 36 + 288 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 144 + 288 + 0 + 252 + 0 + For multi-instance tests - - -36 - -12 - -3 - -9 - -36 - -3 - -3 - -36 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 144 - 288 - 0 - 252 - 0 - + + -36 + -12 + -3 + -9 + -36 + -3 + -3 + -36 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 144 + 288 + 0 + 252 + 0 + @@ -1048,6 +1048,43 @@ + + + + none + + 576 + 288 + 288 + 288 + 180 + 36 + 36 + 576 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 288 + 576 + 0 + 0 + 0 + + + + @@ -1600,26 +1637,26 @@ - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - - - 1 - - - 1 - - + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + + + 1 + + + 1 + + From 57f5ffecd365787166fb7f74cc4c6d6873335c78 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 20 Aug 2020 11:54:37 -0600 Subject: [PATCH 2/4] add a Large pelayout for B1850MOM --- cime_config/config_pes.xml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 408bb48c5b..240a94c5b5 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -1051,6 +1051,7 @@ + none 576 @@ -1083,6 +1084,40 @@ 0 + + + none + + 1800 + 900 + 900 + 900 + 720 + 36 + 36 + 1800 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 900 + 1800 + 0 + 0 + 0 + + From fc999f79d571b0013c4167688dd198212c54fdfe Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 20 Aug 2020 11:56:30 -0600 Subject: [PATCH 3/4] add comment about optional component --- cime_config/config_compsets.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index e7a05c2ec6..bdd043d8a1 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -142,6 +142,8 @@ + B1850MOM 1850_CAM60_CLM50%BGC-CROP_CICE_MOM6_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD From 7d243058a79425448de2c8206020fa1fa42b960c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 20 Aug 2020 12:10:14 -0600 Subject: [PATCH 4/4] add back RTM as required --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index d8e633e66b..8f33e9c1bf 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -73,7 +73,7 @@ tag = rtm1_0_71 protocol = git repo_url = https://github.com/ESCOMP/rtm local_path = components/rtm -required = False +required = True [ww3] tag = ww3_200710