From 357fb239a4c74b8b93c584357ae772aafaf80230 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 21 Jun 2017 09:47:41 -0600 Subject: [PATCH 1/4] Switch NCK B1850G test to use SWAV This is needed because WW3 currently doesn't support multi-instance --- config_compsets.xml | 6 ++++++ testlist_allactive.xml | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config_compsets.xml b/config_compsets.xml index d5bfbe0..06944b9 100644 --- a/config_compsets.xml +++ b/config_compsets.xml @@ -239,6 +239,12 @@ 1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%EVOLVE_WW3_BGC%BDRD + + + B1850GWs + 1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%EVOLVE_SWAV_BGC%BDRD + + diff --git a/testlist_allactive.xml b/testlist_allactive.xml index bda78c5..f45fb42 100644 --- a/testlist_allactive.xml +++ b/testlist_allactive.xml @@ -185,13 +185,14 @@ - + + From 55e938ac8948abf276ae862cd73a7afdbbc8dccf Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 21 Jun 2017 09:54:58 -0600 Subject: [PATCH 2/4] Change B1850G T31_g37_gl20 tests to f19 or f09 Main reason is that CAM6 apparently does not support T31. Other points are: (1) change these to use the production CISM resolution (partly so we're testing the production resolution, partly because we don't have grid aliases defined with gl20 for f19); (2) include at least one test of B1850G at the production resolution f09_g17. --- testlist_allactive.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testlist_allactive.xml b/testlist_allactive.xml index f45fb42..ee10f73 100644 --- a/testlist_allactive.xml +++ b/testlist_allactive.xml @@ -290,16 +290,23 @@ - + + + + + + + + - + @@ -309,7 +316,7 @@ - + From 7a87097ddb9d143f3e9a29b3ea0a25e7c979c633 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 21 Jun 2017 21:31:55 -0600 Subject: [PATCH 3/4] Give more time to a test NCK_Ld5.f19_g17.B1850GWs.cheyenne_intel.allactive-defaultio took about 0:30 to run. Giving it 1:30 max to be safe. --- testlist_allactive.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testlist_allactive.xml b/testlist_allactive.xml index ee10f73..7f500e0 100644 --- a/testlist_allactive.xml +++ b/testlist_allactive.xml @@ -191,7 +191,7 @@ - + From 9cf665eea96b949e87afa0d3c0d2397106865f48 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 22 Jun 2017 06:39:34 -0600 Subject: [PATCH 4/4] Shorten hobart test The _Ld5 test took took too long. This _Ld1 test completes in about 15 minutes. --- testlist_allactive.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testlist_allactive.xml b/testlist_allactive.xml index 7f500e0..0c2c996 100644 --- a/testlist_allactive.xml +++ b/testlist_allactive.xml @@ -316,12 +316,12 @@ - + - +