Update Icepack and version number (#748)

* Update Icepack
Update Version

* Set visc_method='avg_strength' for gridCD to avoid some aborts
Fix a few bugs in the test suite lists

Author: apcraig

cicecore/version.txt

@@ -1 +1 @@
-CICE 6.3.1
+CICE 6.4.0

configuration/scripts/options/set_nml.gridcd

@@ -1,2 +1,5 @@
 grid_ice = 'C_override_D'
+# visc_method=avg_zeta causes some gridcd tests to abort, use avg_strength for now
+visc_method = 'avg_strength'
+
 

configuration/scripts/tests/omp_suite.ts

@@ -39,7 +39,7 @@ smoke          gx1    18x1        reprosum,run10day,cmplogrest,thread
 smoke          gx1    18x1        seabedprob,reprosum,run10day,cmplogrest,thread  smoke_gx1_15x2_reprosum_run10day_seabedprob
 smoke          gx3     8x1        fsd12,reprosum,run10day,cmplogrest,thread       smoke_gx3_14x2_fsd12_reprosum_run10day
 smoke          gx3     8x1        isotope,reprosum,run10day,cmplogrest,thread     smoke_gx3_11x2_isotope_reprosum_run10day
-smoke          gx3     8x1        snwitdrdg,snwgrain,icdefault,reprosum,run10day,cmplogrest,thread  smoke_gx3_8x4_icdefault_reprosum_run10day_snwitdrdg_snwgrain
+smoke          gx3     8x1        snwitdrdg,snwgrain,icdefault,reprosum,run10day,cmplogrest,thread  smoke_gx3_8x4_icdefault_reprosum_run10day_snwgrain_snwitdrdg
 smoke          gx3     8x1        dynpicard,reprosum,run10day,cmplogrest,thread   smoke_gx3_6x4_dynpicard_reprosum_run10day
 smoke          gx3     8x1        zsal,reprosum,run10day,cmplogrest,thread        smoke_gx3_8x3_reprosum_run10day_zsal
 smoke          gx3     4x2x25x29x4     reprosum,run10day                          smoke_gx3_1x1x100x116x1_reprosum_run10day_thread
@@ -79,8 +79,8 @@ smoke        gbox128  14x2        boxrestore,reprosum,run10day,gridc
 smoke        gbox80    4x5        box2001,reprosum,run10day,gridc
 smoke        gbox80   11x3        boxslotcyl,reprosum,run10day,gridc
 
-smoke          gx3     4x2        diag1,reprosum,run10day,cmplogrest,gridc              smoke_gx3_8x4_gridc_diag1_reprosum_run10day
-smoke          gx3     4x1        diag1,reprosum,run10day,cmplogrest,thread,gridc       smoke_gx3_8x4_gridc_diag1_reprosum_run10day
+smoke          gx3     4x2        diag1,reprosum,run10day,cmplogrest,gridc              smoke_gx3_8x4_diag1_gridc_reprosum_run10day
+smoke          gx3     4x1        diag1,reprosum,run10day,cmplogrest,thread,gridc       smoke_gx3_8x4_diag1_gridc_reprosum_run10day
 smoke          gx3     8x1        alt01,reprosum,run10day,cmplogrest,thread,gridc       smoke_gx3_6x2_alt01_gridc_reprosum_run10day
 smoke          gx3     8x1        alt02,reprosum,run10day,cmplogrest,thread,gridc       smoke_gx3_8x2_alt02_gridc_reprosum_run10day
 #smoke          gx3     8x1        alt03,reprosum,run10day,cmplogrest,thread,gridc       smoke_gx3_12x2_alt03_droundrobin_gridc_reprosum_run10day
@@ -93,7 +93,7 @@ smoke          gx1    18x1        reprosum,run10day,cmplogrest,thread,gridc
 smoke          gx1    18x1        seabedprob,reprosum,run10day,cmplogrest,thread,gridc  smoke_gx1_15x2_gridc_reprosum_run10day_seabedprob
 smoke          gx3     8x1        fsd12,reprosum,run10day,cmplogrest,thread,gridc       smoke_gx3_14x2_fsd12_gridc_reprosum_run10day
 smoke          gx3     8x1        isotope,reprosum,run10day,cmplogrest,thread,gridc     smoke_gx3_11x2_gridc_isotope_reprosum_run10day
-smoke          gx3     8x1        snwitdrdg,snwgrain,icdefault,reprosum,run10day,cmplogrest,thread,gridc  smoke_gx3_8x4_gridc_icdefault_reprosum_run10day_snwitdrdg_snwgrain
+smoke          gx3     8x1        snwitdrdg,snwgrain,icdefault,reprosum,run10day,cmplogrest,thread,gridc  smoke_gx3_8x4_gridc_icdefault_reprosum_run10day_snwgrain_snwitdrdg
 #smoke          gx3     8x1        dynpicard,reprosum,run10day,cmplogrest,thread,gridc   smoke_gx3_6x4_dynpicard_gridc_reprosum_run10day
 smoke          gx3     8x1        zsal,reprosum,run10day,cmplogrest,thread,gridc        smoke_gx3_8x3_gridc_reprosum_run10day_zsal
 smoke          gx3     4x2x25x29x4     reprosum,run10day,gridc                          smoke_gx3_1x1x100x116x1_gridc_reprosum_run10day_thread
@@ -133,8 +133,8 @@ smoke        gbox128  14x2        boxrestore,reprosum,run10day,gridcd
 smoke        gbox80    4x5        box2001,reprosum,run10day,gridcd
 smoke        gbox80   11x3        boxslotcyl,reprosum,run10day,gridcd
 
-smoke          gx3     4x2        diag1,reprosum,run10day,cmplogrest,gridcd              smoke_gx3_8x4_gridcd_diag1_reprosum_run10day
-smoke          gx3     4x1        diag1,reprosum,run10day,cmplogrest,thread,gridcd       smoke_gx3_8x4_gridcd_diag1_reprosum_run10day
+smoke          gx3     4x2        diag1,reprosum,run10day,cmplogrest,gridcd              smoke_gx3_8x4_diag1_gridcd_reprosum_run10day
+smoke          gx3     4x1        diag1,reprosum,run10day,cmplogrest,thread,gridcd       smoke_gx3_8x4_diag1_gridcd_reprosum_run10day
 smoke          gx3     8x1        alt01,reprosum,run10day,cmplogrest,thread,gridcd       smoke_gx3_6x2_alt01_gridcd_reprosum_run10day
 smoke          gx3     8x1        alt02,reprosum,run10day,cmplogrest,thread,gridcd       smoke_gx3_8x2_alt02_gridcd_reprosum_run10day
 #smoke          gx3     8x1        alt03,reprosum,run10day,cmplogrest,thread,gridcd       smoke_gx3_12x2_alt03_droundrobin_gridcd_reprosum_run10day
@@ -147,7 +147,7 @@ smoke          gx1    18x1        reprosum,run10day,cmplogrest,thread,gridcd
 smoke          gx1    18x1        seabedprob,reprosum,run10day,cmplogrest,thread,gridcd  smoke_gx1_15x2_gridcd_reprosum_run10day_seabedprob
 smoke          gx3     8x1        fsd12,reprosum,run10day,cmplogrest,thread,gridcd       smoke_gx3_14x2_fsd12_gridcd_reprosum_run10day
 smoke          gx3     8x1        isotope,reprosum,run10day,cmplogrest,thread,gridcd     smoke_gx3_11x2_gridcd_isotope_reprosum_run10day
-smoke          gx3     8x1        snwitdrdg,snwgrain,icdefault,reprosum,run10day,cmplogrest,thread,gridcd  smoke_gx3_8x4_gridcd_icdefault_reprosum_run10day_snwitdrdg_snwgrain
+smoke          gx3     8x1        snwitdrdg,snwgrain,icdefault,reprosum,run10day,cmplogrest,thread,gridcd  smoke_gx3_8x4_gridcd_icdefault_reprosum_run10day_snwgrain_snwitdrdg
 #smoke          gx3     8x1        dynpicard,reprosum,run10day,cmplogrest,thread,gridcd   smoke_gx3_6x4_dynpicard_gridcd_reprosum_run10day
 smoke          gx3     8x1        zsal,reprosum,run10day,cmplogrest,thread,gridcd        smoke_gx3_8x3_gridcd_reprosum_run10day_zsal
 smoke          gx3     4x2x25x29x4     reprosum,run10day,gridcd                          smoke_gx3_1x1x100x116x1_gridcd_reprosum_run10day_thread

doc/source/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'6.3.1' 
+version = u'6.4.0' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.3.1' 
+version = u'6.4.0' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.