Trap solve_zsal = true at initialization (#795)

* Trap solve_zsal = true at initialization

- remove zsal tests
- rearrange a few test suites

* Update documentation for zsalinty

* update test suite

* Update Icepack to latest

cicecore/shared/ice_init_column.F90

@@ -1477,6 +1477,14 @@ subroutine input_zbgc
          restart_zsal =  .false.
       endif
 
+      if (solve_zsal)  then
+         if (my_task == master_task) then
+            write(nu_diag,*) subname,' ERROR: solve_zsal=T deprecated'
+         endif
+         abort_flag = 101
+      endif
+
+#ifdef UNDEPRECATE_ZSAL
       if (solve_zsal .and. nblyr < 1)  then
          if (my_task == master_task) then
             write(nu_diag,*) subname,' ERROR: solve_zsal=T but 0 zsalinity tracers'
@@ -1490,6 +1498,7 @@ subroutine input_zbgc
          endif
          abort_flag = 102
       endif
+#endif
 
       if (tr_brine .and. nblyr < 1 ) then
          if (my_task == master_task) then

configuration/scripts/tests/base_suite.ts

@@ -70,8 +70,6 @@ restart        gx3     4x4        histall,precision8,cdf64
 smoke          gx3    30x1        bgcz,histall
 smoke          gx3    14x2        fsd12,histall
 smoke          gx3     4x1        dynpicard
-smoke          gx3     8x2        diag24,run5day,zsal,debug
-restart        gx3     8x2        zsal
 restart        gx3     8x2        gx3ncarbulk,debug
 restart        gx3     4x4        gx3ncarbulk,diag1
 smoke          gx3     4x1        calcdragio

configuration/scripts/tests/first_suite.ts

@@ -1,12 +1,19 @@
 # Test         Grid    PEs           Sets       BFB-compare
 smoke          gx3     8x2           diag1,run5day
+# decomp_suite
 restart        gx3     4x2x25x29x4   dslenderX2
 smoke          gx3     4x2x25x29x4   debug,run2day,dslenderX2
-smoke          gx3     4x2x25x29x4   dslenderX2,diag1,reprosum,cmplog
+# reprosum_suite
+smoke          gx3     4x2x25x29x4   dslenderX2,diag1,reprosum
+# travis_suite
 smoke          gx3     1x2           run2day
-smoke          gx3     1x1x100x116x1   reprosum,run10day
-smoke          gx1     32x1x16x16x32   reprosum,run10day
-smoke          gx3     1x1x100x116x1   reprosum,run10day,gridcd
-smoke          gx1     32x1x16x16x32   reprosum,run10day,gridcd
-smoke          gx3     1x1x100x116x1   reprosum,run10day,gridc
-smoke          gx1     32x1x16x16x32   reprosum,run10day,gridc
+# gridsys_suite
+smoke          gx3     1x1x100x116x1 reprosum,run10day
+smoke          gx1     32x1x16x16x32 reprosum,run10day
+smoke          gx3     1x1x100x116x1 reprosum,run10day,gridcd
+smoke          gx1     32x1x16x16x32 reprosum,run10day,gridcd
+smoke          gx3     1x1x100x116x1 reprosum,run10day,gridc
+smoke          gx1     32x1x16x16x32 reprosum,run10day,gridc
+# perf_suite
+smoke          gx1     32x1x16x16x15 run2day,droundrobin
+smoke          gx1     64x1x16x16x8  run2day,droundrobin,thread

configuration/scripts/tests/omp_suite.ts

@@ -17,7 +17,6 @@ smoke          gx3    14x2        fsd12,reprosum,run10day
 smoke          gx3    11x2        isotope,reprosum,run10day
 smoke          gx3     8x4        snwitdrdg,snwgrain,icdefault,reprosum,run10day
 smoke          gx3     6x4        dynpicard,reprosum,run10day
-smoke          gx3     8x3        zsal,reprosum,run10day
 smoke          gx3     1x1x100x116x1   reprosum,run10day,thread
 
 smoke        gbox128   8x2        reprosum,run10day
@@ -44,7 +43,6 @@ smoke          gx3    14x2        fsd12,reprosum,run10day,gridc
 smoke          gx3    11x2        isotope,reprosum,run10day,gridc
 smoke          gx3     8x4        snwitdrdg,snwgrain,icdefault,reprosum,run10day,gridc
 #smoke          gx3     6x4        dynpicard,reprosum,run10day,gridc
-smoke          gx3     8x3        zsal,reprosum,run10day,gridc
 smoke          gx3     1x1x100x116x1   reprosum,run10day,gridc,thread
 
 smoke        gbox128   8x2        reprosum,run10day,gridc
@@ -71,7 +69,6 @@ smoke          gx3    14x2        fsd12,reprosum,run10day,gridcd
 smoke          gx3    11x2        isotope,reprosum,run10day,gridcd
 smoke          gx3     8x4        snwitdrdg,snwgrain,icdefault,reprosum,run10day,gridcd
 #smoke          gx3     6x4        dynpicard,reprosum,run10day,gridcd
-smoke          gx3     8x3        zsal,reprosum,run10day,gridcd
 smoke          gx3     1x1x100x116x1   reprosum,run10day,gridcd,thread
 
 smoke        gbox128   8x2        reprosum,run10day,gridcd
@@ -81,6 +78,8 @@ smoke        gbox128  14x2        boxrestore,reprosum,run10day,gridcd
 smoke        gbox80    4x5        box2001,reprosum,run10day,gridcd
 smoke        gbox80   11x3        boxslotcyl,reprosum,run10day,gridcd
 
+sleep 180
+
 #gridB
 
 smoke          gx3     4x2        diag1,reprosum,run10day,cmplogrest              smoke_gx3_8x4_diag1_reprosum_run10day
@@ -99,7 +98,6 @@ smoke          gx3     8x1        fsd12,reprosum,run10day,cmplogrest,thread
 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_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
 smoke          gx3     8x4x5x4x80      reprosum,run10day                          smoke_gx3_1x1x100x116x1_reprosum_run10day_thread
 
@@ -128,7 +126,6 @@ smoke          gx3     8x1        fsd12,reprosum,run10day,cmplogrest,thread,grid
 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_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
 smoke          gx3     8x4x5x4x80      reprosum,run10day,gridc                          smoke_gx3_1x1x100x116x1_gridc_reprosum_run10day_thread
 
@@ -157,7 +154,6 @@ smoke          gx3     8x1        fsd12,reprosum,run10day,cmplogrest,thread,grid
 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_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
 smoke          gx3     8x4x5x4x80      reprosum,run10day,gridcd                          smoke_gx3_1x1x100x116x1_gridcd_reprosum_run10day_thread
 

configuration/scripts/tests/perf_suite.ts

@@ -1,25 +1,24 @@
 # Test         Grid    PEs        Sets    BFB-compare
-smoke        gx1      1x1x320x384x1  run2day,droundrobin
+smoke        gx1     32x1x16x16x15   run2day,droundrobin
 smoke        gx1     64x1x16x16x8    run2day,droundrobin,thread
-sleep 180
 #
-smoke        gx1      1x1x320x384x1  run2day,droundrobin
-smoke        gx1      1x1x160x192x4  run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1      1x1x80x96x16   run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1      1x1x40x48x64   run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1      1x1x20x24x256  run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
+smoke        gx1      1x1x320x384x1  run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1      1x1x160x192x4  run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1      1x1x80x96x16   run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1      1x1x40x48x64   run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1      1x1x20x24x256  run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
 #
-smoke        gx1      1x1x16x16x480  run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1      2x1x16x16x240  run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1      4x1x16x16x120  run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1      8x1x16x16x60   run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1     16x1x16x16x30   run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1     32x1x16x16x15   run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1     64x1x16x16x8    run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1    128x1x16x16x4    run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
+smoke        gx1      1x1x16x16x480  run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1      2x1x16x16x240  run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1      4x1x16x16x120  run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1      8x1x16x16x60   run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1     16x1x16x16x30   run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+#smoke        gx1     32x1x16x16x15   run2day,droundrobin
+smoke        gx1     64x1x16x16x8    run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+smoke        gx1    128x1x16x16x4    run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
 #
-smoke        gx1     64x1x16x16x8    run2day,droundrobin  smoke_gx1_1x1x320x384x1_droundrobin_run2day
-smoke        gx1     64x1x16x16x8    run2day,droundrobin,thread
+smoke        gx1     64x1x16x16x8    run2day,droundrobin  smoke_gx1_32x1x16x16x15_droundrobin_run2day
+#smoke        gx1     64x1x16x16x8    run2day,droundrobin,thread
 smoke        gx1     32x2x16x16x16   run2day,droundrobin  smoke_gx1_64x1x16x16x8_droundrobin_run2day_thread
 smoke        gx1     16x4x16x16x32   run2day,droundrobin  smoke_gx1_64x1x16x16x8_droundrobin_run2day_thread
 smoke        gx1      8x8x16x16x64   run2day,droundrobin  smoke_gx1_64x1x16x16x8_droundrobin_run2day_thread

doc/source/science_guide/sg_tracers.rst

@@ -92,7 +92,6 @@ is not in use.
    "       ","nslyr","vsno","nt_rhos"," "
    "       ","nslyr","vsno","nt_smice"," "
    "       ","nslyr","vsno","nt_smliq"," "
-   "solve_zsal", "n_trzs", "fbri or (a,v)ice", "nt_bgc_S", " "
    "tr_bgc_N", "n_algae", "fbri or (a,v)ice", "nt_bgc_N", "nlt_bgc_N"
    "tr_bgc_Nit", " ", "fbri or (a,v)ice", "nt_bgc_Nit", "nlt_bgc_Nit"
    "tr_bgc_C", "n_doc", "fbri or (a,v)ice", "nt_bgc_DOC", "nlt_bgc_DOC"
@@ -112,6 +111,7 @@ is not in use.
    " ", "1", "fbri", "nt_zbgc_frac", " "
 
 ..
+   "solve_zsal", "n_trzs", "fbri or (a,v)ice", "nt_bgc_S", " "
    "tr_pond_cesm", "2", "aice", "nt_apnd", " " 
    " ", " ", "apnd", "nt_vpnd", " "
 

doc/source/user_guide/ug_case_settings.rst

@@ -804,14 +804,14 @@ zbgc_nml
    "``ratio_S2N_sp``", "real", "algal S to N in mol/mol small plankton", "0.03"
    "``restart_bgc``", "logical", "restart tracer values from file", "``.false.``"
    "``restart_hbrine``", "logical", "", "``.false.``"
-   "``restart_zsal``", "logical", "", "``.false.``"
+   "``restart_zsal``", "logical", "zsalinity DEPRECATED", "``.false.``"
    "``restore_bgc``", "logical", "restore bgc to data", "``.false.``"
    "``R_dFe2dust``", "real", "g/g :cite:`Tagliabue09`", "0.035"
    "``scale_bgc``", "logical", "", "``.false.``"
    "``silicatetype``", "real", "mobility type between stationary and mobile silicate", "-1.0"
    "``skl_bgc``", "logical", "biogeochemistry", "``.false.``"
    "``solve_zbgc``", "logical", "", "``.false.``"
-   "``solve_zsal``", "logical", "update salinity tracer profile", "``.false.``"
+   "``solve_zsal``", "logical", "zsalinity DEPRECATED, update salinity tracer profile", "``.false.``"
    "``tau_max``", "real", "long time mobile to stationary exchanges", "1.73e-5"
    "``tau_min``", "real", "rapid module to stationary exchanges", "5200."
    "``tr_bgc_Am``", "logical", "ammonium tracer", "``.false.``"