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 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.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.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 b35e99a6d..000000000 --- a/configuration/scripts/options/set_nml.jra55 +++ /dev/null @@ -1,17 +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' -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 deleted file mode 100755 index 042431fc0..000000000 --- a/configuration/scripts/options/set_nml.jra55_2008 +++ /dev/null @@ -1,17 +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' -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 deleted file mode 100755 index b35e99a6d..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx1 +++ /dev/null @@ -1,17 +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' -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 deleted file mode 100755 index bf92e93d1..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx1_2008 +++ /dev/null @@ -1,17 +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' -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 deleted file mode 100755 index c2d1eefdc..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx3 +++ /dev/null @@ -1,17 +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' -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 deleted file mode 100755 index 89c7dc55d..000000000 --- a/configuration/scripts/options/set_nml.jra55_gx3_2008 +++ /dev/null @@ -1,17 +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' -ocn_data_dir = 'default' -bgc_data_dir = 'default' 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 386c29e41..818a6abdb 100755 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -5,9 +5,9 @@ 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 @@ -33,21 +33,25 @@ 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,yi2008 +smoke gx3 8x1 medium,run90day,yi2008 +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 gx3ncarbulk,iobinary 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 1e1ae3112..4eb5394d9 100644 --- a/configuration/scripts/tests/decomp_suite.ts +++ b/configuration/scripts/tests/decomp_suite.ts @@ -1,6 +1,6 @@ # 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 diff --git a/configuration/scripts/tests/first_suite.ts b/configuration/scripts/tests/first_suite.ts index b06ee7e0b..bf6c813f6 100644 --- a/configuration/scripts/tests/first_suite.ts +++ b/configuration/scripts/tests/first_suite.ts @@ -1,5 +1,5 @@ -# Test Grid PEs Sets BFB-compare -smoke gx3 8x2 diag1,run5day +# 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 +smoke gx3 1x2 run2day diff --git a/configuration/scripts/tests/io_suite.ts b/configuration/scripts/tests/io_suite.ts index 3e98642e9..a17e3f625 100755 --- a/configuration/scripts/tests/io_suite.ts +++ b/configuration/scripts/tests/io_suite.ts @@ -1,15 +1,16 @@ # 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 +# iobinary cannot work with JRA55 because netcdf is turned off +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 debug,histall,ionetcdf restart gx3 15x2 alt01,histall,ionetcdf,precision8,cdf64 diff --git a/configuration/scripts/tests/nothread_quicksuite.ts b/configuration/scripts/tests/nothread_quicksuite.ts index 535347438..997b59b28 100644 --- a/configuration/scripts/tests/nothread_quicksuite.ts +++ b/configuration/scripts/tests/nothread_quicksuite.ts @@ -1,5 +1,4 @@ # 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 49f834a98..afe1963b3 100644 --- a/configuration/scripts/tests/nothread_suite.ts +++ b/configuration/scripts/tests/nothread_suite.ts @@ -14,7 +14,7 @@ smoke gx3 16x1 diag24,run1year,medium #restart tx1 160x1 dsectrobin,medium restart gx3 16x1 none -restart gx3 16x1 iobinary +restart gx3 16x1 gx3ncarbulk,iobinary restart gx3 12x1 alt01 restart gx3 16x1 alt02 @@ -43,11 +43,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,yi2008 +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,yi2008 +#restart gx1 24x1 short smoke gx3 16x1 bgcz smoke gx3 16x1 bgcz,debug @@ -56,7 +56,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 diff --git a/configuration/scripts/tests/quick_suite.ts b/configuration/scripts/tests/quick_suite.ts index 10595e9ad..9384f0333 100644 --- a/configuration/scripts/tests/quick_suite.ts +++ b/configuration/scripts/tests/quick_suite.ts @@ -1,6 +1,6 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 diag1,run5day -smoke gx3 1x1 diag1,run1day +smoke gx3 8x2 diag1,run5day +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 diff --git a/configuration/scripts/tests/reprosum_suite.ts b/configuration/scripts/tests/reprosum_suite.ts index 34cf51a80..d65370e0a 100644 --- a/configuration/scripts/tests/reprosum_suite.ts +++ b/configuration/scripts/tests/reprosum_suite.ts @@ -4,8 +4,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 6f475f4c5..b452bae0f 100644 --- a/configuration/scripts/tests/travis_suite.ts +++ b/configuration/scripts/tests/travis_suite.ts @@ -3,5 +3,5 @@ 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 +restart gx3 2x1 +restart gx3 1x2