From 90d0bc5b6e77fe1c9a0d87f1a8e44fab70ed13c9 Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 23 Nov 2020 23:23:55 -0700 Subject: [PATCH 1/7] Update test suite, add complete set of jra55 tests. jra55 tests for different grids gx3 uses jra55_gx3 gx1 uses jra55_gx1 tx1 is already using jra55 by default (no changes to tests required) gbox* uses internal forcing, no jra55 data (no changes to tests required) remove ocn_data_dir='default' and bgc_data_dir='default' in set_nml.jra55* files because it causes the bgc tests to fail. the bgc tests work with WOA bgc forcing data with jra55 physics forcing data. iobinary tests must use the old gx3 binary forcing, the jra55_gx3 netcdf data causes an abort because iobinary is tested with netcdf turned off. the old gx3 data is NCAR_bulk in binary format. alt01 with jra55 uses the alt01a setting. the difference is that use_leap_years is set to false in alt01a. It's set to true by default in the jra55 datasets. --- configuration/scripts/options/set_nml.jra55 | 2 - .../scripts/options/set_nml.jra55_2008 | 2 - .../scripts/options/set_nml.jra55_gx1 | 2 - .../scripts/options/set_nml.jra55_gx1_2008 | 2 - .../scripts/options/set_nml.jra55_gx3 | 2 - .../scripts/options/set_nml.jra55_gx3_2008 | 2 - configuration/scripts/tests/base_suite.ts | 55 +++++++++++++ configuration/scripts/tests/decomp_suite.ts | 16 ++++ configuration/scripts/tests/first_suite.ts | 7 ++ configuration/scripts/tests/io_suite.ts | 70 +++++++++++++++++ .../scripts/tests/nothread_quicksuite.ts | 7 +- configuration/scripts/tests/nothread_suite.ts | 78 +++++++++++++++++++ configuration/scripts/tests/quick_suite.ts | 8 ++ configuration/scripts/tests/reprosum_suite.ts | 13 ++++ configuration/scripts/tests/travis_suite.ts | 9 +++ 15 files changed, 262 insertions(+), 13 deletions(-) diff --git a/configuration/scripts/options/set_nml.jra55 b/configuration/scripts/options/set_nml.jra55 index b35e99a6d..b021efb61 100755 --- a/configuration/scripts/options/set_nml.jra55 +++ b/configuration/scripts/options/set_nml.jra55 @@ -13,5 +13,3 @@ atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' atm_data_format = 'nc' atm_data_type = 'JRA55_gx1' precip_units = 'mks' -ocn_data_dir = 'default' -bgc_data_dir = 'default' diff --git a/configuration/scripts/options/set_nml.jra55_2008 b/configuration/scripts/options/set_nml.jra55_2008 index 042431fc0..bd9a9a5aa 100755 --- a/configuration/scripts/options/set_nml.jra55_2008 +++ b/configuration/scripts/options/set_nml.jra55_2008 @@ -13,5 +13,3 @@ atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' atm_data_format = 'nc' atm_data_type = 'JRA55' precip_units = 'mks' -ocn_data_dir = 'default' -bgc_data_dir = 'default' diff --git a/configuration/scripts/options/set_nml.jra55_gx1 b/configuration/scripts/options/set_nml.jra55_gx1 index b35e99a6d..b021efb61 100755 --- a/configuration/scripts/options/set_nml.jra55_gx1 +++ b/configuration/scripts/options/set_nml.jra55_gx1 @@ -13,5 +13,3 @@ atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' atm_data_format = 'nc' atm_data_type = 'JRA55_gx1' precip_units = 'mks' -ocn_data_dir = 'default' -bgc_data_dir = 'default' diff --git a/configuration/scripts/options/set_nml.jra55_gx1_2008 b/configuration/scripts/options/set_nml.jra55_gx1_2008 index bf92e93d1..22230b57c 100755 --- a/configuration/scripts/options/set_nml.jra55_gx1_2008 +++ b/configuration/scripts/options/set_nml.jra55_gx1_2008 @@ -13,5 +13,3 @@ atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' atm_data_format = 'nc' atm_data_type = 'JRA55_gx1' precip_units = 'mks' -ocn_data_dir = 'default' -bgc_data_dir = 'default' diff --git a/configuration/scripts/options/set_nml.jra55_gx3 b/configuration/scripts/options/set_nml.jra55_gx3 index c2d1eefdc..b6c0cdeb1 100755 --- a/configuration/scripts/options/set_nml.jra55_gx3 +++ b/configuration/scripts/options/set_nml.jra55_gx3 @@ -13,5 +13,3 @@ atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/JRA55' atm_data_format = 'nc' atm_data_type = 'JRA55_gx3' precip_units = 'mks' -ocn_data_dir = 'default' -bgc_data_dir = 'default' diff --git a/configuration/scripts/options/set_nml.jra55_gx3_2008 b/configuration/scripts/options/set_nml.jra55_gx3_2008 index 89c7dc55d..d4749b170 100755 --- a/configuration/scripts/options/set_nml.jra55_gx3_2008 +++ b/configuration/scripts/options/set_nml.jra55_gx3_2008 @@ -13,5 +13,3 @@ atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/JRA55' atm_data_format = 'nc' atm_data_type = 'JRA55_gx3' precip_units = 'mks' -ocn_data_dir = 'default' -bgc_data_dir = 'default' diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index 386c29e41..c5ffec086 100755 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -51,3 +51,58 @@ restart gx3 4x4 histall,precision8,cdf64 smoke gx3 30x1 bgcz,histall smoke gx3 14x2 fsd12,histall smoke gx3 4x1 dynpicard,medium + +# jra55 +# Test Grid PEs Sets BFB-compare +smoke gx3 8x2 jra55_gx3,diag1,run5day +smoke gx3 1x1 jra55_gx3,debug,diag1,run2day +smoke gx3 1x4 jra55_gx3,debug,diag1,run2day +smoke gx3 4x1 jra55_gx3,debug,diag1,run5day +restart gx3 8x2 jra55_gx3,debug +smoke gx3 8x2 jra55_gx3,diag24,run1year,medium +decomp gx3 4x2x25x29x5 jra55_gx3 +smoke gx3 4x2 jra55_gx3,diag1,run5day smoke_gx3_8x2_diag1_jra55_gx3_run5day +smoke gx3 4x1 jra55_gx3,diag1,run5day,thread smoke_gx3_8x2_diag1_jra55_gx3_run5day +restart gx1 40x4 jra55_gx1,droundrobin,medium +restart tx1 40x4 dsectrobin,medium +restart gx3 4x4 jra55_gx3,none +restart gx3 6x2 jra55_gx3,alt01a +restart gx3 8x2 jra55_gx3,alt02 +restart gx3 4x2 jra55_gx3,alt03 +restart gx3 4x4 jra55_gx3,alt04 +restart gx3 4x4 jra55_gx3,alt05 +restart gx3 6x2 jra55_gx3,alt01a,debug,short +restart gx3 8x2 jra55_gx3,alt02,debug,short +restart gx3 4x2 jra55_gx3,alt03,debug,short +smoke gx3 4x4 jra55_gx3,alt04,debug,short +smoke gx3 4x4 jra55_gx3,alt05,debug,short +restart gbox128 4x2 short +restart gbox128 4x2 boxdyn,short +restart gbox128 4x2 boxdyn,short,debug +restart gbox128 2x2 boxadv,short +smoke gbox128 2x2 boxadv,short,debug +restart gbox128 4x4 boxrestore,short +smoke gbox128 4x4 boxrestore,short,debug +restart gbox80 1x1 box2001 +smoke gbox80 1x1 boxslotcyl +smoke gx3 8x2 jra55_gx3,bgcz +smoke gx3 8x2 jra55_gx3,bgcz,debug +smoke gx3 8x1 jra55_gx3,bgcskl,debug +#smoke gx3 4x1 jra55_gx3,bgcz,thread smoke_gx3_8x2_bgcz +restart gx1 4x2 jra55_gx1,bgcsklclim,medium +restart gx1 8x1 jra55_gx1,bgczclim,medium +smoke gx1 24x1 jra55_gx1_2008,medium,run90day +smoke gx3 8x1 jra55_gx3_2008,medium,run90day +restart gx1 24x1 jra55_gx1,short +restart gx3 8x1 jra55_gx3,short +smoke gx3 4x2 jra55_gx3,fsd1,diag24,run5day,debug +smoke gx3 8x2 jra55_gx3,fsd12,diag24,run5day,short +restart gx3 4x2 jra55_gx3,fsd12,debug,short +smoke gx3 8x2 jra55_gx3,fsd12ww3,diag24,run1day,medium +smoke gx3 4x1 jra55_gx3,isotope,debug +restart gx3 8x2 jra55_gx3,isotope +restart gx3 4x4 iobinary +restart gx3 4x4 jra55_gx3,histall,precision8,cdf64 +smoke gx3 30x1 jra55_gx3,bgcz,histall +smoke gx3 14x2 jra55_gx3,fsd12,histall +smoke gx3 4x1 jra55_gx3,dynpicard,medium diff --git a/configuration/scripts/tests/decomp_suite.ts b/configuration/scripts/tests/decomp_suite.ts index 1e1ae3112..81f72d01c 100644 --- a/configuration/scripts/tests/decomp_suite.ts +++ b/configuration/scripts/tests/decomp_suite.ts @@ -13,3 +13,19 @@ restart gx3 16x2x5x10x20 drakeX2 restart_gx3_4x2x25x29x4_ restart gx3 8x2x8x10x20 droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2 restart gx3 1x4x25x29x16 droundrobin restart_gx3_4x2x25x29x4_dslenderX2 +# jra55 +# Test Grid PEs Sets BFB-compare +restart gx3 4x2x25x29x4 jra55_gx3,dslenderX2 +decomp gx3 4x2x25x29x5 jra55_gx3 +sleep 30 +restart gx3 1x1x50x58x4 jra55_gx3,droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 4x1x25x116x1 jra55_gx3,dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 6x2x4x29x18 jra55_gx3,dspacecurve restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 8x2x8x10x20 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 6x2x50x58x1 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 4x2x19x19x10 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 1x20x5x29x80 jra55_gx3,dsectrobin,short restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 16x2x5x10x20 jra55_gx3,drakeX2 restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 8x2x8x10x20 jra55_gx3,droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 +restart gx3 1x4x25x29x16 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 + diff --git a/configuration/scripts/tests/first_suite.ts b/configuration/scripts/tests/first_suite.ts index b06ee7e0b..139306723 100644 --- a/configuration/scripts/tests/first_suite.ts +++ b/configuration/scripts/tests/first_suite.ts @@ -3,3 +3,10 @@ smoke gx3 8x2 diag1,run5day restart gx3 4x2x25x29x4 dslenderX2 logbfb gx3 4x2x25x29x4 dslenderX2,diag1,reprosum smoke gx3 1x2 run2day + +# jra55 +# Test Grid PEs Sets BFB-compare +smoke gx3 8x2 jra55_gx3,diag1,run5day +restart gx3 4x2x25x29x4 jra55_gx3,dslenderX2 +logbfb gx3 4x2x25x29x4 jra55_gx3,dslenderX2,diag1,reprosum +smoke gx3 1x2 jra55_gx3,run2day diff --git a/configuration/scripts/tests/io_suite.ts b/configuration/scripts/tests/io_suite.ts index 3e98642e9..b14e35983 100755 --- a/configuration/scripts/tests/io_suite.ts +++ b/configuration/scripts/tests/io_suite.ts @@ -66,3 +66,73 @@ restart gx3 30x1 bgcskl,histall,iopio2p,precision8,cdf64 restart gx3 8x4 isotope,histall,iopio2p,cdf64 restart gx3 12x2 fsd12,histall,iopio2p,precision8 + +# jra55 +# Test Grid PEs Sets BFB-compare +# some iobinary configurations fail due to bathymetry netcdf file requirement, remove them +restart gx3 8x4 debug,histall,iobinary,precision8 +#restart gx3 12x2 alt01a,histall,iobinary +restart gx3 16x2 alt02,histall,iobinary,precision8 +#restart gx3 4x2 alt03,histall,iobinary +restart gx3 8x4 alt04,histall,iobinary,precision8 +restart gx3 4x4 alt05,histall,iobinary +restart gx3 32x1 bgcz,histall,iobinary,precision8 +restart gx3 16x2 bgcskl,histall,iobinary +restart gx3 14x2 isotope,histall,iobinary,precision8 +restart gx3 16x2 fsd12,histall,iobinary + +restart gx3 32x1 jra55_gx3,debug,histall,ionetcdf +restart gx3 15x2 jra55_gx3,alt01a,histall,ionetcdf,precision8,cdf64 +restart gx3 15x2 jra55_gx3,alt02,histall,ionetcdf +restart gx3 24x1 jra55_gx3,alt03,histall,ionetcdf,precision8 +restart gx3 8x4 jra55_gx3,alt04,histall,ionetcdf,cdf64 +restart gx3 8x4 jra55_gx3,alt05,histall,ionetcdf,precision8,cdf64 +restart gx3 30x1 jra55_gx3,bgcz,histall,ionetcdf +restart gx3 15x2 jra55_gx3,bgcskl,histall,ionetcdf,precision8 +restart gx3 31x1 jra55_gx3,isotope,histall,ionetcdf,cdf64 +restart gx3 14x2 jra55_gx3,fsd12,histall,ionetcdf,precision8 + +restart gx3 16x2 jra55_gx3,debug,histall,iopio1,precision8,cdf64 +restart gx3 14x2 jra55_gx3,alt01a,histall,iopio1,cdf64 +restart gx3 32x1 jra55_gx3,alt02,histall,iopio1,precision8 +restart gx3 24x1 jra55_gx3,alt03,histall,iopio1 +restart gx3 8x4 jra55_gx3,alt04,histall,iopio1,precision8,cdf64 +restart gx3 8x4 jra55_gx3,alt05,histall,iopio1,cdf64 +restart gx3 16x2 jra55_gx3,bgcz,histall,iopio1,precision8 +restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio1 +restart gx3 8x4 jra55_gx3,isotope,histall,iopio1,precision8,cdf64 +restart gx3 12x2 jra55_gx3,fsd12,histall,iopio1,cdf64 + +restart gx3 16x2 jra55_gx3,debug,histall,iopio2 +restart gx3 14x2 jra55_gx3,alt01a,histall,iopio2,precision8,cdf64 +restart gx3 32x1 jra55_gx3,alt02,histall,iopio2,cdf64 +restart gx3 24x1 jra55_gx3,alt03,histall,iopio2,precision8 +restart gx3 8x4 jra55_gx3,alt04,histall,iopio2 +restart gx3 8x4 jra55_gx3,alt05,histall,iopio2,precision8,cdf64 +restart gx3 16x2 jra55_gx3,bgcz,histall,iopio2,cdf64 +restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio2,precision8 +restart gx3 8x4 jra55_gx3,isotope,histall,iopio2 +restart gx3 12x2 jra55_gx3,fsd12,histall,iopio2,precision8,cdf64 + +restart gx3 16x2 jra55_gx3,debug,histall,iopio1p,precision8 +restart gx3 14x2 jra55_gx3,alt01a,histall,iopio1p +restart gx3 32x1 jra55_gx3,alt02,histall,iopio1p,precision8,cdf64 +restart gx3 24x1 jra55_gx3,alt03,histall,iopio1p,cdf64 +restart gx3 8x4 jra55_gx3,alt04,histall,iopio1p,precision8 +restart gx3 8x4 jra55_gx3,alt05,histall,iopio1p +restart gx3 16x2 jra55_gx3,bgcz,histall,iopio1p,precision8,cdf64 +restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio1p,cdf64 +restart gx3 8x4 jra55_gx3,isotope,histall,iopio1p,precision8 +restart gx3 12x2 jra55_gx3,fsd12,histall,iopio1p + +restart gx3 16x2 jra55_gx3,debug,histall,iopio2p,cdf64 +restart gx3 14x2 jra55_gx3,alt01a,histall,iopio2p,precision8 +restart gx3 32x1 jra55_gx3,alt02,histall,iopio2p +restart gx3 24x1 jra55_gx3,alt03,histall,iopio2p,precision8,cdf64 +restart gx3 8x4 jra55_gx3,alt04,histall,iopio2p,cdf64 +restart gx3 8x4 jra55_gx3,alt05,histall,iopio2p,precision8 +restart gx3 16x2 jra55_gx3,bgcz,histall,iopio2p +restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio2p,precision8,cdf64 +restart gx3 8x4 jra55_gx3,isotope,histall,iopio2p,cdf64 +restart gx3 12x2 jra55_gx3,fsd12,histall,iopio2p,precision8 + diff --git a/configuration/scripts/tests/nothread_quicksuite.ts b/configuration/scripts/tests/nothread_quicksuite.ts index 535347438..e3228658b 100644 --- a/configuration/scripts/tests/nothread_quicksuite.ts +++ b/configuration/scripts/tests/nothread_quicksuite.ts @@ -1,6 +1,11 @@ # Test Grid PEs Sets BFB-compare - restart gx3 16x1 diag1 smoke gx3 1x1 debug,diag1,run2day smoke gx3 4x1 debug,diag1,run2day,thread +# jra55 +# Test Grid PEs Sets BFB-compare +restart gx3 16x1 jra55_gx3,diag1 +smoke gx3 1x1 jra55_gx3,debug,diag1,run2day +smoke gx3 4x1 jra55_gx3,debug,diag1,run2day,thread + diff --git a/configuration/scripts/tests/nothread_suite.ts b/configuration/scripts/tests/nothread_suite.ts index 49f834a98..f24db04ca 100644 --- a/configuration/scripts/tests/nothread_suite.ts +++ b/configuration/scripts/tests/nothread_suite.ts @@ -74,3 +74,81 @@ logbfb gx3 20x1x5x29x20 dsectrobin,diag1,short,reprosum logbfb_ logbfb gx3 16x1x8x10x10 droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum logbfb gx3 6x1x50x58x1 droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum logbfb gx3 12x1x4x29x9 dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum + +# jra55 +# Test Grid PEs Sets BFB-compare + +restart gx3 8x1x25x29x2 jra55_gx3,dslenderX2 +logbfb gx3 8x1x25x29x2 jra55_gx3,dslenderX2,diag1,reprosum + +smoke gx3 16x1 jra55_gx3,diag1,run5day +smoke gx3 1x1 jra55_gx3,debug,diag1,run2day +smoke gx3 4x1 jra55_gx3,debug,diag1,run5day,thread +restart gx3 16x1 jra55_gx3,thread +smoke gx3 16x1 jra55_gx3,diag24,run1year,medium + +#tcraig, hangs nodes intermittently on izumi +#restart gx1 160x1 jra55_gx1,droundrobin,medium +#restart tx1 160x1 dsectrobin,medium + +restart gx3 16x1 jra55_gx3,none +restart gx3 16x1 iobinary + +restart gx3 12x1 jra55_gx3,alt01a +restart gx3 16x1 jra55_gx3,alt02 +restart gx3 8x1 jra55_gx3,alt03 +restart gx3 16x1 jra55_gx3,alt04 +restart gx3 16x1 jra55_gx3,alt05 +restart gx3 18x1 jra55_gx3,alt01a,debug,short +restart gx3 20x1 jra55_gx3,alt02,debug,short +restart gx3 24x1 jra55_gx3,alt03,debug,short +smoke gx3 24x1 jra55_gx3,alt04,debug,short +smoke gx3 32x1 jra55_gx3,alt05,debug,short +restart gx3 16x1 jra55_gx3,isotope +smoke gx3 6x1 jra55_gx3,isotope,debug +smoke gx3 8x1 jra55_gx3,fsd1,diag24,run5day,debug +smoke gx3 16x1 jra55_gx3,fsd12,diag24,run5day,short +restart gx3 12x1 jra55_gx3,fsd12,debug,short +smoke gx3 20x1 jra55_gx3,fsd12ww3,diag24,run1day,medium + +restart gbox128 8x1 short +restart gbox128 16x1 boxdyn,short +restart gbox128 24x1 boxdyn,short,debug +restart gbox128 12x1 boxadv,short +smoke gbox128 20x1 boxadv,short,debug +restart gbox128 32x1 boxrestore,short +smoke gbox128 24x1 boxrestore,short,debug +restart gbox80 1x1 box2001 +smoke gbox80 1x1 boxslotcyl + +smoke gx3 16x1 jra55_gx3_2008,medium,run90day +restart gx3 12x1 jra55_gx3,short +#tcraig, hangs nodes intermittently on izumi +#smoke gx1 24x1 jra55_gx1_2008,medium,run90day +#restart gx1 24x1 jra55_gx1,short + +smoke gx3 16x1 jra55_gx3,bgcz +smoke gx3 16x1 jra55_gx3,bgcz,debug +smoke gx3 24x1 jra55_gx3,bgcskl,debug +#tcraig, hangs nodes intermittently on izumi +#restart gx1 128x1 jra55_gx1,bgcsklclim,medium +#restart gx1 256x1 jra55_gx1,bgczclim,medium + +decomp gx3 8x1x5x29x20 jra55_gx3 +restart gx3 1x1x50x58x4 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 4x1x25x116x1 jra55_gx3,dslenderX1 restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 12x1x4x29x9 jra55_gx3,dspacecurve restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 16x1x8x10x10 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 6x1x50x58x1 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 8x1x19x19x5 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 20x1x5x29x20 jra55_gx3,dsectrobin,short restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 32x1x5x10x10 jra55_gx3,drakeX2 restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 16x1x8x10x10 jra55_gx3,droundrobin,maskhalo restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 +restart gx3 4x1x25x29x4 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 + +logbfb gx3 1x1x50x58x4 jra55_gx3,droundrobin,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 4x1x25x116x1 jra55_gx3,dslenderX1,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 20x1x5x29x20 jra55_gx3,dsectrobin,diag1,short,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 16x1x8x10x10 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 6x1x50x58x1 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 12x1x4x29x9 jra55_gx3,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum diff --git a/configuration/scripts/tests/quick_suite.ts b/configuration/scripts/tests/quick_suite.ts index 10595e9ad..f13cbbbc1 100644 --- a/configuration/scripts/tests/quick_suite.ts +++ b/configuration/scripts/tests/quick_suite.ts @@ -4,3 +4,11 @@ smoke gx3 1x1 diag1,run1day restart gbox128 8x1 diag1 restart gx3 4x2 debug,diag1,run5day smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day + +# jra55 +# Test Grid PEs Sets BFB-compare +smoke gx3 8x2 jra55_gx3,diag1,run5day +smoke gx3 1x1 jra55_gx3,diag1,run1day +restart gbox128 8x1 diag1 +restart gx3 4x2 jra55_gx3,debug,diag1,run5day +smoke gx3 4x1 jra55_gx3,diag1,run5day,thread smoke_gx3_8x2_diag1_jra55_gx3_run5day diff --git a/configuration/scripts/tests/reprosum_suite.ts b/configuration/scripts/tests/reprosum_suite.ts index 34cf51a80..672ac9d9e 100644 --- a/configuration/scripts/tests/reprosum_suite.ts +++ b/configuration/scripts/tests/reprosum_suite.ts @@ -9,3 +9,16 @@ logbfb gx3 8x2x8x10x20 droundrobin,diag1,reprosum logbfb_gx3 logbfb gx3 6x2x50x58x1 droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum logbfb gx3 6x2x4x29x18 dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum #logbfb gx3 8x2x8x10x20 droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2 + +# jra55 +# Test Grid PEs Sets BFB-compare +logbfb gx3 4x2x25x29x4 jra55_gx3,dslenderX2,diag1,reprosum +#logbfb gx3 4x2x25x29x4 jra55_gx3,dslenderX2,diag1 +sleep 60 +logbfb gx3 1x1x50x58x4 jra55_gx3,droundrobin,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 4x1x25x116x1 jra55_gx3,dslenderX1,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 1x20x5x29x80 jra55_gx3,dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 8x2x8x10x20 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 6x2x50x58x1 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum +logbfb gx3 6x2x4x29x18 jra55_gx3,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum +#logbfb gx3 8x2x8x10x20 jra55_gx3,droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3 diff --git a/configuration/scripts/tests/travis_suite.ts b/configuration/scripts/tests/travis_suite.ts index 6f475f4c5..e6cfa0def 100644 --- a/configuration/scripts/tests/travis_suite.ts +++ b/configuration/scripts/tests/travis_suite.ts @@ -5,3 +5,12 @@ smoke gx3 2x2 debug,run1day smoke gx3 2x1 run2day,thread smoke_gx3_1x2_run2day restart gx3 2x1 restart gx3 1x2 + +# jra55 +# Test Grid PEs Sets BFB-compare +smoke gx3 1x2 jra55_gx3,run2day +smoke gx3 1x1 jra55_gx3,debug,run1day +smoke gx3 2x2 jra55_gx3,debug,run1day +smoke gx3 2x1 jra55_gx3,run2day,thread smoke_gx3_1x2_jra55_gx3_run2day +restart gx3 2x1 jra55_gx3 +restart gx3 1x2 jra55_gx3 From d7485834fb39e5cf1b59d7055397a97b4b4def13 Mon Sep 17 00:00:00 2001 From: apcraig Date: Tue, 24 Nov 2020 12:34:18 -0700 Subject: [PATCH 2/7] add wget of JRA55_gx3 forcing to travis yml --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8f5aeadc..994079e98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,11 @@ install: # Fetch forcing data - "wget https://zenodo.org/record/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz && - tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz -C ~" + tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz -C ~" + + # Fetch jra55_gx3 forcing data + - "wget https://zenodo.org/record/3728364/files/CICE_data_gx3_forcing_JRA55-20200320.tar.gz && + tar xvfz CICE_data_gx3_forcing_JRA55-20200320.tar.gz -C ~" # Mirror entire data folder #- "lftp ftp://anonymous:travis@travis-ci.org@ftp.cgd.ucar.edu From 990498649756233f0e8a6ee8a8526391ed8cf3d2 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 25 Nov 2020 13:21:44 -0700 Subject: [PATCH 3/7] add set_nml.alt01a --- configuration/scripts/options/set_nml.alt01a | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 configuration/scripts/options/set_nml.alt01a diff --git a/configuration/scripts/options/set_nml.alt01a b/configuration/scripts/options/set_nml.alt01a new file mode 100644 index 000000000..ceec17ddf --- /dev/null +++ b/configuration/scripts/options/set_nml.alt01a @@ -0,0 +1,26 @@ +nilyr = 1 +use_leap_years = .false. +ice_ic = 'default' +restart = .false. +distribution_type = 'roundrobin' +distribution_wght = 'block' +tr_iage = .false. +tr_FY = .false. +tr_lvl = .true. +tr_pond_cesm = .false. +tr_pond_topo = .false. +tr_pond_lvl = .false. +tr_aero = .false. +kcatbound = 1 +kitd = 0 +ktherm = 0 +conduct = 'bubbly' +kdyn = 0 +basalstress = .true. +use_bathymetry = .true. +shortwave = 'ccsm3' +albedo_type = 'constant' +calc_Tsfc = .true. +atm_data_type = 'default' +highfreq = .true. +tfrz_option = 'minus1p8' From b99f510de19911f26b168e7d45963cc4694d598f Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 25 Nov 2020 19:10:36 -0700 Subject: [PATCH 4/7] Update options and tests to make JRA55 the default set_nml.gx3 and set_nml.gx1 are now JRA55 by default get rid of set_nml.jra55* files add set_nml.gx3ncarbulk and set_nml.gx1coreii which invokes prior forcing datasets modify the test suites to do identical tests but with new options, compare to prior implementation by creating a renamed regression baseline via a script and links to generate the new names. Use zz* for the new set_nml options temporarily just to make it easy to generate the new links (the zz ensures the new options are last in the list by alphabet) chmod -x all set_* files for consistency --- configuration/scripts/options/set_env.box2001 | 0 configuration/scripts/options/set_nml.box2001 | 0 configuration/scripts/options/set_nml.gbox80 | 0 configuration/scripts/options/set_nml.gx1 | 13 +- .../scripts/options/set_nml.gx1coreii | 9 + configuration/scripts/options/set_nml.gx3 | 13 +- .../scripts/options/set_nml.gx3ncarbulk | 9 + configuration/scripts/options/set_nml.jra55 | 15 -- .../scripts/options/set_nml.jra55_2008 | 15 -- .../scripts/options/set_nml.jra55_gx1 | 15 -- .../scripts/options/set_nml.jra55_gx1_2008 | 15 -- .../scripts/options/set_nml.jra55_gx3 | 15 -- .../scripts/options/set_nml.jra55_gx3_2008 | 15 -- configuration/scripts/options/set_nml.yi2008 | 3 + configuration/scripts/tests/base_suite.ts | 132 +++++++------- configuration/scripts/tests/decomp_suite.ts | 34 ++-- configuration/scripts/tests/first_suite.ts | 20 +- configuration/scripts/tests/io_suite.ts | 170 ++++++++--------- .../scripts/tests/nothread_quicksuite.ts | 12 +- configuration/scripts/tests/nothread_suite.ts | 172 +++++++++--------- configuration/scripts/tests/quick_suite.ts | 16 +- configuration/scripts/tests/reprosum_suite.ts | 26 +-- configuration/scripts/tests/travis_suite.ts | 22 +-- 23 files changed, 338 insertions(+), 403 deletions(-) mode change 100755 => 100644 configuration/scripts/options/set_env.box2001 mode change 100755 => 100644 configuration/scripts/options/set_nml.box2001 mode change 100755 => 100644 configuration/scripts/options/set_nml.gbox80 create mode 100644 configuration/scripts/options/set_nml.gx1coreii create mode 100644 configuration/scripts/options/set_nml.gx3ncarbulk delete mode 100755 configuration/scripts/options/set_nml.jra55 delete mode 100755 configuration/scripts/options/set_nml.jra55_2008 delete mode 100755 configuration/scripts/options/set_nml.jra55_gx1 delete mode 100755 configuration/scripts/options/set_nml.jra55_gx1_2008 delete mode 100755 configuration/scripts/options/set_nml.jra55_gx3 delete mode 100755 configuration/scripts/options/set_nml.jra55_gx3_2008 create mode 100644 configuration/scripts/options/set_nml.yi2008 diff --git a/configuration/scripts/options/set_env.box2001 b/configuration/scripts/options/set_env.box2001 old mode 100755 new mode 100644 diff --git a/configuration/scripts/options/set_nml.box2001 b/configuration/scripts/options/set_nml.box2001 old mode 100755 new mode 100644 diff --git a/configuration/scripts/options/set_nml.gbox80 b/configuration/scripts/options/set_nml.gbox80 old mode 100755 new mode 100644 diff --git a/configuration/scripts/options/set_nml.gx1 b/configuration/scripts/options/set_nml.gx1 index df6e2cd2b..e1d18dc8b 100644 --- a/configuration/scripts/options/set_nml.gx1 +++ b/configuration/scripts/options/set_nml.gx1 @@ -1,5 +1,8 @@ dt = 3600.0 runtype = 'initial' +year_init = 2005 +use_leap_years = .true. +use_restart_time = .false. ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc' grid_format = 'bin' grid_type = 'displaced_pole' @@ -10,11 +13,9 @@ maskhalo_dyn = .true. maskhalo_remap = .true. maskhalo_bound = .true. fyear_init = 2005 -ycycle = 1 -atm_data_format = 'bin' -atm_data_type = 'LYq' -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/COREII' -precip_units = 'mm_per_sec' +atm_data_format = 'nc' +atm_data_type = 'JRA55_gx1' +atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' +precip_units = 'mks' ocn_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/COREII' bgc_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/WOA/MONTHLY' - diff --git a/configuration/scripts/options/set_nml.gx1coreii b/configuration/scripts/options/set_nml.gx1coreii new file mode 100644 index 000000000..44b334194 --- /dev/null +++ b/configuration/scripts/options/set_nml.gx1coreii @@ -0,0 +1,9 @@ +year_init = 1997 +use_leap_years = .false. +use_restart_time = .true. +fyear_init = 2005 +ycycle = 1 +atm_data_format = 'bin' +atm_data_type = 'LYq' +atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/COREII' +precip_units = 'mm_per_sec' diff --git a/configuration/scripts/options/set_nml.gx3 b/configuration/scripts/options/set_nml.gx3 index 8cdb7e40a..1a2fe62a5 100644 --- a/configuration/scripts/options/set_nml.gx3 +++ b/configuration/scripts/options/set_nml.gx3 @@ -1,15 +1,18 @@ dt = 3600.0 runtype = 'initial' +year_init = 2005 +use_leap_years = .true. +use_restart_time = .false. ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx3/iced_gx3_v5.nc' grid_format = 'bin' grid_type = 'displaced_pole' grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/grid_gx3.bin' kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/kmt_gx3.bin' bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/global_gx3.bathy.nc' -fyear_init = 1997 -atm_data_format = 'bin' -atm_data_type = 'ncar' -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/NCAR_bulk' +fyear_init = 2005 +atm_data_format = 'nc' +atm_data_type = 'JRA55_gx3' +atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/JRA55' +precip_units = 'mks' ocn_data_format = 'bin' ocn_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/' - diff --git a/configuration/scripts/options/set_nml.gx3ncarbulk b/configuration/scripts/options/set_nml.gx3ncarbulk new file mode 100644 index 000000000..fbe0f7ae7 --- /dev/null +++ b/configuration/scripts/options/set_nml.gx3ncarbulk @@ -0,0 +1,9 @@ +year_init = 1997 +use_leap_years = .false. +use_restart_time = .true. +fyear_init = 1997 +atm_data_format = 'bin' +atm_data_type = 'ncar' +atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/NCAR_bulk' +precip_units = 'mm_per_month' + diff --git a/configuration/scripts/options/set_nml.jra55 b/configuration/scripts/options/set_nml.jra55 deleted file mode 100755 index b021efb61..000000000 --- a/configuration/scripts/options/set_nml.jra55 +++ /dev/null @@ -1,15 +0,0 @@ -year_init = 2005 -ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc' -grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/grid_gx1.bin' -kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/kmt_gx1.bin' -bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/global_gx1.bathy.nc' -use_leap_years = .true. -use_restart_time = .false. -maskhalo_dyn = .true. -maskhalo_remap = .true. -maskhalo_bound = .true. -fyear_init = 2005 -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' -atm_data_format = 'nc' -atm_data_type = 'JRA55_gx1' -precip_units = 'mks' diff --git a/configuration/scripts/options/set_nml.jra55_2008 b/configuration/scripts/options/set_nml.jra55_2008 deleted file mode 100755 index bd9a9a5aa..000000000 --- a/configuration/scripts/options/set_nml.jra55_2008 +++ /dev/null @@ -1,15 +0,0 @@ -year_init = 2008 -ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc' -grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/grid_gx1.bin' -kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/kmt_gx1.bin' -bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/global_gx1.bathy.nc' -use_leap_years = .true. -use_restart_time = .false. -maskhalo_dyn = .true. -maskhalo_remap = .true. -maskhalo_bound = .true. -fyear_init = 2008 -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' -atm_data_format = 'nc' -atm_data_type = 'JRA55' -precip_units = 'mks' diff --git a/configuration/scripts/options/set_nml.jra55_gx1 b/configuration/scripts/options/set_nml.jra55_gx1 deleted file mode 100755 index b021efb61..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx1 +++ /dev/null @@ -1,15 +0,0 @@ -year_init = 2005 -ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc' -grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/grid_gx1.bin' -kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/kmt_gx1.bin' -bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/global_gx1.bathy.nc' -use_leap_years = .true. -use_restart_time = .false. -maskhalo_dyn = .true. -maskhalo_remap = .true. -maskhalo_bound = .true. -fyear_init = 2005 -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' -atm_data_format = 'nc' -atm_data_type = 'JRA55_gx1' -precip_units = 'mks' diff --git a/configuration/scripts/options/set_nml.jra55_gx1_2008 b/configuration/scripts/options/set_nml.jra55_gx1_2008 deleted file mode 100755 index 22230b57c..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx1_2008 +++ /dev/null @@ -1,15 +0,0 @@ -year_init = 2008 -ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc' -grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/grid_gx1.bin' -kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/kmt_gx1.bin' -bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/global_gx1.bathy.nc' -use_leap_years = .true. -use_restart_time = .false. -maskhalo_dyn = .true. -maskhalo_remap = .true. -maskhalo_bound = .true. -fyear_init = 2008 -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' -atm_data_format = 'nc' -atm_data_type = 'JRA55_gx1' -precip_units = 'mks' diff --git a/configuration/scripts/options/set_nml.jra55_gx3 b/configuration/scripts/options/set_nml.jra55_gx3 deleted file mode 100755 index b6c0cdeb1..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx3 +++ /dev/null @@ -1,15 +0,0 @@ -year_init = 2005 -ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx3/iced_gx3_v5.nc' -grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/grid_gx3.bin' -kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/kmt_gx3.bin' -bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/global_gx3.bathy.nc' -use_leap_years = .true. -use_restart_time = .false. -maskhalo_dyn = .true. -maskhalo_remap = .true. -maskhalo_bound = .true. -fyear_init = 2005 -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/JRA55' -atm_data_format = 'nc' -atm_data_type = 'JRA55_gx3' -precip_units = 'mks' diff --git a/configuration/scripts/options/set_nml.jra55_gx3_2008 b/configuration/scripts/options/set_nml.jra55_gx3_2008 deleted file mode 100755 index d4749b170..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx3_2008 +++ /dev/null @@ -1,15 +0,0 @@ -year_init = 2008 -ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx3/iced_gx3_v5.nc' -grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/grid_gx3.bin' -kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/kmt_gx3.bin' -bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/global_gx3.bathy.nc' -use_leap_years = .true. -use_restart_time = .false. -maskhalo_dyn = .true. -maskhalo_remap = .true. -maskhalo_bound = .true. -fyear_init = 2008 -atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3/JRA55' -atm_data_format = 'nc' -atm_data_type = 'JRA55_gx3' -precip_units = 'mks' diff --git a/configuration/scripts/options/set_nml.yi2008 b/configuration/scripts/options/set_nml.yi2008 new file mode 100644 index 000000000..ab7a0ecee --- /dev/null +++ b/configuration/scripts/options/set_nml.yi2008 @@ -0,0 +1,3 @@ +year_init = 2008 +fyear_init = 2008 + diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index c5ffec086..302b83dbe 100755 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -1,22 +1,77 @@ # Test Grid PEs Sets BFB-compare +smoke gx3 8x2 zzgx3ncarbulk,diag1,run5day +smoke gx3 1x1 zzgx3ncarbulk,debug,diag1,run2day +smoke gx3 1x4 zzgx3ncarbulk,debug,diag1,run2day +smoke gx3 4x1 zzgx3ncarbulk,debug,diag1,run5day +restart gx3 8x2 zzgx3ncarbulk,debug +smoke gx3 8x2 zzgx3ncarbulk,diag24,run1year,medium +decomp gx3 4x2x25x29x5 zzgx3ncarbulk +smoke gx3 4x2 zzgx3ncarbulk,diag1,run5day smoke_gx3_8x2_diag1_run5day_zzgx3ncarbulk +smoke gx3 4x1 zzgx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_run5day_zzgx3ncarbulk +restart gx1 40x4 zzgx1coreii,droundrobin,medium +restart tx1 40x4 dsectrobin,medium +restart gx3 4x4 zzgx3ncarbulk,none +restart gx3 6x2 zzgx3ncarbulk,alt01 +restart gx3 8x2 zzgx3ncarbulk,alt02 +restart gx3 4x2 zzgx3ncarbulk,alt03 +restart gx3 4x4 zzgx3ncarbulk,alt04 +restart gx3 4x4 zzgx3ncarbulk,alt05 +restart gx3 6x2 zzgx3ncarbulk,alt01,debug,short +restart gx3 8x2 zzgx3ncarbulk,alt02,debug,short +restart gx3 4x2 zzgx3ncarbulk,alt03,debug,short +smoke gx3 4x4 zzgx3ncarbulk,alt04,debug,short +smoke gx3 4x4 zzgx3ncarbulk,alt05,debug,short +restart gbox128 4x2 short +restart gbox128 4x2 boxdyn,short +restart gbox128 4x2 boxdyn,short,debug +restart gbox128 2x2 boxadv,short +smoke gbox128 2x2 boxadv,short,debug +restart gbox128 4x4 boxrestore,short +smoke gbox128 4x4 boxrestore,short,debug +restart gbox80 1x1 box2001 +smoke gbox80 1x1 boxslotcyl +smoke gx3 8x2 zzgx3ncarbulk,bgcz +smoke gx3 8x2 zzgx3ncarbulk,bgcz,debug +smoke gx3 8x1 zzgx3ncarbulk,bgcskl,debug +#smoke gx3 4x1 zzgx3ncarbulk,bgcz,thread smoke_gx3_8x2_bgcz_zzgx3ncarbulk +restart gx1 4x2 zzgx1coreii,bgcsklclim,medium +restart gx1 8x1 zzgx1coreii,bgczclim,medium +smoke gx1 24x1 zzgx1coreii,medium,run90day +smoke gx3 8x1 zzgx3ncarbulk,medium,run90day +restart gx1 24x1 zzgx1coreii,short +restart gx3 8x1 zzgx3ncarbulk,short +smoke gx3 4x2 zzgx3ncarbulk,fsd1,diag24,run5day,debug +smoke gx3 8x2 zzgx3ncarbulk,fsd12,diag24,run5day,short +restart gx3 4x2 zzgx3ncarbulk,fsd12,debug,short +smoke gx3 8x2 zzgx3ncarbulk,fsd12ww3,diag24,run1day,medium +smoke gx3 4x1 zzgx3ncarbulk,isotope,debug +restart gx3 8x2 zzgx3ncarbulk,isotope +restart gx3 4x4 zzgx3ncarbulk,iobinary +restart gx3 4x4 zzgx3ncarbulk,histall,precision8,cdf64 +smoke gx3 30x1 zzgx3ncarbulk,bgcz,histall +smoke gx3 14x2 zzgx3ncarbulk,fsd12,histall +smoke gx3 4x1 zzgx3ncarbulk,dynpicard,medium + +# jra55 +# Test Grid PEs Sets BFB-compare smoke gx3 8x2 diag1,run5day smoke gx3 1x1 debug,diag1,run2day smoke gx3 1x4 debug,diag1,run2day smoke gx3 4x1 debug,diag1,run5day restart gx3 8x2 debug smoke gx3 8x2 diag24,run1year,medium -decomp gx3 4x2x25x29x5 -smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run5day -smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day +decomp gx3 4x2x25x29x5 none +smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run5day +smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day restart gx1 40x4 droundrobin,medium restart tx1 40x4 dsectrobin,medium restart gx3 4x4 none -restart gx3 6x2 alt01 +restart gx3 6x2 alt01a restart gx3 8x2 alt02 restart gx3 4x2 alt03 restart gx3 4x4 alt04 restart gx3 4x4 alt05 -restart gx3 6x2 alt01,debug,short +restart gx3 6x2 alt01a,debug,short restart gx3 8x2 alt02,debug,short restart gx3 4x2 alt03,debug,short smoke gx3 4x4 alt04,debug,short @@ -33,76 +88,21 @@ smoke gbox80 1x1 boxslotcyl smoke gx3 8x2 bgcz smoke gx3 8x2 bgcz,debug smoke gx3 8x1 bgcskl,debug -#smoke gx3 4x1 bgcz,thread smoke_gx3_8x2_bgcz +#smoke gx3 4x1 bgcz,thread smoke_gx3_8x2_bgcz restart gx1 4x2 bgcsklclim,medium restart gx1 8x1 bgczclim,medium -smoke gx1 24x1 jra55_gx1_2008,medium,run90day -smoke gx3 8x1 jra55_gx3_2008,medium,run90day -restart gx1 24x1 jra55_gx1,short -restart gx3 8x1 jra55_gx3,short +smoke gx1 24x1 medium,run90day,zzyi2008 +smoke gx3 8x1 medium,run90day,zzyi2008 +restart gx1 24x1 short +restart gx3 8x1 short smoke gx3 4x2 fsd1,diag24,run5day,debug smoke gx3 8x2 fsd12,diag24,run5day,short restart gx3 4x2 fsd12,debug,short smoke gx3 8x2 fsd12ww3,diag24,run1day,medium smoke gx3 4x1 isotope,debug restart gx3 8x2 isotope -restart gx3 4x4 iobinary +restart gx3 4x4 zzgx3ncarbulk,iobinary restart gx3 4x4 histall,precision8,cdf64 smoke gx3 30x1 bgcz,histall smoke gx3 14x2 fsd12,histall smoke gx3 4x1 dynpicard,medium - -# jra55 -# Test Grid PEs Sets BFB-compare -smoke gx3 8x2 jra55_gx3,diag1,run5day -smoke gx3 1x1 jra55_gx3,debug,diag1,run2day -smoke gx3 1x4 jra55_gx3,debug,diag1,run2day -smoke gx3 4x1 jra55_gx3,debug,diag1,run5day -restart gx3 8x2 jra55_gx3,debug -smoke gx3 8x2 jra55_gx3,diag24,run1year,medium -decomp gx3 4x2x25x29x5 jra55_gx3 -smoke gx3 4x2 jra55_gx3,diag1,run5day smoke_gx3_8x2_diag1_jra55_gx3_run5day -smoke gx3 4x1 jra55_gx3,diag1,run5day,thread smoke_gx3_8x2_diag1_jra55_gx3_run5day -restart gx1 40x4 jra55_gx1,droundrobin,medium -restart tx1 40x4 dsectrobin,medium -restart gx3 4x4 jra55_gx3,none -restart gx3 6x2 jra55_gx3,alt01a -restart gx3 8x2 jra55_gx3,alt02 -restart gx3 4x2 jra55_gx3,alt03 -restart gx3 4x4 jra55_gx3,alt04 -restart gx3 4x4 jra55_gx3,alt05 -restart gx3 6x2 jra55_gx3,alt01a,debug,short -restart gx3 8x2 jra55_gx3,alt02,debug,short -restart gx3 4x2 jra55_gx3,alt03,debug,short -smoke gx3 4x4 jra55_gx3,alt04,debug,short -smoke gx3 4x4 jra55_gx3,alt05,debug,short -restart gbox128 4x2 short -restart gbox128 4x2 boxdyn,short -restart gbox128 4x2 boxdyn,short,debug -restart gbox128 2x2 boxadv,short -smoke gbox128 2x2 boxadv,short,debug -restart gbox128 4x4 boxrestore,short -smoke gbox128 4x4 boxrestore,short,debug -restart gbox80 1x1 box2001 -smoke gbox80 1x1 boxslotcyl -smoke gx3 8x2 jra55_gx3,bgcz -smoke gx3 8x2 jra55_gx3,bgcz,debug -smoke gx3 8x1 jra55_gx3,bgcskl,debug -#smoke gx3 4x1 jra55_gx3,bgcz,thread smoke_gx3_8x2_bgcz -restart gx1 4x2 jra55_gx1,bgcsklclim,medium -restart gx1 8x1 jra55_gx1,bgczclim,medium -smoke gx1 24x1 jra55_gx1_2008,medium,run90day -smoke gx3 8x1 jra55_gx3_2008,medium,run90day -restart gx1 24x1 jra55_gx1,short -restart gx3 8x1 jra55_gx3,short -smoke gx3 4x2 jra55_gx3,fsd1,diag24,run5day,debug -smoke gx3 8x2 jra55_gx3,fsd12,diag24,run5day,short -restart gx3 4x2 jra55_gx3,fsd12,debug,short -smoke gx3 8x2 jra55_gx3,fsd12ww3,diag24,run1day,medium -smoke gx3 4x1 jra55_gx3,isotope,debug -restart gx3 8x2 jra55_gx3,isotope -restart gx3 4x4 iobinary -restart gx3 4x4 jra55_gx3,histall,precision8,cdf64 -smoke gx3 30x1 jra55_gx3,bgcz,histall -smoke gx3 14x2 jra55_gx3,fsd12,histall -smoke gx3 4x1 jra55_gx3,dynpicard,medium diff --git a/configuration/scripts/tests/decomp_suite.ts b/configuration/scripts/tests/decomp_suite.ts index 81f72d01c..9b7a8586b 100644 --- a/configuration/scripts/tests/decomp_suite.ts +++ b/configuration/scripts/tests/decomp_suite.ts @@ -1,6 +1,22 @@ # Test Grid PEs Sets BFB-compare +restart gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2 +decomp gx3 4x2x25x29x5 zzgx3ncarbulk +sleep 30 +restart gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 6x2x4x29x18 zzgx3ncarbulk,dspacecurve restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 6x2x50x58x1 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 4x2x19x19x10 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 1x20x5x29x80 zzgx3ncarbulk,dsectrobin,short restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 16x2x5x10x20 zzgx3ncarbulk,drakeX2 restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 1x4x25x29x16 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk + +# jra55 +# Test Grid PEs Sets BFB-compare restart gx3 4x2x25x29x4 dslenderX2 -decomp gx3 4x2x25x29x5 +decomp gx3 4x2x25x29x5 none sleep 30 restart gx3 1x1x50x58x4 droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2 restart gx3 4x1x25x116x1 dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2 @@ -13,19 +29,3 @@ restart gx3 16x2x5x10x20 drakeX2 restart_gx3_4x2x25x29x4_ restart gx3 8x2x8x10x20 droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2 restart gx3 1x4x25x29x16 droundrobin restart_gx3_4x2x25x29x4_dslenderX2 -# jra55 -# Test Grid PEs Sets BFB-compare -restart gx3 4x2x25x29x4 jra55_gx3,dslenderX2 -decomp gx3 4x2x25x29x5 jra55_gx3 -sleep 30 -restart gx3 1x1x50x58x4 jra55_gx3,droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 4x1x25x116x1 jra55_gx3,dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 6x2x4x29x18 jra55_gx3,dspacecurve restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 8x2x8x10x20 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 6x2x50x58x1 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 4x2x19x19x10 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 1x20x5x29x80 jra55_gx3,dsectrobin,short restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 16x2x5x10x20 jra55_gx3,drakeX2 restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 8x2x8x10x20 jra55_gx3,droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 -restart gx3 1x4x25x29x16 jra55_gx3,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_jra55_gx3 - diff --git a/configuration/scripts/tests/first_suite.ts b/configuration/scripts/tests/first_suite.ts index 139306723..62bde61b2 100644 --- a/configuration/scripts/tests/first_suite.ts +++ b/configuration/scripts/tests/first_suite.ts @@ -1,12 +1,12 @@ -# Test Grid PEs Sets BFB-compare -smoke gx3 8x2 diag1,run5day -restart gx3 4x2x25x29x4 dslenderX2 -logbfb gx3 4x2x25x29x4 dslenderX2,diag1,reprosum -smoke gx3 1x2 run2day +# Test Grid PEs Sets BFB-compare +smoke gx3 8x2 zzgx3ncarbulk,diag1,run5day +restart gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2 +logbfb gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2,diag1,reprosum +smoke gx3 1x2 zzgx3ncarbulk,run2day # jra55 -# Test Grid PEs Sets BFB-compare -smoke gx3 8x2 jra55_gx3,diag1,run5day -restart gx3 4x2x25x29x4 jra55_gx3,dslenderX2 -logbfb gx3 4x2x25x29x4 jra55_gx3,dslenderX2,diag1,reprosum -smoke gx3 1x2 jra55_gx3,run2day +# Test Grid PEs Sets BFB-compare +smoke gx3 8x2 diag1,run5day +restart gx3 4x2x25x29x4 dslenderX2 +logbfb gx3 4x2x25x29x4 dslenderX2,diag1,reprosum +smoke gx3 1x2 run2day diff --git a/configuration/scripts/tests/io_suite.ts b/configuration/scripts/tests/io_suite.ts index b14e35983..5d009a37d 100755 --- a/configuration/scripts/tests/io_suite.ts +++ b/configuration/scripts/tests/io_suite.ts @@ -1,18 +1,88 @@ # Test Grid PEs Sets BFB-compare # some iobinary configurations fail due to bathymetry netcdf file requirement, remove them -restart gx3 8x4 debug,histall,iobinary,precision8 -#restart gx3 12x2 alt01,histall,iobinary -restart gx3 16x2 alt02,histall,iobinary,precision8 -#restart gx3 4x2 alt03,histall,iobinary -restart gx3 8x4 alt04,histall,iobinary,precision8 -restart gx3 4x4 alt05,histall,iobinary -restart gx3 32x1 bgcz,histall,iobinary,precision8 -restart gx3 16x2 bgcskl,histall,iobinary -restart gx3 14x2 isotope,histall,iobinary,precision8 -restart gx3 16x2 fsd12,histall,iobinary +restart gx3 8x4 zzgx3ncarbulk,debug,histall,iobinary,precision8 +#restart gx3 12x2 zzgx3ncarbulk,alt01,histall,iobinary +restart gx3 16x2 zzgx3ncarbulk,alt02,histall,iobinary,precision8 +#restart gx3 4x2 zzgx3ncarbulk,alt03,histall,iobinary +restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iobinary,precision8 +restart gx3 4x4 zzgx3ncarbulk,alt05,histall,iobinary +restart gx3 32x1 zzgx3ncarbulk,bgcz,histall,iobinary,precision8 +restart gx3 16x2 zzgx3ncarbulk,bgcskl,histall,iobinary +restart gx3 14x2 zzgx3ncarbulk,isotope,histall,iobinary,precision8 +restart gx3 16x2 zzgx3ncarbulk,fsd12,histall,iobinary + +restart gx3 32x1 zzgx3ncarbulk,debug,histall,ionetcdf +restart gx3 15x2 zzgx3ncarbulk,alt01,histall,ionetcdf,precision8,cdf64 +restart gx3 15x2 zzgx3ncarbulk,alt02,histall,ionetcdf +restart gx3 24x1 zzgx3ncarbulk,alt03,histall,ionetcdf,precision8 +restart gx3 8x4 zzgx3ncarbulk,alt04,histall,ionetcdf,cdf64 +restart gx3 8x4 zzgx3ncarbulk,alt05,histall,ionetcdf,precision8,cdf64 +restart gx3 30x1 zzgx3ncarbulk,bgcz,histall,ionetcdf +restart gx3 15x2 zzgx3ncarbulk,bgcskl,histall,ionetcdf,precision8 +restart gx3 31x1 zzgx3ncarbulk,isotope,histall,ionetcdf,cdf64 +restart gx3 14x2 zzgx3ncarbulk,fsd12,histall,ionetcdf,precision8 + +restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio1,precision8,cdf64 +restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio1,cdf64 +restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio1,precision8 +restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio1 +restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio1,precision8,cdf64 +restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio1,cdf64 +restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio1,precision8 +restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio1 +restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio1,precision8,cdf64 +restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio1,cdf64 + +restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio2 +restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio2,precision8,cdf64 +restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio2,cdf64 +restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio2,precision8 +restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio2 +restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio2,precision8,cdf64 +restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio2,cdf64 +restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio2,precision8 +restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio2 +restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio2,precision8,cdf64 + +restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio1p,precision8 +restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio1p +restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio1p,precision8,cdf64 +restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio1p,cdf64 +restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio1p,precision8 +restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio1p +restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio1p,precision8,cdf64 +restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio1p,cdf64 +restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio1p,precision8 +restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio1p + +restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio2p,cdf64 +restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio2p,precision8 +restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio2p +restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio2p,precision8,cdf64 +restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio2p,cdf64 +restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio2p,precision8 +restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio2p +restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio2p,precision8,cdf64 +restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio2p,cdf64 +restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio2p,precision8 + + +# jra55 +# Test Grid PEs Sets BFB-compare +# some iobinary configurations fail due to bathymetry netcdf file requirement, remove them +restart gx3 8x4 zzgx3ncarbulk,debug,histall,iobinary,precision8 +#restart gx3 12x2 zzgx3ncarbulk,alt01a,histall,iobinary +restart gx3 16x2 zzgx3ncarbulk,alt02,histall,iobinary,precision8 +#restart gx3 4x2 zzgx3ncarbulk,alt03,histall,iobinary +restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iobinary,precision8 +restart gx3 4x4 zzgx3ncarbulk,alt05,histall,iobinary +restart gx3 32x1 zzgx3ncarbulk,bgcz,histall,iobinary,precision8 +restart gx3 16x2 zzgx3ncarbulk,bgcskl,histall,iobinary +restart gx3 14x2 zzgx3ncarbulk,isotope,histall,iobinary,precision8 +restart gx3 16x2 zzgx3ncarbulk,fsd12,histall,iobinary restart gx3 32x1 debug,histall,ionetcdf -restart gx3 15x2 alt01,histall,ionetcdf,precision8,cdf64 +restart gx3 15x2 alt01a,histall,ionetcdf,precision8,cdf64 restart gx3 15x2 alt02,histall,ionetcdf restart gx3 24x1 alt03,histall,ionetcdf,precision8 restart gx3 8x4 alt04,histall,ionetcdf,cdf64 @@ -23,7 +93,7 @@ restart gx3 31x1 isotope,histall,ionetcdf,cdf64 restart gx3 14x2 fsd12,histall,ionetcdf,precision8 restart gx3 16x2 debug,histall,iopio1,precision8,cdf64 -restart gx3 14x2 alt01,histall,iopio1,cdf64 +restart gx3 14x2 alt01a,histall,iopio1,cdf64 restart gx3 32x1 alt02,histall,iopio1,precision8 restart gx3 24x1 alt03,histall,iopio1 restart gx3 8x4 alt04,histall,iopio1,precision8,cdf64 @@ -34,7 +104,7 @@ restart gx3 8x4 isotope,histall,iopio1,precision8,cdf64 restart gx3 12x2 fsd12,histall,iopio1,cdf64 restart gx3 16x2 debug,histall,iopio2 -restart gx3 14x2 alt01,histall,iopio2,precision8,cdf64 +restart gx3 14x2 alt01a,histall,iopio2,precision8,cdf64 restart gx3 32x1 alt02,histall,iopio2,cdf64 restart gx3 24x1 alt03,histall,iopio2,precision8 restart gx3 8x4 alt04,histall,iopio2 @@ -45,7 +115,7 @@ restart gx3 8x4 isotope,histall,iopio2 restart gx3 12x2 fsd12,histall,iopio2,precision8,cdf64 restart gx3 16x2 debug,histall,iopio1p,precision8 -restart gx3 14x2 alt01,histall,iopio1p +restart gx3 14x2 alt01a,histall,iopio1p restart gx3 32x1 alt02,histall,iopio1p,precision8,cdf64 restart gx3 24x1 alt03,histall,iopio1p,cdf64 restart gx3 8x4 alt04,histall,iopio1p,precision8 @@ -56,7 +126,7 @@ restart gx3 8x4 isotope,histall,iopio1p,precision8 restart gx3 12x2 fsd12,histall,iopio1p restart gx3 16x2 debug,histall,iopio2p,cdf64 -restart gx3 14x2 alt01,histall,iopio2p,precision8 +restart gx3 14x2 alt01a,histall,iopio2p,precision8 restart gx3 32x1 alt02,histall,iopio2p restart gx3 24x1 alt03,histall,iopio2p,precision8,cdf64 restart gx3 8x4 alt04,histall,iopio2p,cdf64 @@ -66,73 +136,3 @@ restart gx3 30x1 bgcskl,histall,iopio2p,precision8,cdf64 restart gx3 8x4 isotope,histall,iopio2p,cdf64 restart gx3 12x2 fsd12,histall,iopio2p,precision8 - -# jra55 -# Test Grid PEs Sets BFB-compare -# some iobinary configurations fail due to bathymetry netcdf file requirement, remove them -restart gx3 8x4 debug,histall,iobinary,precision8 -#restart gx3 12x2 alt01a,histall,iobinary -restart gx3 16x2 alt02,histall,iobinary,precision8 -#restart gx3 4x2 alt03,histall,iobinary -restart gx3 8x4 alt04,histall,iobinary,precision8 -restart gx3 4x4 alt05,histall,iobinary -restart gx3 32x1 bgcz,histall,iobinary,precision8 -restart gx3 16x2 bgcskl,histall,iobinary -restart gx3 14x2 isotope,histall,iobinary,precision8 -restart gx3 16x2 fsd12,histall,iobinary - -restart gx3 32x1 jra55_gx3,debug,histall,ionetcdf -restart gx3 15x2 jra55_gx3,alt01a,histall,ionetcdf,precision8,cdf64 -restart gx3 15x2 jra55_gx3,alt02,histall,ionetcdf -restart gx3 24x1 jra55_gx3,alt03,histall,ionetcdf,precision8 -restart gx3 8x4 jra55_gx3,alt04,histall,ionetcdf,cdf64 -restart gx3 8x4 jra55_gx3,alt05,histall,ionetcdf,precision8,cdf64 -restart gx3 30x1 jra55_gx3,bgcz,histall,ionetcdf -restart gx3 15x2 jra55_gx3,bgcskl,histall,ionetcdf,precision8 -restart gx3 31x1 jra55_gx3,isotope,histall,ionetcdf,cdf64 -restart gx3 14x2 jra55_gx3,fsd12,histall,ionetcdf,precision8 - -restart gx3 16x2 jra55_gx3,debug,histall,iopio1,precision8,cdf64 -restart gx3 14x2 jra55_gx3,alt01a,histall,iopio1,cdf64 -restart gx3 32x1 jra55_gx3,alt02,histall,iopio1,precision8 -restart gx3 24x1 jra55_gx3,alt03,histall,iopio1 -restart gx3 8x4 jra55_gx3,alt04,histall,iopio1,precision8,cdf64 -restart gx3 8x4 jra55_gx3,alt05,histall,iopio1,cdf64 -restart gx3 16x2 jra55_gx3,bgcz,histall,iopio1,precision8 -restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio1 -restart gx3 8x4 jra55_gx3,isotope,histall,iopio1,precision8,cdf64 -restart gx3 12x2 jra55_gx3,fsd12,histall,iopio1,cdf64 - -restart gx3 16x2 jra55_gx3,debug,histall,iopio2 -restart gx3 14x2 jra55_gx3,alt01a,histall,iopio2,precision8,cdf64 -restart gx3 32x1 jra55_gx3,alt02,histall,iopio2,cdf64 -restart gx3 24x1 jra55_gx3,alt03,histall,iopio2,precision8 -restart gx3 8x4 jra55_gx3,alt04,histall,iopio2 -restart gx3 8x4 jra55_gx3,alt05,histall,iopio2,precision8,cdf64 -restart gx3 16x2 jra55_gx3,bgcz,histall,iopio2,cdf64 -restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio2,precision8 -restart gx3 8x4 jra55_gx3,isotope,histall,iopio2 -restart gx3 12x2 jra55_gx3,fsd12,histall,iopio2,precision8,cdf64 - -restart gx3 16x2 jra55_gx3,debug,histall,iopio1p,precision8 -restart gx3 14x2 jra55_gx3,alt01a,histall,iopio1p -restart gx3 32x1 jra55_gx3,alt02,histall,iopio1p,precision8,cdf64 -restart gx3 24x1 jra55_gx3,alt03,histall,iopio1p,cdf64 -restart gx3 8x4 jra55_gx3,alt04,histall,iopio1p,precision8 -restart gx3 8x4 jra55_gx3,alt05,histall,iopio1p -restart gx3 16x2 jra55_gx3,bgcz,histall,iopio1p,precision8,cdf64 -restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio1p,cdf64 -restart gx3 8x4 jra55_gx3,isotope,histall,iopio1p,precision8 -restart gx3 12x2 jra55_gx3,fsd12,histall,iopio1p - -restart gx3 16x2 jra55_gx3,debug,histall,iopio2p,cdf64 -restart gx3 14x2 jra55_gx3,alt01a,histall,iopio2p,precision8 -restart gx3 32x1 jra55_gx3,alt02,histall,iopio2p -restart gx3 24x1 jra55_gx3,alt03,histall,iopio2p,precision8,cdf64 -restart gx3 8x4 jra55_gx3,alt04,histall,iopio2p,cdf64 -restart gx3 8x4 jra55_gx3,alt05,histall,iopio2p,precision8 -restart gx3 16x2 jra55_gx3,bgcz,histall,iopio2p -restart gx3 30x1 jra55_gx3,bgcskl,histall,iopio2p,precision8,cdf64 -restart gx3 8x4 jra55_gx3,isotope,histall,iopio2p,cdf64 -restart gx3 12x2 jra55_gx3,fsd12,histall,iopio2p,precision8 - diff --git a/configuration/scripts/tests/nothread_quicksuite.ts b/configuration/scripts/tests/nothread_quicksuite.ts index e3228658b..6ce073e4c 100644 --- a/configuration/scripts/tests/nothread_quicksuite.ts +++ b/configuration/scripts/tests/nothread_quicksuite.ts @@ -1,11 +1,11 @@ # Test Grid PEs Sets BFB-compare -restart gx3 16x1 diag1 -smoke gx3 1x1 debug,diag1,run2day -smoke gx3 4x1 debug,diag1,run2day,thread +restart gx3 16x1 zzgx3ncarbulk,diag1 +smoke gx3 1x1 zzgx3ncarbulk,debug,diag1,run2day +smoke gx3 4x1 zzgx3ncarbulk,debug,diag1,run2day,thread # jra55 # Test Grid PEs Sets BFB-compare -restart gx3 16x1 jra55_gx3,diag1 -smoke gx3 1x1 jra55_gx3,debug,diag1,run2day -smoke gx3 4x1 jra55_gx3,debug,diag1,run2day,thread +restart gx3 16x1 diag1 +smoke gx3 1x1 debug,diag1,run2day +smoke gx3 4x1 debug,diag1,run2day,thread diff --git a/configuration/scripts/tests/nothread_suite.ts b/configuration/scripts/tests/nothread_suite.ts index f24db04ca..fd816a90f 100644 --- a/configuration/scripts/tests/nothread_suite.ts +++ b/configuration/scripts/tests/nothread_suite.ts @@ -1,5 +1,83 @@ # Test Grid PEs Sets BFB-compare +restart gx3 8x1x25x29x2 zzgx3ncarbulk,dslenderX2 +logbfb gx3 8x1x25x29x2 zzgx3ncarbulk,dslenderX2,diag1,reprosum + +smoke gx3 16x1 zzgx3ncarbulk,diag1,run5day +smoke gx3 1x1 zzgx3ncarbulk,debug,diag1,run2day +smoke gx3 4x1 zzgx3ncarbulk,debug,diag1,run5day,thread +restart gx3 16x1 zzgx3ncarbulk,thread +smoke gx3 16x1 zzgx3ncarbulk,diag24,run1year,medium + +#tcraig, hangs nodes intermittently on izumi +#restart gx1 160x1 zzgx1coreii,droundrobin,medium +#restart tx1 160x1 dsectrobin,medium + +restart gx3 16x1 zzgx3ncarbulk,none +restart gx3 16x1 zzgx3ncarbulk,iobinary + +restart gx3 12x1 zzgx3ncarbulk,alt01 +restart gx3 16x1 zzgx3ncarbulk,alt02 +restart gx3 8x1 zzgx3ncarbulk,alt03 +restart gx3 16x1 zzgx3ncarbulk,alt04 +restart gx3 16x1 zzgx3ncarbulk,alt05 +restart gx3 18x1 zzgx3ncarbulk,alt01,debug,short +restart gx3 20x1 zzgx3ncarbulk,alt02,debug,short +restart gx3 24x1 zzgx3ncarbulk,alt03,debug,short +smoke gx3 24x1 zzgx3ncarbulk,alt04,debug,short +smoke gx3 32x1 zzgx3ncarbulk,alt05,debug,short +restart gx3 16x1 zzgx3ncarbulk,isotope +smoke gx3 6x1 zzgx3ncarbulk,isotope,debug +smoke gx3 8x1 zzgx3ncarbulk,fsd1,diag24,run5day,debug +smoke gx3 16x1 zzgx3ncarbulk,fsd12,diag24,run5day,short +restart gx3 12x1 zzgx3ncarbulk,fsd12,debug,short +smoke gx3 20x1 zzgx3ncarbulk,fsd12ww3,diag24,run1day,medium + +restart gbox128 8x1 short +restart gbox128 16x1 boxdyn,short +restart gbox128 24x1 boxdyn,short,debug +restart gbox128 12x1 boxadv,short +smoke gbox128 20x1 boxadv,short,debug +restart gbox128 32x1 boxrestore,short +smoke gbox128 24x1 boxrestore,short,debug +restart gbox80 1x1 box2001 +smoke gbox80 1x1 boxslotcyl + +smoke gx3 16x1 medium,run90day,zzyi2008 +restart gx3 12x1 short +#tcraig, hangs nodes intermittently on izumi +#smoke gx1 24x1 medium,run90day,zzyi2008 +#restart gx1 24x1 short + +smoke gx3 16x1 zzgx3ncarbulk,bgcz +smoke gx3 16x1 zzgx3ncarbulk,bgcz,debug +smoke gx3 24x1 zzgx3ncarbulk,bgcskl,debug +#tcraig, hangs nodes intermittently on izumi +#restart gx1 128x1 zzgx3ncarbulk,bgcsklclim,medium +#restart gx1 256x1 zzgx3ncarbulk,bgczclim,medium + +decomp gx3 8x1x5x29x20 zzgx3ncarbulk +restart gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1 restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 12x1x4x29x9 zzgx3ncarbulk,dspacecurve restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 16x1x8x10x10 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 6x1x50x58x1 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 8x1x19x19x5 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 20x1x5x29x20 zzgx3ncarbulk,dsectrobin,short restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 32x1x5x10x10 zzgx3ncarbulk,drakeX2 restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 16x1x8x10x10 zzgx3ncarbulk,droundrobin,maskhalo restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk +restart gx3 4x1x25x29x4 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk + +logbfb gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 20x1x5x29x20 zzgx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 16x1x8x10x10 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 6x1x50x58x1 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 12x1x4x29x9 zzgx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk + +# jra55 +# Test Grid PEs Sets BFB-compare + restart gx3 8x1x25x29x2 dslenderX2 logbfb gx3 8x1x25x29x2 dslenderX2,diag1,reprosum @@ -14,14 +92,14 @@ smoke gx3 16x1 diag24,run1year,medium #restart tx1 160x1 dsectrobin,medium restart gx3 16x1 none -restart gx3 16x1 iobinary +restart gx3 16x1 zzgx3ncarbulk,iobinary -restart gx3 12x1 alt01 +restart gx3 12x1 alt01a restart gx3 16x1 alt02 restart gx3 8x1 alt03 restart gx3 16x1 alt04 restart gx3 16x1 alt05 -restart gx3 18x1 alt01,debug,short +restart gx3 18x1 alt01a,debug,short restart gx3 20x1 alt02,debug,short restart gx3 24x1 alt03,debug,short smoke gx3 24x1 alt04,debug,short @@ -43,11 +121,11 @@ smoke gbox128 24x1 boxrestore,short,debug restart gbox80 1x1 box2001 smoke gbox80 1x1 boxslotcyl -smoke gx3 16x1 jra55_gx3_2008,medium,run90day -restart gx3 12x1 jra55_gx3,short +smoke gx3 16x1 medium,run90day,zzyi2008 +restart gx3 12x1 short #tcraig, hangs nodes intermittently on izumi -#smoke gx1 24x1 jra55_gx1_2008,medium,run90day -#restart gx1 24x1 jra55_gx1,short +#smoke gx1 24x1 medium,run90day,zzyi2008 +#restart gx1 24x1 short smoke gx3 16x1 bgcz smoke gx3 16x1 bgcz,debug @@ -56,7 +134,7 @@ smoke gx3 24x1 bgcskl,debug #restart gx1 128x1 bgcsklclim,medium #restart gx1 256x1 bgczclim,medium -decomp gx3 8x1x5x29x20 +decomp gx3 8x1x5x29x20 none restart gx3 1x1x50x58x4 droundrobin restart_gx3_8x1x25x29x2_dslenderX2 restart gx3 4x1x25x116x1 dslenderX1 restart_gx3_8x1x25x29x2_dslenderX2 restart gx3 12x1x4x29x9 dspacecurve restart_gx3_8x1x25x29x2_dslenderX2 @@ -74,81 +152,3 @@ logbfb gx3 20x1x5x29x20 dsectrobin,diag1,short,reprosum logbfb_ logbfb gx3 16x1x8x10x10 droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum logbfb gx3 6x1x50x58x1 droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum logbfb gx3 12x1x4x29x9 dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum - -# jra55 -# Test Grid PEs Sets BFB-compare - -restart gx3 8x1x25x29x2 jra55_gx3,dslenderX2 -logbfb gx3 8x1x25x29x2 jra55_gx3,dslenderX2,diag1,reprosum - -smoke gx3 16x1 jra55_gx3,diag1,run5day -smoke gx3 1x1 jra55_gx3,debug,diag1,run2day -smoke gx3 4x1 jra55_gx3,debug,diag1,run5day,thread -restart gx3 16x1 jra55_gx3,thread -smoke gx3 16x1 jra55_gx3,diag24,run1year,medium - -#tcraig, hangs nodes intermittently on izumi -#restart gx1 160x1 jra55_gx1,droundrobin,medium -#restart tx1 160x1 dsectrobin,medium - -restart gx3 16x1 jra55_gx3,none -restart gx3 16x1 iobinary - -restart gx3 12x1 jra55_gx3,alt01a -restart gx3 16x1 jra55_gx3,alt02 -restart gx3 8x1 jra55_gx3,alt03 -restart gx3 16x1 jra55_gx3,alt04 -restart gx3 16x1 jra55_gx3,alt05 -restart gx3 18x1 jra55_gx3,alt01a,debug,short -restart gx3 20x1 jra55_gx3,alt02,debug,short -restart gx3 24x1 jra55_gx3,alt03,debug,short -smoke gx3 24x1 jra55_gx3,alt04,debug,short -smoke gx3 32x1 jra55_gx3,alt05,debug,short -restart gx3 16x1 jra55_gx3,isotope -smoke gx3 6x1 jra55_gx3,isotope,debug -smoke gx3 8x1 jra55_gx3,fsd1,diag24,run5day,debug -smoke gx3 16x1 jra55_gx3,fsd12,diag24,run5day,short -restart gx3 12x1 jra55_gx3,fsd12,debug,short -smoke gx3 20x1 jra55_gx3,fsd12ww3,diag24,run1day,medium - -restart gbox128 8x1 short -restart gbox128 16x1 boxdyn,short -restart gbox128 24x1 boxdyn,short,debug -restart gbox128 12x1 boxadv,short -smoke gbox128 20x1 boxadv,short,debug -restart gbox128 32x1 boxrestore,short -smoke gbox128 24x1 boxrestore,short,debug -restart gbox80 1x1 box2001 -smoke gbox80 1x1 boxslotcyl - -smoke gx3 16x1 jra55_gx3_2008,medium,run90day -restart gx3 12x1 jra55_gx3,short -#tcraig, hangs nodes intermittently on izumi -#smoke gx1 24x1 jra55_gx1_2008,medium,run90day -#restart gx1 24x1 jra55_gx1,short - -smoke gx3 16x1 jra55_gx3,bgcz -smoke gx3 16x1 jra55_gx3,bgcz,debug -smoke gx3 24x1 jra55_gx3,bgcskl,debug -#tcraig, hangs nodes intermittently on izumi -#restart gx1 128x1 jra55_gx1,bgcsklclim,medium -#restart gx1 256x1 jra55_gx1,bgczclim,medium - -decomp gx3 8x1x5x29x20 jra55_gx3 -restart gx3 1x1x50x58x4 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 4x1x25x116x1 jra55_gx3,dslenderX1 restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 12x1x4x29x9 jra55_gx3,dspacecurve restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 16x1x8x10x10 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 6x1x50x58x1 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 8x1x19x19x5 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 20x1x5x29x20 jra55_gx3,dsectrobin,short restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 32x1x5x10x10 jra55_gx3,drakeX2 restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 16x1x8x10x10 jra55_gx3,droundrobin,maskhalo restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 -restart gx3 4x1x25x29x4 jra55_gx3,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_jra55_gx3 - -logbfb gx3 1x1x50x58x4 jra55_gx3,droundrobin,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 4x1x25x116x1 jra55_gx3,dslenderX1,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 20x1x5x29x20 jra55_gx3,dsectrobin,diag1,short,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 16x1x8x10x10 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 6x1x50x58x1 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 12x1x4x29x9 jra55_gx3,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_jra55_gx3_reprosum diff --git a/configuration/scripts/tests/quick_suite.ts b/configuration/scripts/tests/quick_suite.ts index f13cbbbc1..2010d6d29 100644 --- a/configuration/scripts/tests/quick_suite.ts +++ b/configuration/scripts/tests/quick_suite.ts @@ -1,14 +1,14 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 diag1,run5day -smoke gx3 1x1 diag1,run1day +smoke gx3 8x2 zzgx3ncarbulk,diag1,run5day +smoke gx3 1x1 zzgx3ncarbulk,diag1,run1day restart gbox128 8x1 diag1 -restart gx3 4x2 debug,diag1,run5day -smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day +restart gx3 4x2 zzgx3ncarbulk,debug,diag1,run5day +smoke gx3 4x1 zzgx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_run5day_zzgx3ncarbulk # jra55 # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 jra55_gx3,diag1,run5day -smoke gx3 1x1 jra55_gx3,diag1,run1day +smoke gx3 8x2 diag1,run5day +smoke gx3 1x1 diag1,run1day restart gbox128 8x1 diag1 -restart gx3 4x2 jra55_gx3,debug,diag1,run5day -smoke gx3 4x1 jra55_gx3,diag1,run5day,thread smoke_gx3_8x2_diag1_jra55_gx3_run5day +restart gx3 4x2 debug,diag1,run5day +smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day diff --git a/configuration/scripts/tests/reprosum_suite.ts b/configuration/scripts/tests/reprosum_suite.ts index 672ac9d9e..6a1ef426c 100644 --- a/configuration/scripts/tests/reprosum_suite.ts +++ b/configuration/scripts/tests/reprosum_suite.ts @@ -1,4 +1,17 @@ # Test Grid PEs Sets BFB-compare +logbfb gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2,diag1,reprosum +#logbfb gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2,diag1 +sleep 60 +logbfb gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 1x20x5x29x80 zzgx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 6x2x50x58x1 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk +logbfb gx3 6x2x4x29x18 zzgx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk +#logbfb gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_zzgx3ncarbulk + +# jra55 +# Test Grid PEs Sets BFB-compare logbfb gx3 4x2x25x29x4 dslenderX2,diag1,reprosum #logbfb gx3 4x2x25x29x4 dslenderX2,diag1 sleep 60 @@ -9,16 +22,3 @@ logbfb gx3 8x2x8x10x20 droundrobin,diag1,reprosum logbfb_gx3 logbfb gx3 6x2x50x58x1 droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum logbfb gx3 6x2x4x29x18 dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum #logbfb gx3 8x2x8x10x20 droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2 - -# jra55 -# Test Grid PEs Sets BFB-compare -logbfb gx3 4x2x25x29x4 jra55_gx3,dslenderX2,diag1,reprosum -#logbfb gx3 4x2x25x29x4 jra55_gx3,dslenderX2,diag1 -sleep 60 -logbfb gx3 1x1x50x58x4 jra55_gx3,droundrobin,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 4x1x25x116x1 jra55_gx3,dslenderX1,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 1x20x5x29x80 jra55_gx3,dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 8x2x8x10x20 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 6x2x50x58x1 jra55_gx3,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum -logbfb gx3 6x2x4x29x18 jra55_gx3,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3_reprosum -#logbfb gx3 8x2x8x10x20 jra55_gx3,droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_jra55_gx3 diff --git a/configuration/scripts/tests/travis_suite.ts b/configuration/scripts/tests/travis_suite.ts index e6cfa0def..a7f0d72a1 100644 --- a/configuration/scripts/tests/travis_suite.ts +++ b/configuration/scripts/tests/travis_suite.ts @@ -1,16 +1,16 @@ # Test Grid PEs Sets BFB-compare +smoke gx3 1x2 zzgx3ncarbulk,run2day +smoke gx3 1x1 zzgx3ncarbulk,debug,run1day +smoke gx3 2x2 zzgx3ncarbulk,debug,run1day +smoke gx3 2x1 zzgx3ncarbulk,run2day,thread smoke_gx3_1x2_run2day_zzgx3ncarbulk +restart gx3 2x1 zzgx3ncarbulk +restart gx3 1x2 zzgx3ncarbulk + +# jra55 +# Test Grid PEs Sets BFB-compare smoke gx3 1x2 run2day smoke gx3 1x1 debug,run1day smoke gx3 2x2 debug,run1day smoke gx3 2x1 run2day,thread smoke_gx3_1x2_run2day -restart gx3 2x1 -restart gx3 1x2 - -# jra55 -# Test Grid PEs Sets BFB-compare -smoke gx3 1x2 jra55_gx3,run2day -smoke gx3 1x1 jra55_gx3,debug,run1day -smoke gx3 2x2 jra55_gx3,debug,run1day -smoke gx3 2x1 jra55_gx3,run2day,thread smoke_gx3_1x2_jra55_gx3_run2day -restart gx3 2x1 jra55_gx3 -restart gx3 1x2 jra55_gx3 +restart gx3 2x1 +restart gx3 1x2 From 97b11eac6673ee2fc03f893fbb03e28847bb5f37 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 26 Nov 2020 11:48:10 -0700 Subject: [PATCH 5/7] rename zz test options this is done as a clean separate step so new baselines can be established to continue to evolve the test cases and allow regression testing --- configuration/scripts/tests/base_suite.ts | 92 ++++++------ configuration/scripts/tests/decomp_suite.ts | 24 +-- configuration/scripts/tests/first_suite.ts | 8 +- configuration/scripts/tests/io_suite.ts | 140 +++++++++--------- .../scripts/tests/nothread_quicksuite.ts | 6 +- configuration/scripts/tests/nothread_suite.ts | 112 +++++++------- configuration/scripts/tests/quick_suite.ts | 8 +- configuration/scripts/tests/reprosum_suite.ts | 26 ++-- configuration/scripts/tests/travis_suite.ts | 12 +- 9 files changed, 214 insertions(+), 214 deletions(-) diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index 302b83dbe..f4936fef2 100755 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -1,26 +1,26 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 zzgx3ncarbulk,diag1,run5day -smoke gx3 1x1 zzgx3ncarbulk,debug,diag1,run2day -smoke gx3 1x4 zzgx3ncarbulk,debug,diag1,run2day -smoke gx3 4x1 zzgx3ncarbulk,debug,diag1,run5day -restart gx3 8x2 zzgx3ncarbulk,debug -smoke gx3 8x2 zzgx3ncarbulk,diag24,run1year,medium -decomp gx3 4x2x25x29x5 zzgx3ncarbulk -smoke gx3 4x2 zzgx3ncarbulk,diag1,run5day smoke_gx3_8x2_diag1_run5day_zzgx3ncarbulk -smoke gx3 4x1 zzgx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_run5day_zzgx3ncarbulk -restart gx1 40x4 zzgx1coreii,droundrobin,medium +smoke gx3 8x2 gx3ncarbulk,diag1,run5day +smoke gx3 1x1 gx3ncarbulk,debug,diag1,run2day +smoke gx3 1x4 gx3ncarbulk,debug,diag1,run2day +smoke gx3 4x1 gx3ncarbulk,debug,diag1,run5day +restart gx3 8x2 gx3ncarbulk,debug +smoke gx3 8x2 gx3ncarbulk,diag24,run1year,medium +decomp gx3 4x2x25x29x5 gx3ncarbulk +smoke gx3 4x2 gx3ncarbulk,diag1,run5day smoke_gx3_8x2_diag1_gx3ncarbulk_run5day +smoke gx3 4x1 gx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_gx3ncarbulk_run5day +restart gx1 40x4 gx1coreii,droundrobin,medium restart tx1 40x4 dsectrobin,medium -restart gx3 4x4 zzgx3ncarbulk,none -restart gx3 6x2 zzgx3ncarbulk,alt01 -restart gx3 8x2 zzgx3ncarbulk,alt02 -restart gx3 4x2 zzgx3ncarbulk,alt03 -restart gx3 4x4 zzgx3ncarbulk,alt04 -restart gx3 4x4 zzgx3ncarbulk,alt05 -restart gx3 6x2 zzgx3ncarbulk,alt01,debug,short -restart gx3 8x2 zzgx3ncarbulk,alt02,debug,short -restart gx3 4x2 zzgx3ncarbulk,alt03,debug,short -smoke gx3 4x4 zzgx3ncarbulk,alt04,debug,short -smoke gx3 4x4 zzgx3ncarbulk,alt05,debug,short +restart gx3 4x4 gx3ncarbulk,none +restart gx3 6x2 gx3ncarbulk,alt01 +restart gx3 8x2 gx3ncarbulk,alt02 +restart gx3 4x2 gx3ncarbulk,alt03 +restart gx3 4x4 gx3ncarbulk,alt04 +restart gx3 4x4 gx3ncarbulk,alt05 +restart gx3 6x2 gx3ncarbulk,alt01,debug,short +restart gx3 8x2 gx3ncarbulk,alt02,debug,short +restart gx3 4x2 gx3ncarbulk,alt03,debug,short +smoke gx3 4x4 gx3ncarbulk,alt04,debug,short +smoke gx3 4x4 gx3ncarbulk,alt05,debug,short restart gbox128 4x2 short restart gbox128 4x2 boxdyn,short restart gbox128 4x2 boxdyn,short,debug @@ -30,27 +30,27 @@ restart gbox128 4x4 boxrestore,short smoke gbox128 4x4 boxrestore,short,debug restart gbox80 1x1 box2001 smoke gbox80 1x1 boxslotcyl -smoke gx3 8x2 zzgx3ncarbulk,bgcz -smoke gx3 8x2 zzgx3ncarbulk,bgcz,debug -smoke gx3 8x1 zzgx3ncarbulk,bgcskl,debug -#smoke gx3 4x1 zzgx3ncarbulk,bgcz,thread smoke_gx3_8x2_bgcz_zzgx3ncarbulk -restart gx1 4x2 zzgx1coreii,bgcsklclim,medium -restart gx1 8x1 zzgx1coreii,bgczclim,medium -smoke gx1 24x1 zzgx1coreii,medium,run90day -smoke gx3 8x1 zzgx3ncarbulk,medium,run90day -restart gx1 24x1 zzgx1coreii,short -restart gx3 8x1 zzgx3ncarbulk,short -smoke gx3 4x2 zzgx3ncarbulk,fsd1,diag24,run5day,debug -smoke gx3 8x2 zzgx3ncarbulk,fsd12,diag24,run5day,short -restart gx3 4x2 zzgx3ncarbulk,fsd12,debug,short -smoke gx3 8x2 zzgx3ncarbulk,fsd12ww3,diag24,run1day,medium -smoke gx3 4x1 zzgx3ncarbulk,isotope,debug -restart gx3 8x2 zzgx3ncarbulk,isotope -restart gx3 4x4 zzgx3ncarbulk,iobinary -restart gx3 4x4 zzgx3ncarbulk,histall,precision8,cdf64 -smoke gx3 30x1 zzgx3ncarbulk,bgcz,histall -smoke gx3 14x2 zzgx3ncarbulk,fsd12,histall -smoke gx3 4x1 zzgx3ncarbulk,dynpicard,medium +smoke gx3 8x2 gx3ncarbulk,bgcz +smoke gx3 8x2 gx3ncarbulk,bgcz,debug +smoke gx3 8x1 gx3ncarbulk,bgcskl,debug +#smoke gx3 4x1 gx3ncarbulk,bgcz,thread smoke_gx3_8x2_bgcz_gx3ncarbulk +restart gx1 4x2 gx1coreii,bgcsklclim,medium +restart gx1 8x1 gx1coreii,bgczclim,medium +smoke gx1 24x1 gx1coreii,medium,run90day +smoke gx3 8x1 gx3ncarbulk,medium,run90day +restart gx1 24x1 gx1coreii,short +restart gx3 8x1 gx3ncarbulk,short +smoke gx3 4x2 gx3ncarbulk,fsd1,diag24,run5day,debug +smoke gx3 8x2 gx3ncarbulk,fsd12,diag24,run5day,short +restart gx3 4x2 gx3ncarbulk,fsd12,debug,short +smoke gx3 8x2 gx3ncarbulk,fsd12ww3,diag24,run1day,medium +smoke gx3 4x1 gx3ncarbulk,isotope,debug +restart gx3 8x2 gx3ncarbulk,isotope +restart gx3 4x4 gx3ncarbulk,iobinary +restart gx3 4x4 gx3ncarbulk,histall,precision8,cdf64 +smoke gx3 30x1 gx3ncarbulk,bgcz,histall +smoke gx3 14x2 gx3ncarbulk,fsd12,histall +smoke gx3 4x1 gx3ncarbulk,dynpicard,medium # jra55 # Test Grid PEs Sets BFB-compare @@ -61,7 +61,7 @@ smoke gx3 4x1 debug,diag1,run5day restart gx3 8x2 debug smoke gx3 8x2 diag24,run1year,medium decomp gx3 4x2x25x29x5 none -smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run5day +smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run5day smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day restart gx1 40x4 droundrobin,medium restart tx1 40x4 dsectrobin,medium @@ -91,8 +91,8 @@ smoke gx3 8x1 bgcskl,debug #smoke gx3 4x1 bgcz,thread smoke_gx3_8x2_bgcz restart gx1 4x2 bgcsklclim,medium restart gx1 8x1 bgczclim,medium -smoke gx1 24x1 medium,run90day,zzyi2008 -smoke gx3 8x1 medium,run90day,zzyi2008 +smoke gx1 24x1 medium,run90day,yi2008 +smoke gx3 8x1 medium,run90day,yi2008 restart gx1 24x1 short restart gx3 8x1 short smoke gx3 4x2 fsd1,diag24,run5day,debug @@ -101,7 +101,7 @@ restart gx3 4x2 fsd12,debug,short smoke gx3 8x2 fsd12ww3,diag24,run1day,medium smoke gx3 4x1 isotope,debug restart gx3 8x2 isotope -restart gx3 4x4 zzgx3ncarbulk,iobinary +restart gx3 4x4 gx3ncarbulk,iobinary restart gx3 4x4 histall,precision8,cdf64 smoke gx3 30x1 bgcz,histall smoke gx3 14x2 fsd12,histall diff --git a/configuration/scripts/tests/decomp_suite.ts b/configuration/scripts/tests/decomp_suite.ts index 9b7a8586b..c110a5ab4 100644 --- a/configuration/scripts/tests/decomp_suite.ts +++ b/configuration/scripts/tests/decomp_suite.ts @@ -1,17 +1,17 @@ # Test Grid PEs Sets BFB-compare -restart gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2 -decomp gx3 4x2x25x29x5 zzgx3ncarbulk +restart gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2 +decomp gx3 4x2x25x29x5 gx3ncarbulk sleep 30 -restart gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 6x2x4x29x18 zzgx3ncarbulk,dspacecurve restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 6x2x50x58x1 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 4x2x19x19x10 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 1x20x5x29x80 zzgx3ncarbulk,dsectrobin,short restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 16x2x5x10x20 zzgx3ncarbulk,drakeX2 restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk -restart gx3 1x4x25x29x16 zzgx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_zzgx3ncarbulk +restart gx3 1x1x50x58x4 gx3ncarbulk,droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 6x2x4x29x18 gx3ncarbulk,dspacecurve restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 8x2x8x10x20 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 6x2x50x58x1 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 4x2x19x19x10 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 1x20x5x29x80 gx3ncarbulk,dsectrobin,short restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 16x2x5x10x20 gx3ncarbulk,drakeX2 restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 8x2x8x10x20 gx3ncarbulk,droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk +restart gx3 1x4x25x29x16 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk # jra55 # Test Grid PEs Sets BFB-compare diff --git a/configuration/scripts/tests/first_suite.ts b/configuration/scripts/tests/first_suite.ts index 62bde61b2..54a93d9b0 100644 --- a/configuration/scripts/tests/first_suite.ts +++ b/configuration/scripts/tests/first_suite.ts @@ -1,8 +1,8 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 zzgx3ncarbulk,diag1,run5day -restart gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2 -logbfb gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2,diag1,reprosum -smoke gx3 1x2 zzgx3ncarbulk,run2day +smoke gx3 8x2 gx3ncarbulk,diag1,run5day +restart gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2 +logbfb gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2,diag1,reprosum +smoke gx3 1x2 gx3ncarbulk,run2day # jra55 # Test Grid PEs Sets BFB-compare diff --git a/configuration/scripts/tests/io_suite.ts b/configuration/scripts/tests/io_suite.ts index 5d009a37d..69d24c76d 100755 --- a/configuration/scripts/tests/io_suite.ts +++ b/configuration/scripts/tests/io_suite.ts @@ -1,85 +1,85 @@ # Test Grid PEs Sets BFB-compare # some iobinary configurations fail due to bathymetry netcdf file requirement, remove them -restart gx3 8x4 zzgx3ncarbulk,debug,histall,iobinary,precision8 -#restart gx3 12x2 zzgx3ncarbulk,alt01,histall,iobinary -restart gx3 16x2 zzgx3ncarbulk,alt02,histall,iobinary,precision8 -#restart gx3 4x2 zzgx3ncarbulk,alt03,histall,iobinary -restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iobinary,precision8 -restart gx3 4x4 zzgx3ncarbulk,alt05,histall,iobinary -restart gx3 32x1 zzgx3ncarbulk,bgcz,histall,iobinary,precision8 -restart gx3 16x2 zzgx3ncarbulk,bgcskl,histall,iobinary -restart gx3 14x2 zzgx3ncarbulk,isotope,histall,iobinary,precision8 -restart gx3 16x2 zzgx3ncarbulk,fsd12,histall,iobinary +restart gx3 8x4 gx3ncarbulk,debug,histall,iobinary,precision8 +#restart gx3 12x2 gx3ncarbulk,alt01,histall,iobinary +restart gx3 16x2 gx3ncarbulk,alt02,histall,iobinary,precision8 +#restart gx3 4x2 gx3ncarbulk,alt03,histall,iobinary +restart gx3 8x4 gx3ncarbulk,alt04,histall,iobinary,precision8 +restart gx3 4x4 gx3ncarbulk,alt05,histall,iobinary +restart gx3 32x1 gx3ncarbulk,bgcz,histall,iobinary,precision8 +restart gx3 16x2 gx3ncarbulk,bgcskl,histall,iobinary +restart gx3 14x2 gx3ncarbulk,isotope,histall,iobinary,precision8 +restart gx3 16x2 gx3ncarbulk,fsd12,histall,iobinary -restart gx3 32x1 zzgx3ncarbulk,debug,histall,ionetcdf -restart gx3 15x2 zzgx3ncarbulk,alt01,histall,ionetcdf,precision8,cdf64 -restart gx3 15x2 zzgx3ncarbulk,alt02,histall,ionetcdf -restart gx3 24x1 zzgx3ncarbulk,alt03,histall,ionetcdf,precision8 -restart gx3 8x4 zzgx3ncarbulk,alt04,histall,ionetcdf,cdf64 -restart gx3 8x4 zzgx3ncarbulk,alt05,histall,ionetcdf,precision8,cdf64 -restart gx3 30x1 zzgx3ncarbulk,bgcz,histall,ionetcdf -restart gx3 15x2 zzgx3ncarbulk,bgcskl,histall,ionetcdf,precision8 -restart gx3 31x1 zzgx3ncarbulk,isotope,histall,ionetcdf,cdf64 -restart gx3 14x2 zzgx3ncarbulk,fsd12,histall,ionetcdf,precision8 +restart gx3 32x1 gx3ncarbulk,debug,histall,ionetcdf +restart gx3 15x2 gx3ncarbulk,alt01,histall,ionetcdf,precision8,cdf64 +restart gx3 15x2 gx3ncarbulk,alt02,histall,ionetcdf +restart gx3 24x1 gx3ncarbulk,alt03,histall,ionetcdf,precision8 +restart gx3 8x4 gx3ncarbulk,alt04,histall,ionetcdf,cdf64 +restart gx3 8x4 gx3ncarbulk,alt05,histall,ionetcdf,precision8,cdf64 +restart gx3 30x1 gx3ncarbulk,bgcz,histall,ionetcdf +restart gx3 15x2 gx3ncarbulk,bgcskl,histall,ionetcdf,precision8 +restart gx3 31x1 gx3ncarbulk,isotope,histall,ionetcdf,cdf64 +restart gx3 14x2 gx3ncarbulk,fsd12,histall,ionetcdf,precision8 -restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio1,precision8,cdf64 -restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio1,cdf64 -restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio1,precision8 -restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio1 -restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio1,precision8,cdf64 -restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio1,cdf64 -restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio1,precision8 -restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio1 -restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio1,precision8,cdf64 -restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio1,cdf64 +restart gx3 16x2 gx3ncarbulk,debug,histall,iopio1,precision8,cdf64 +restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio1,cdf64 +restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio1,precision8 +restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio1 +restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio1,precision8,cdf64 +restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio1,cdf64 +restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio1,precision8 +restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio1 +restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio1,precision8,cdf64 +restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio1,cdf64 -restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio2 -restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio2,precision8,cdf64 -restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio2,cdf64 -restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio2,precision8 -restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio2 -restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio2,precision8,cdf64 -restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio2,cdf64 -restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio2,precision8 -restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio2 -restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio2,precision8,cdf64 +restart gx3 16x2 gx3ncarbulk,debug,histall,iopio2 +restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio2,precision8,cdf64 +restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio2,cdf64 +restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio2,precision8 +restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio2 +restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio2,precision8,cdf64 +restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio2,cdf64 +restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio2,precision8 +restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio2 +restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio2,precision8,cdf64 -restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio1p,precision8 -restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio1p -restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio1p,precision8,cdf64 -restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio1p,cdf64 -restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio1p,precision8 -restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio1p -restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio1p,precision8,cdf64 -restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio1p,cdf64 -restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio1p,precision8 -restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio1p +restart gx3 16x2 gx3ncarbulk,debug,histall,iopio1p,precision8 +restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio1p +restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio1p,precision8,cdf64 +restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio1p,cdf64 +restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio1p,precision8 +restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio1p +restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio1p,precision8,cdf64 +restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio1p,cdf64 +restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio1p,precision8 +restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio1p -restart gx3 16x2 zzgx3ncarbulk,debug,histall,iopio2p,cdf64 -restart gx3 14x2 zzgx3ncarbulk,alt01,histall,iopio2p,precision8 -restart gx3 32x1 zzgx3ncarbulk,alt02,histall,iopio2p -restart gx3 24x1 zzgx3ncarbulk,alt03,histall,iopio2p,precision8,cdf64 -restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iopio2p,cdf64 -restart gx3 8x4 zzgx3ncarbulk,alt05,histall,iopio2p,precision8 -restart gx3 16x2 zzgx3ncarbulk,bgcz,histall,iopio2p -restart gx3 30x1 zzgx3ncarbulk,bgcskl,histall,iopio2p,precision8,cdf64 -restart gx3 8x4 zzgx3ncarbulk,isotope,histall,iopio2p,cdf64 -restart gx3 12x2 zzgx3ncarbulk,fsd12,histall,iopio2p,precision8 +restart gx3 16x2 gx3ncarbulk,debug,histall,iopio2p,cdf64 +restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio2p,precision8 +restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio2p +restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio2p,precision8,cdf64 +restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio2p,cdf64 +restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio2p,precision8 +restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio2p +restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio2p,precision8,cdf64 +restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio2p,cdf64 +restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio2p,precision8 # jra55 # Test Grid PEs Sets BFB-compare # some iobinary configurations fail due to bathymetry netcdf file requirement, remove them -restart gx3 8x4 zzgx3ncarbulk,debug,histall,iobinary,precision8 -#restart gx3 12x2 zzgx3ncarbulk,alt01a,histall,iobinary -restart gx3 16x2 zzgx3ncarbulk,alt02,histall,iobinary,precision8 -#restart gx3 4x2 zzgx3ncarbulk,alt03,histall,iobinary -restart gx3 8x4 zzgx3ncarbulk,alt04,histall,iobinary,precision8 -restart gx3 4x4 zzgx3ncarbulk,alt05,histall,iobinary -restart gx3 32x1 zzgx3ncarbulk,bgcz,histall,iobinary,precision8 -restart gx3 16x2 zzgx3ncarbulk,bgcskl,histall,iobinary -restart gx3 14x2 zzgx3ncarbulk,isotope,histall,iobinary,precision8 -restart gx3 16x2 zzgx3ncarbulk,fsd12,histall,iobinary +restart gx3 8x4 gx3ncarbulk,debug,histall,iobinary,precision8 +#restart gx3 12x2 gx3ncarbulk,alt01a,histall,iobinary +restart gx3 16x2 gx3ncarbulk,alt02,histall,iobinary,precision8 +#restart gx3 4x2 gx3ncarbulk,alt03,histall,iobinary +restart gx3 8x4 gx3ncarbulk,alt04,histall,iobinary,precision8 +restart gx3 4x4 gx3ncarbulk,alt05,histall,iobinary +restart gx3 32x1 gx3ncarbulk,bgcz,histall,iobinary,precision8 +restart gx3 16x2 gx3ncarbulk,bgcskl,histall,iobinary +restart gx3 14x2 gx3ncarbulk,isotope,histall,iobinary,precision8 +restart gx3 16x2 gx3ncarbulk,fsd12,histall,iobinary restart gx3 32x1 debug,histall,ionetcdf restart gx3 15x2 alt01a,histall,ionetcdf,precision8,cdf64 diff --git a/configuration/scripts/tests/nothread_quicksuite.ts b/configuration/scripts/tests/nothread_quicksuite.ts index 6ce073e4c..c37f7c858 100644 --- a/configuration/scripts/tests/nothread_quicksuite.ts +++ b/configuration/scripts/tests/nothread_quicksuite.ts @@ -1,7 +1,7 @@ # Test Grid PEs Sets BFB-compare -restart gx3 16x1 zzgx3ncarbulk,diag1 -smoke gx3 1x1 zzgx3ncarbulk,debug,diag1,run2day -smoke gx3 4x1 zzgx3ncarbulk,debug,diag1,run2day,thread +restart gx3 16x1 gx3ncarbulk,diag1 +smoke gx3 1x1 gx3ncarbulk,debug,diag1,run2day +smoke gx3 4x1 gx3ncarbulk,debug,diag1,run2day,thread # jra55 # Test Grid PEs Sets BFB-compare diff --git a/configuration/scripts/tests/nothread_suite.ts b/configuration/scripts/tests/nothread_suite.ts index fd816a90f..7b6244259 100644 --- a/configuration/scripts/tests/nothread_suite.ts +++ b/configuration/scripts/tests/nothread_suite.ts @@ -1,37 +1,37 @@ # Test Grid PEs Sets BFB-compare -restart gx3 8x1x25x29x2 zzgx3ncarbulk,dslenderX2 -logbfb gx3 8x1x25x29x2 zzgx3ncarbulk,dslenderX2,diag1,reprosum +restart gx3 8x1x25x29x2 gx3ncarbulk,dslenderX2 +logbfb gx3 8x1x25x29x2 gx3ncarbulk,dslenderX2,diag1,reprosum -smoke gx3 16x1 zzgx3ncarbulk,diag1,run5day -smoke gx3 1x1 zzgx3ncarbulk,debug,diag1,run2day -smoke gx3 4x1 zzgx3ncarbulk,debug,diag1,run5day,thread -restart gx3 16x1 zzgx3ncarbulk,thread -smoke gx3 16x1 zzgx3ncarbulk,diag24,run1year,medium +smoke gx3 16x1 gx3ncarbulk,diag1,run5day +smoke gx3 1x1 gx3ncarbulk,debug,diag1,run2day +smoke gx3 4x1 gx3ncarbulk,debug,diag1,run5day,thread +restart gx3 16x1 gx3ncarbulk,thread +smoke gx3 16x1 gx3ncarbulk,diag24,run1year,medium #tcraig, hangs nodes intermittently on izumi -#restart gx1 160x1 zzgx1coreii,droundrobin,medium +#restart gx1 160x1 gx1coreii,droundrobin,medium #restart tx1 160x1 dsectrobin,medium -restart gx3 16x1 zzgx3ncarbulk,none -restart gx3 16x1 zzgx3ncarbulk,iobinary - -restart gx3 12x1 zzgx3ncarbulk,alt01 -restart gx3 16x1 zzgx3ncarbulk,alt02 -restart gx3 8x1 zzgx3ncarbulk,alt03 -restart gx3 16x1 zzgx3ncarbulk,alt04 -restart gx3 16x1 zzgx3ncarbulk,alt05 -restart gx3 18x1 zzgx3ncarbulk,alt01,debug,short -restart gx3 20x1 zzgx3ncarbulk,alt02,debug,short -restart gx3 24x1 zzgx3ncarbulk,alt03,debug,short -smoke gx3 24x1 zzgx3ncarbulk,alt04,debug,short -smoke gx3 32x1 zzgx3ncarbulk,alt05,debug,short -restart gx3 16x1 zzgx3ncarbulk,isotope -smoke gx3 6x1 zzgx3ncarbulk,isotope,debug -smoke gx3 8x1 zzgx3ncarbulk,fsd1,diag24,run5day,debug -smoke gx3 16x1 zzgx3ncarbulk,fsd12,diag24,run5day,short -restart gx3 12x1 zzgx3ncarbulk,fsd12,debug,short -smoke gx3 20x1 zzgx3ncarbulk,fsd12ww3,diag24,run1day,medium +restart gx3 16x1 gx3ncarbulk,none +restart gx3 16x1 gx3ncarbulk,iobinary + +restart gx3 12x1 gx3ncarbulk,alt01 +restart gx3 16x1 gx3ncarbulk,alt02 +restart gx3 8x1 gx3ncarbulk,alt03 +restart gx3 16x1 gx3ncarbulk,alt04 +restart gx3 16x1 gx3ncarbulk,alt05 +restart gx3 18x1 gx3ncarbulk,alt01,debug,short +restart gx3 20x1 gx3ncarbulk,alt02,debug,short +restart gx3 24x1 gx3ncarbulk,alt03,debug,short +smoke gx3 24x1 gx3ncarbulk,alt04,debug,short +smoke gx3 32x1 gx3ncarbulk,alt05,debug,short +restart gx3 16x1 gx3ncarbulk,isotope +smoke gx3 6x1 gx3ncarbulk,isotope,debug +smoke gx3 8x1 gx3ncarbulk,fsd1,diag24,run5day,debug +smoke gx3 16x1 gx3ncarbulk,fsd12,diag24,run5day,short +restart gx3 12x1 gx3ncarbulk,fsd12,debug,short +smoke gx3 20x1 gx3ncarbulk,fsd12ww3,diag24,run1day,medium restart gbox128 8x1 short restart gbox128 16x1 boxdyn,short @@ -43,37 +43,37 @@ smoke gbox128 24x1 boxrestore,short,debug restart gbox80 1x1 box2001 smoke gbox80 1x1 boxslotcyl -smoke gx3 16x1 medium,run90day,zzyi2008 +smoke gx3 16x1 medium,run90day,yi2008 restart gx3 12x1 short #tcraig, hangs nodes intermittently on izumi -#smoke gx1 24x1 medium,run90day,zzyi2008 +#smoke gx1 24x1 medium,run90day,yi2008 #restart gx1 24x1 short -smoke gx3 16x1 zzgx3ncarbulk,bgcz -smoke gx3 16x1 zzgx3ncarbulk,bgcz,debug -smoke gx3 24x1 zzgx3ncarbulk,bgcskl,debug +smoke gx3 16x1 gx3ncarbulk,bgcz +smoke gx3 16x1 gx3ncarbulk,bgcz,debug +smoke gx3 24x1 gx3ncarbulk,bgcskl,debug #tcraig, hangs nodes intermittently on izumi -#restart gx1 128x1 zzgx3ncarbulk,bgcsklclim,medium -#restart gx1 256x1 zzgx3ncarbulk,bgczclim,medium - -decomp gx3 8x1x5x29x20 zzgx3ncarbulk -restart gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1 restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 12x1x4x29x9 zzgx3ncarbulk,dspacecurve restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 16x1x8x10x10 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 6x1x50x58x1 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 8x1x19x19x5 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 20x1x5x29x20 zzgx3ncarbulk,dsectrobin,short restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 32x1x5x10x10 zzgx3ncarbulk,drakeX2 restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 16x1x8x10x10 zzgx3ncarbulk,droundrobin,maskhalo restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk -restart gx3 4x1x25x29x4 zzgx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_zzgx3ncarbulk - -logbfb gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 20x1x5x29x20 zzgx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 16x1x8x10x10 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 6x1x50x58x1 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 12x1x4x29x9 zzgx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_reprosum_zzgx3ncarbulk +#restart gx1 128x1 gx3ncarbulk,bgcsklclim,medium +#restart gx1 256x1 gx3ncarbulk,bgczclim,medium + +decomp gx3 8x1x5x29x20 gx3ncarbulk +restart gx3 1x1x50x58x4 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1 restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 12x1x4x29x9 gx3ncarbulk,dspacecurve restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 16x1x8x10x10 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 6x1x50x58x1 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 8x1x19x19x5 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 20x1x5x29x20 gx3ncarbulk,dsectrobin,short restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 32x1x5x10x10 gx3ncarbulk,drakeX2 restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 16x1x8x10x10 gx3ncarbulk,droundrobin,maskhalo restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk +restart gx3 4x1x25x29x4 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk + +logbfb gx3 1x1x50x58x4 gx3ncarbulk,droundrobin,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 20x1x5x29x20 gx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 16x1x8x10x10 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 6x1x50x58x1 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 12x1x4x29x9 gx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum # jra55 # Test Grid PEs Sets BFB-compare @@ -92,7 +92,7 @@ smoke gx3 16x1 diag24,run1year,medium #restart tx1 160x1 dsectrobin,medium restart gx3 16x1 none -restart gx3 16x1 zzgx3ncarbulk,iobinary +restart gx3 16x1 gx3ncarbulk,iobinary restart gx3 12x1 alt01a restart gx3 16x1 alt02 @@ -121,10 +121,10 @@ smoke gbox128 24x1 boxrestore,short,debug restart gbox80 1x1 box2001 smoke gbox80 1x1 boxslotcyl -smoke gx3 16x1 medium,run90day,zzyi2008 +smoke gx3 16x1 medium,run90day,yi2008 restart gx3 12x1 short #tcraig, hangs nodes intermittently on izumi -#smoke gx1 24x1 medium,run90day,zzyi2008 +#smoke gx1 24x1 medium,run90day,yi2008 #restart gx1 24x1 short smoke gx3 16x1 bgcz diff --git a/configuration/scripts/tests/quick_suite.ts b/configuration/scripts/tests/quick_suite.ts index 2010d6d29..045f7c71e 100644 --- a/configuration/scripts/tests/quick_suite.ts +++ b/configuration/scripts/tests/quick_suite.ts @@ -1,9 +1,9 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 zzgx3ncarbulk,diag1,run5day -smoke gx3 1x1 zzgx3ncarbulk,diag1,run1day +smoke gx3 8x2 gx3ncarbulk,diag1,run5day +smoke gx3 1x1 gx3ncarbulk,diag1,run1day restart gbox128 8x1 diag1 -restart gx3 4x2 zzgx3ncarbulk,debug,diag1,run5day -smoke gx3 4x1 zzgx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_run5day_zzgx3ncarbulk +restart gx3 4x2 gx3ncarbulk,debug,diag1,run5day +smoke gx3 4x1 gx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_gx3ncarbulk_run5day # jra55 # Test Grid PEs Sets BFB-compare diff --git a/configuration/scripts/tests/reprosum_suite.ts b/configuration/scripts/tests/reprosum_suite.ts index 6a1ef426c..3a55da4bb 100644 --- a/configuration/scripts/tests/reprosum_suite.ts +++ b/configuration/scripts/tests/reprosum_suite.ts @@ -1,14 +1,14 @@ # Test Grid PEs Sets BFB-compare -logbfb gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2,diag1,reprosum -#logbfb gx3 4x2x25x29x4 zzgx3ncarbulk,dslenderX2,diag1 +logbfb gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2,diag1,reprosum +#logbfb gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2,diag1 sleep 60 -logbfb gx3 1x1x50x58x4 zzgx3ncarbulk,droundrobin,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 4x1x25x116x1 zzgx3ncarbulk,dslenderX1,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 1x20x5x29x80 zzgx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 6x2x50x58x1 zzgx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk -logbfb gx3 6x2x4x29x18 zzgx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum_zzgx3ncarbulk -#logbfb gx3 8x2x8x10x20 zzgx3ncarbulk,droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_zzgx3ncarbulk +logbfb gx3 1x1x50x58x4 gx3ncarbulk,droundrobin,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 1x20x5x29x80 gx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 8x2x8x10x20 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 6x2x50x58x1 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum +logbfb gx3 6x2x4x29x18 gx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum +#logbfb gx3 8x2x8x10x20 gx3ncarbulk,droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk # jra55 # Test Grid PEs Sets BFB-compare @@ -17,8 +17,8 @@ logbfb gx3 4x2x25x29x4 dslenderX2,diag1,reprosum sleep 60 logbfb gx3 1x1x50x58x4 droundrobin,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum logbfb gx3 4x1x25x116x1 dslenderX1,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum -logbfb gx3 1x20x5x29x80 dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum -logbfb gx3 8x2x8x10x20 droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum -logbfb gx3 6x2x50x58x1 droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum +logbfb gx3 1x20x5x29x80 dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum +logbfb gx3 8x2x8x10x20 droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum +logbfb gx3 6x2x50x58x1 droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum logbfb gx3 6x2x4x29x18 dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_reprosum -#logbfb gx3 8x2x8x10x20 droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2 +#logbfb gx3 8x2x8x10x20 droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2 diff --git a/configuration/scripts/tests/travis_suite.ts b/configuration/scripts/tests/travis_suite.ts index a7f0d72a1..3ad153f42 100644 --- a/configuration/scripts/tests/travis_suite.ts +++ b/configuration/scripts/tests/travis_suite.ts @@ -1,10 +1,10 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 1x2 zzgx3ncarbulk,run2day -smoke gx3 1x1 zzgx3ncarbulk,debug,run1day -smoke gx3 2x2 zzgx3ncarbulk,debug,run1day -smoke gx3 2x1 zzgx3ncarbulk,run2day,thread smoke_gx3_1x2_run2day_zzgx3ncarbulk -restart gx3 2x1 zzgx3ncarbulk -restart gx3 1x2 zzgx3ncarbulk +smoke gx3 1x2 gx3ncarbulk,run2day +smoke gx3 1x1 gx3ncarbulk,debug,run1day +smoke gx3 2x2 gx3ncarbulk,debug,run1day +smoke gx3 2x1 gx3ncarbulk,run2day,thread smoke_gx3_1x2_gx3ncarbulk_run2day +restart gx3 2x1 gx3ncarbulk +restart gx3 1x2 gx3ncarbulk # jra55 # Test Grid PEs Sets BFB-compare From 0eeefcfd19ee448cef3315caf9e2a615b6098b42 Mon Sep 17 00:00:00 2001 From: apcraig Date: Tue, 22 Dec 2020 14:05:35 -0700 Subject: [PATCH 6/7] remove most old forcing test cases --- configuration/scripts/tests/base_suite.ts | 59 +------------- configuration/scripts/tests/decomp_suite.ts | 16 ---- configuration/scripts/tests/first_suite.ts | 7 -- configuration/scripts/tests/io_suite.ts | 71 +---------------- .../scripts/tests/nothread_quicksuite.ts | 6 -- configuration/scripts/tests/nothread_suite.ts | 78 ------------------- configuration/scripts/tests/quick_suite.ts | 8 -- configuration/scripts/tests/reprosum_suite.ts | 13 ---- configuration/scripts/tests/travis_suite.ts | 9 --- 9 files changed, 5 insertions(+), 262 deletions(-) diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index f4936fef2..824173795 100755 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -1,59 +1,4 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 gx3ncarbulk,diag1,run5day -smoke gx3 1x1 gx3ncarbulk,debug,diag1,run2day -smoke gx3 1x4 gx3ncarbulk,debug,diag1,run2day -smoke gx3 4x1 gx3ncarbulk,debug,diag1,run5day -restart gx3 8x2 gx3ncarbulk,debug -smoke gx3 8x2 gx3ncarbulk,diag24,run1year,medium -decomp gx3 4x2x25x29x5 gx3ncarbulk -smoke gx3 4x2 gx3ncarbulk,diag1,run5day smoke_gx3_8x2_diag1_gx3ncarbulk_run5day -smoke gx3 4x1 gx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_gx3ncarbulk_run5day -restart gx1 40x4 gx1coreii,droundrobin,medium -restart tx1 40x4 dsectrobin,medium -restart gx3 4x4 gx3ncarbulk,none -restart gx3 6x2 gx3ncarbulk,alt01 -restart gx3 8x2 gx3ncarbulk,alt02 -restart gx3 4x2 gx3ncarbulk,alt03 -restart gx3 4x4 gx3ncarbulk,alt04 -restart gx3 4x4 gx3ncarbulk,alt05 -restart gx3 6x2 gx3ncarbulk,alt01,debug,short -restart gx3 8x2 gx3ncarbulk,alt02,debug,short -restart gx3 4x2 gx3ncarbulk,alt03,debug,short -smoke gx3 4x4 gx3ncarbulk,alt04,debug,short -smoke gx3 4x4 gx3ncarbulk,alt05,debug,short -restart gbox128 4x2 short -restart gbox128 4x2 boxdyn,short -restart gbox128 4x2 boxdyn,short,debug -restart gbox128 2x2 boxadv,short -smoke gbox128 2x2 boxadv,short,debug -restart gbox128 4x4 boxrestore,short -smoke gbox128 4x4 boxrestore,short,debug -restart gbox80 1x1 box2001 -smoke gbox80 1x1 boxslotcyl -smoke gx3 8x2 gx3ncarbulk,bgcz -smoke gx3 8x2 gx3ncarbulk,bgcz,debug -smoke gx3 8x1 gx3ncarbulk,bgcskl,debug -#smoke gx3 4x1 gx3ncarbulk,bgcz,thread smoke_gx3_8x2_bgcz_gx3ncarbulk -restart gx1 4x2 gx1coreii,bgcsklclim,medium -restart gx1 8x1 gx1coreii,bgczclim,medium -smoke gx1 24x1 gx1coreii,medium,run90day -smoke gx3 8x1 gx3ncarbulk,medium,run90day -restart gx1 24x1 gx1coreii,short -restart gx3 8x1 gx3ncarbulk,short -smoke gx3 4x2 gx3ncarbulk,fsd1,diag24,run5day,debug -smoke gx3 8x2 gx3ncarbulk,fsd12,diag24,run5day,short -restart gx3 4x2 gx3ncarbulk,fsd12,debug,short -smoke gx3 8x2 gx3ncarbulk,fsd12ww3,diag24,run1day,medium -smoke gx3 4x1 gx3ncarbulk,isotope,debug -restart gx3 8x2 gx3ncarbulk,isotope -restart gx3 4x4 gx3ncarbulk,iobinary -restart gx3 4x4 gx3ncarbulk,histall,precision8,cdf64 -smoke gx3 30x1 gx3ncarbulk,bgcz,histall -smoke gx3 14x2 gx3ncarbulk,fsd12,histall -smoke gx3 4x1 gx3ncarbulk,dynpicard,medium - -# jra55 -# Test Grid PEs Sets BFB-compare smoke gx3 8x2 diag1,run5day smoke gx3 1x1 debug,diag1,run2day smoke gx3 1x4 debug,diag1,run2day @@ -106,3 +51,7 @@ restart gx3 4x4 histall,precision8,cdf64 smoke gx3 30x1 bgcz,histall smoke gx3 14x2 fsd12,histall smoke gx3 4x1 dynpicard,medium + +restart gx3 8x2 gx3ncarbulk,debug +restart gx3 4x4 gx3ncarbulk,diag1 +restart gx1 24x1 gx1coreii,short diff --git a/configuration/scripts/tests/decomp_suite.ts b/configuration/scripts/tests/decomp_suite.ts index c110a5ab4..4eb5394d9 100644 --- a/configuration/scripts/tests/decomp_suite.ts +++ b/configuration/scripts/tests/decomp_suite.ts @@ -1,20 +1,4 @@ # Test Grid PEs Sets BFB-compare -restart gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2 -decomp gx3 4x2x25x29x5 gx3ncarbulk -sleep 30 -restart gx3 1x1x50x58x4 gx3ncarbulk,droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 6x2x4x29x18 gx3ncarbulk,dspacecurve restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 8x2x8x10x20 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 6x2x50x58x1 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 4x2x19x19x10 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 1x20x5x29x80 gx3ncarbulk,dsectrobin,short restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 16x2x5x10x20 gx3ncarbulk,drakeX2 restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 8x2x8x10x20 gx3ncarbulk,droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk -restart gx3 1x4x25x29x16 gx3ncarbulk,droundrobin restart_gx3_4x2x25x29x4_dslenderX2_gx3ncarbulk - -# jra55 -# Test Grid PEs Sets BFB-compare restart gx3 4x2x25x29x4 dslenderX2 decomp gx3 4x2x25x29x5 none sleep 30 diff --git a/configuration/scripts/tests/first_suite.ts b/configuration/scripts/tests/first_suite.ts index 54a93d9b0..bf6c813f6 100644 --- a/configuration/scripts/tests/first_suite.ts +++ b/configuration/scripts/tests/first_suite.ts @@ -1,11 +1,4 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 gx3ncarbulk,diag1,run5day -restart gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2 -logbfb gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2,diag1,reprosum -smoke gx3 1x2 gx3ncarbulk,run2day - -# jra55 -# Test Grid PEs Sets BFB-compare smoke gx3 8x2 diag1,run5day restart gx3 4x2x25x29x4 dslenderX2 logbfb gx3 4x2x25x29x4 dslenderX2,diag1,reprosum diff --git a/configuration/scripts/tests/io_suite.ts b/configuration/scripts/tests/io_suite.ts index 69d24c76d..0cb513c87 100755 --- a/configuration/scripts/tests/io_suite.ts +++ b/configuration/scripts/tests/io_suite.ts @@ -1,75 +1,6 @@ # Test Grid PEs Sets BFB-compare # some iobinary configurations fail due to bathymetry netcdf file requirement, remove them -restart gx3 8x4 gx3ncarbulk,debug,histall,iobinary,precision8 -#restart gx3 12x2 gx3ncarbulk,alt01,histall,iobinary -restart gx3 16x2 gx3ncarbulk,alt02,histall,iobinary,precision8 -#restart gx3 4x2 gx3ncarbulk,alt03,histall,iobinary -restart gx3 8x4 gx3ncarbulk,alt04,histall,iobinary,precision8 -restart gx3 4x4 gx3ncarbulk,alt05,histall,iobinary -restart gx3 32x1 gx3ncarbulk,bgcz,histall,iobinary,precision8 -restart gx3 16x2 gx3ncarbulk,bgcskl,histall,iobinary -restart gx3 14x2 gx3ncarbulk,isotope,histall,iobinary,precision8 -restart gx3 16x2 gx3ncarbulk,fsd12,histall,iobinary - -restart gx3 32x1 gx3ncarbulk,debug,histall,ionetcdf -restart gx3 15x2 gx3ncarbulk,alt01,histall,ionetcdf,precision8,cdf64 -restart gx3 15x2 gx3ncarbulk,alt02,histall,ionetcdf -restart gx3 24x1 gx3ncarbulk,alt03,histall,ionetcdf,precision8 -restart gx3 8x4 gx3ncarbulk,alt04,histall,ionetcdf,cdf64 -restart gx3 8x4 gx3ncarbulk,alt05,histall,ionetcdf,precision8,cdf64 -restart gx3 30x1 gx3ncarbulk,bgcz,histall,ionetcdf -restart gx3 15x2 gx3ncarbulk,bgcskl,histall,ionetcdf,precision8 -restart gx3 31x1 gx3ncarbulk,isotope,histall,ionetcdf,cdf64 -restart gx3 14x2 gx3ncarbulk,fsd12,histall,ionetcdf,precision8 - -restart gx3 16x2 gx3ncarbulk,debug,histall,iopio1,precision8,cdf64 -restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio1,cdf64 -restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio1,precision8 -restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio1 -restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio1,precision8,cdf64 -restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio1,cdf64 -restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio1,precision8 -restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio1 -restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio1,precision8,cdf64 -restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio1,cdf64 - -restart gx3 16x2 gx3ncarbulk,debug,histall,iopio2 -restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio2,precision8,cdf64 -restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio2,cdf64 -restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio2,precision8 -restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio2 -restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio2,precision8,cdf64 -restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio2,cdf64 -restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio2,precision8 -restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio2 -restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio2,precision8,cdf64 - -restart gx3 16x2 gx3ncarbulk,debug,histall,iopio1p,precision8 -restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio1p -restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio1p,precision8,cdf64 -restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio1p,cdf64 -restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio1p,precision8 -restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio1p -restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio1p,precision8,cdf64 -restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio1p,cdf64 -restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio1p,precision8 -restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio1p - -restart gx3 16x2 gx3ncarbulk,debug,histall,iopio2p,cdf64 -restart gx3 14x2 gx3ncarbulk,alt01,histall,iopio2p,precision8 -restart gx3 32x1 gx3ncarbulk,alt02,histall,iopio2p -restart gx3 24x1 gx3ncarbulk,alt03,histall,iopio2p,precision8,cdf64 -restart gx3 8x4 gx3ncarbulk,alt04,histall,iopio2p,cdf64 -restart gx3 8x4 gx3ncarbulk,alt05,histall,iopio2p,precision8 -restart gx3 16x2 gx3ncarbulk,bgcz,histall,iopio2p -restart gx3 30x1 gx3ncarbulk,bgcskl,histall,iopio2p,precision8,cdf64 -restart gx3 8x4 gx3ncarbulk,isotope,histall,iopio2p,cdf64 -restart gx3 12x2 gx3ncarbulk,fsd12,histall,iopio2p,precision8 - - -# jra55 -# Test Grid PEs Sets BFB-compare -# some iobinary configurations fail due to bathymetry netcdf file requirement, remove them +# iobinary cannot work with JRA55 because netcdf is turned off restart gx3 8x4 gx3ncarbulk,debug,histall,iobinary,precision8 #restart gx3 12x2 gx3ncarbulk,alt01a,histall,iobinary restart gx3 16x2 gx3ncarbulk,alt02,histall,iobinary,precision8 diff --git a/configuration/scripts/tests/nothread_quicksuite.ts b/configuration/scripts/tests/nothread_quicksuite.ts index c37f7c858..997b59b28 100644 --- a/configuration/scripts/tests/nothread_quicksuite.ts +++ b/configuration/scripts/tests/nothread_quicksuite.ts @@ -1,10 +1,4 @@ # Test Grid PEs Sets BFB-compare -restart gx3 16x1 gx3ncarbulk,diag1 -smoke gx3 1x1 gx3ncarbulk,debug,diag1,run2day -smoke gx3 4x1 gx3ncarbulk,debug,diag1,run2day,thread - -# jra55 -# Test Grid PEs Sets BFB-compare restart gx3 16x1 diag1 smoke gx3 1x1 debug,diag1,run2day smoke gx3 4x1 debug,diag1,run2day,thread diff --git a/configuration/scripts/tests/nothread_suite.ts b/configuration/scripts/tests/nothread_suite.ts index 7b6244259..5dd248d69 100644 --- a/configuration/scripts/tests/nothread_suite.ts +++ b/configuration/scripts/tests/nothread_suite.ts @@ -1,83 +1,5 @@ # Test Grid PEs Sets BFB-compare -restart gx3 8x1x25x29x2 gx3ncarbulk,dslenderX2 -logbfb gx3 8x1x25x29x2 gx3ncarbulk,dslenderX2,diag1,reprosum - -smoke gx3 16x1 gx3ncarbulk,diag1,run5day -smoke gx3 1x1 gx3ncarbulk,debug,diag1,run2day -smoke gx3 4x1 gx3ncarbulk,debug,diag1,run5day,thread -restart gx3 16x1 gx3ncarbulk,thread -smoke gx3 16x1 gx3ncarbulk,diag24,run1year,medium - -#tcraig, hangs nodes intermittently on izumi -#restart gx1 160x1 gx1coreii,droundrobin,medium -#restart tx1 160x1 dsectrobin,medium - -restart gx3 16x1 gx3ncarbulk,none -restart gx3 16x1 gx3ncarbulk,iobinary - -restart gx3 12x1 gx3ncarbulk,alt01 -restart gx3 16x1 gx3ncarbulk,alt02 -restart gx3 8x1 gx3ncarbulk,alt03 -restart gx3 16x1 gx3ncarbulk,alt04 -restart gx3 16x1 gx3ncarbulk,alt05 -restart gx3 18x1 gx3ncarbulk,alt01,debug,short -restart gx3 20x1 gx3ncarbulk,alt02,debug,short -restart gx3 24x1 gx3ncarbulk,alt03,debug,short -smoke gx3 24x1 gx3ncarbulk,alt04,debug,short -smoke gx3 32x1 gx3ncarbulk,alt05,debug,short -restart gx3 16x1 gx3ncarbulk,isotope -smoke gx3 6x1 gx3ncarbulk,isotope,debug -smoke gx3 8x1 gx3ncarbulk,fsd1,diag24,run5day,debug -smoke gx3 16x1 gx3ncarbulk,fsd12,diag24,run5day,short -restart gx3 12x1 gx3ncarbulk,fsd12,debug,short -smoke gx3 20x1 gx3ncarbulk,fsd12ww3,diag24,run1day,medium - -restart gbox128 8x1 short -restart gbox128 16x1 boxdyn,short -restart gbox128 24x1 boxdyn,short,debug -restart gbox128 12x1 boxadv,short -smoke gbox128 20x1 boxadv,short,debug -restart gbox128 32x1 boxrestore,short -smoke gbox128 24x1 boxrestore,short,debug -restart gbox80 1x1 box2001 -smoke gbox80 1x1 boxslotcyl - -smoke gx3 16x1 medium,run90day,yi2008 -restart gx3 12x1 short -#tcraig, hangs nodes intermittently on izumi -#smoke gx1 24x1 medium,run90day,yi2008 -#restart gx1 24x1 short - -smoke gx3 16x1 gx3ncarbulk,bgcz -smoke gx3 16x1 gx3ncarbulk,bgcz,debug -smoke gx3 24x1 gx3ncarbulk,bgcskl,debug -#tcraig, hangs nodes intermittently on izumi -#restart gx1 128x1 gx3ncarbulk,bgcsklclim,medium -#restart gx1 256x1 gx3ncarbulk,bgczclim,medium - -decomp gx3 8x1x5x29x20 gx3ncarbulk -restart gx3 1x1x50x58x4 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1 restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 12x1x4x29x9 gx3ncarbulk,dspacecurve restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 16x1x8x10x10 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 6x1x50x58x1 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 8x1x19x19x5 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 20x1x5x29x20 gx3ncarbulk,dsectrobin,short restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 32x1x5x10x10 gx3ncarbulk,drakeX2 restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 16x1x8x10x10 gx3ncarbulk,droundrobin,maskhalo restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk -restart gx3 4x1x25x29x4 gx3ncarbulk,droundrobin restart_gx3_8x1x25x29x2_dslenderX2_gx3ncarbulk - -logbfb gx3 1x1x50x58x4 gx3ncarbulk,droundrobin,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 20x1x5x29x20 gx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 16x1x8x10x10 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 6x1x50x58x1 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 12x1x4x29x9 gx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_8x1x25x29x2_diag1_dslenderX2_gx3ncarbulk_reprosum - -# jra55 -# Test Grid PEs Sets BFB-compare - restart gx3 8x1x25x29x2 dslenderX2 logbfb gx3 8x1x25x29x2 dslenderX2,diag1,reprosum diff --git a/configuration/scripts/tests/quick_suite.ts b/configuration/scripts/tests/quick_suite.ts index 045f7c71e..9384f0333 100644 --- a/configuration/scripts/tests/quick_suite.ts +++ b/configuration/scripts/tests/quick_suite.ts @@ -1,12 +1,4 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 gx3ncarbulk,diag1,run5day -smoke gx3 1x1 gx3ncarbulk,diag1,run1day -restart gbox128 8x1 diag1 -restart gx3 4x2 gx3ncarbulk,debug,diag1,run5day -smoke gx3 4x1 gx3ncarbulk,diag1,run5day,thread smoke_gx3_8x2_diag1_gx3ncarbulk_run5day - -# jra55 -# Test Grid PEs Sets BFB-compare smoke gx3 8x2 diag1,run5day smoke gx3 1x1 diag1,run1day restart gbox128 8x1 diag1 diff --git a/configuration/scripts/tests/reprosum_suite.ts b/configuration/scripts/tests/reprosum_suite.ts index 3a55da4bb..d65370e0a 100644 --- a/configuration/scripts/tests/reprosum_suite.ts +++ b/configuration/scripts/tests/reprosum_suite.ts @@ -1,17 +1,4 @@ # Test Grid PEs Sets BFB-compare -logbfb gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2,diag1,reprosum -#logbfb gx3 4x2x25x29x4 gx3ncarbulk,dslenderX2,diag1 -sleep 60 -logbfb gx3 1x1x50x58x4 gx3ncarbulk,droundrobin,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 4x1x25x116x1 gx3ncarbulk,dslenderX1,diag1,thread,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 1x20x5x29x80 gx3ncarbulk,dsectrobin,diag1,short,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 8x2x8x10x20 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 6x2x50x58x1 gx3ncarbulk,droundrobin,diag1,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum -logbfb gx3 6x2x4x29x18 gx3ncarbulk,dspacecurve,diag1,maskhalo,reprosum logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk_reprosum -#logbfb gx3 8x2x8x10x20 gx3ncarbulk,droundrobin,diag1 logbfb_gx3_4x2x25x29x4_diag1_dslenderX2_gx3ncarbulk - -# jra55 -# Test Grid PEs Sets BFB-compare logbfb gx3 4x2x25x29x4 dslenderX2,diag1,reprosum #logbfb gx3 4x2x25x29x4 dslenderX2,diag1 sleep 60 diff --git a/configuration/scripts/tests/travis_suite.ts b/configuration/scripts/tests/travis_suite.ts index 3ad153f42..b452bae0f 100644 --- a/configuration/scripts/tests/travis_suite.ts +++ b/configuration/scripts/tests/travis_suite.ts @@ -1,13 +1,4 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 1x2 gx3ncarbulk,run2day -smoke gx3 1x1 gx3ncarbulk,debug,run1day -smoke gx3 2x2 gx3ncarbulk,debug,run1day -smoke gx3 2x1 gx3ncarbulk,run2day,thread smoke_gx3_1x2_gx3ncarbulk_run2day -restart gx3 2x1 gx3ncarbulk -restart gx3 1x2 gx3ncarbulk - -# jra55 -# Test Grid PEs Sets BFB-compare smoke gx3 1x2 run2day smoke gx3 1x1 debug,run1day smoke gx3 2x2 debug,run1day From 9f3cd9998f1eeee25ce97aca1edaf26e7af222e1 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 23 Dec 2020 15:15:12 -0700 Subject: [PATCH 7/7] rename alt01a to alt01 in test options and suite --- configuration/scripts/options/set_nml.alt01 | 1 + configuration/scripts/options/set_nml.alt01a | 26 ------------------- configuration/scripts/tests/base_suite.ts | 4 +-- configuration/scripts/tests/io_suite.ts | 12 ++++----- configuration/scripts/tests/nothread_suite.ts | 4 +-- 5 files changed, 11 insertions(+), 36 deletions(-) delete mode 100644 configuration/scripts/options/set_nml.alt01a diff --git a/configuration/scripts/options/set_nml.alt01 b/configuration/scripts/options/set_nml.alt01 index 8b66913c6..ceec17ddf 100644 --- a/configuration/scripts/options/set_nml.alt01 +++ b/configuration/scripts/options/set_nml.alt01 @@ -1,4 +1,5 @@ nilyr = 1 +use_leap_years = .false. ice_ic = 'default' restart = .false. distribution_type = 'roundrobin' diff --git a/configuration/scripts/options/set_nml.alt01a b/configuration/scripts/options/set_nml.alt01a deleted file mode 100644 index ceec17ddf..000000000 --- a/configuration/scripts/options/set_nml.alt01a +++ /dev/null @@ -1,26 +0,0 @@ -nilyr = 1 -use_leap_years = .false. -ice_ic = 'default' -restart = .false. -distribution_type = 'roundrobin' -distribution_wght = 'block' -tr_iage = .false. -tr_FY = .false. -tr_lvl = .true. -tr_pond_cesm = .false. -tr_pond_topo = .false. -tr_pond_lvl = .false. -tr_aero = .false. -kcatbound = 1 -kitd = 0 -ktherm = 0 -conduct = 'bubbly' -kdyn = 0 -basalstress = .true. -use_bathymetry = .true. -shortwave = 'ccsm3' -albedo_type = 'constant' -calc_Tsfc = .true. -atm_data_type = 'default' -highfreq = .true. -tfrz_option = 'minus1p8' diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index 824173795..818a6abdb 100755 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -11,12 +11,12 @@ smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_ restart gx1 40x4 droundrobin,medium restart tx1 40x4 dsectrobin,medium restart gx3 4x4 none -restart gx3 6x2 alt01a +restart gx3 6x2 alt01 restart gx3 8x2 alt02 restart gx3 4x2 alt03 restart gx3 4x4 alt04 restart gx3 4x4 alt05 -restart gx3 6x2 alt01a,debug,short +restart gx3 6x2 alt01,debug,short restart gx3 8x2 alt02,debug,short restart gx3 4x2 alt03,debug,short smoke gx3 4x4 alt04,debug,short diff --git a/configuration/scripts/tests/io_suite.ts b/configuration/scripts/tests/io_suite.ts index 0cb513c87..a17e3f625 100755 --- a/configuration/scripts/tests/io_suite.ts +++ b/configuration/scripts/tests/io_suite.ts @@ -2,7 +2,7 @@ # some iobinary configurations fail due to bathymetry netcdf file requirement, remove them # iobinary cannot work with JRA55 because netcdf is turned off restart gx3 8x4 gx3ncarbulk,debug,histall,iobinary,precision8 -#restart gx3 12x2 gx3ncarbulk,alt01a,histall,iobinary +#restart gx3 12x2 gx3ncarbulk,alt01,histall,iobinary restart gx3 16x2 gx3ncarbulk,alt02,histall,iobinary,precision8 #restart gx3 4x2 gx3ncarbulk,alt03,histall,iobinary restart gx3 8x4 gx3ncarbulk,alt04,histall,iobinary,precision8 @@ -13,7 +13,7 @@ restart gx3 14x2 gx3ncarbulk,isotope,histall,iobinary,precision restart gx3 16x2 gx3ncarbulk,fsd12,histall,iobinary restart gx3 32x1 debug,histall,ionetcdf -restart gx3 15x2 alt01a,histall,ionetcdf,precision8,cdf64 +restart gx3 15x2 alt01,histall,ionetcdf,precision8,cdf64 restart gx3 15x2 alt02,histall,ionetcdf restart gx3 24x1 alt03,histall,ionetcdf,precision8 restart gx3 8x4 alt04,histall,ionetcdf,cdf64 @@ -24,7 +24,7 @@ restart gx3 31x1 isotope,histall,ionetcdf,cdf64 restart gx3 14x2 fsd12,histall,ionetcdf,precision8 restart gx3 16x2 debug,histall,iopio1,precision8,cdf64 -restart gx3 14x2 alt01a,histall,iopio1,cdf64 +restart gx3 14x2 alt01,histall,iopio1,cdf64 restart gx3 32x1 alt02,histall,iopio1,precision8 restart gx3 24x1 alt03,histall,iopio1 restart gx3 8x4 alt04,histall,iopio1,precision8,cdf64 @@ -35,7 +35,7 @@ restart gx3 8x4 isotope,histall,iopio1,precision8,cdf64 restart gx3 12x2 fsd12,histall,iopio1,cdf64 restart gx3 16x2 debug,histall,iopio2 -restart gx3 14x2 alt01a,histall,iopio2,precision8,cdf64 +restart gx3 14x2 alt01,histall,iopio2,precision8,cdf64 restart gx3 32x1 alt02,histall,iopio2,cdf64 restart gx3 24x1 alt03,histall,iopio2,precision8 restart gx3 8x4 alt04,histall,iopio2 @@ -46,7 +46,7 @@ restart gx3 8x4 isotope,histall,iopio2 restart gx3 12x2 fsd12,histall,iopio2,precision8,cdf64 restart gx3 16x2 debug,histall,iopio1p,precision8 -restart gx3 14x2 alt01a,histall,iopio1p +restart gx3 14x2 alt01,histall,iopio1p restart gx3 32x1 alt02,histall,iopio1p,precision8,cdf64 restart gx3 24x1 alt03,histall,iopio1p,cdf64 restart gx3 8x4 alt04,histall,iopio1p,precision8 @@ -57,7 +57,7 @@ restart gx3 8x4 isotope,histall,iopio1p,precision8 restart gx3 12x2 fsd12,histall,iopio1p restart gx3 16x2 debug,histall,iopio2p,cdf64 -restart gx3 14x2 alt01a,histall,iopio2p,precision8 +restart gx3 14x2 alt01,histall,iopio2p,precision8 restart gx3 32x1 alt02,histall,iopio2p restart gx3 24x1 alt03,histall,iopio2p,precision8,cdf64 restart gx3 8x4 alt04,histall,iopio2p,cdf64 diff --git a/configuration/scripts/tests/nothread_suite.ts b/configuration/scripts/tests/nothread_suite.ts index 5dd248d69..afe1963b3 100644 --- a/configuration/scripts/tests/nothread_suite.ts +++ b/configuration/scripts/tests/nothread_suite.ts @@ -16,12 +16,12 @@ smoke gx3 16x1 diag24,run1year,medium restart gx3 16x1 none restart gx3 16x1 gx3ncarbulk,iobinary -restart gx3 12x1 alt01a +restart gx3 12x1 alt01 restart gx3 16x1 alt02 restart gx3 8x1 alt03 restart gx3 16x1 alt04 restart gx3 16x1 alt05 -restart gx3 18x1 alt01a,debug,short +restart gx3 18x1 alt01,debug,short restart gx3 20x1 alt02,debug,short restart gx3 24x1 alt03,debug,short smoke gx3 24x1 alt04,debug,short