From 510221b8e9e59b497a5a92bdd4872cb02aae396b Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 23 Nov 2020 23:23:55 -0700 Subject: [PATCH] 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