Initial, partial deprecation of zsalinity

[eclare108213]

• [x] Short (1 sentence) summary of your PR: Begin deprecation of the zsalinity code, which provides a prognostic salinity option for use with BL99 thermodynamics.
• [x] Developer(s): @eclare108213
• [x] Suggest PR reviewers from list in the column to the right.
• [x] Please copy the PR test results link or provide a summary of testing completed below.

base_suite: all tests are BFB except those with solve_zsal = true, as expected.

162 of 167 tests PASSED 0 of 167 tests PENDING 0 of 167 tests MISSING data 5 of 167 tests FAILED

FAIL conda_macos_smoke_col_1x1_debug_run1year_zsal run FAIL conda_macos_smoke_col_1x1_debug_run1year_zsal test FAIL conda_macos_smoke_col_1x1_debug_run1year_zsal compare ibased33 different-data FAIL conda_macos_restart_col_1x1_zsal run FAIL conda_macos_restart_col_1x1_zsal test

The zsalinity tests have now been removed from the scripts.

• How much do the PR code changes differ from the unmodified code?
  • [x] bit for bit except for tests that include zsalinity, which abort
  • [ ] different at roundoff level
  • [ ] more substantial
• Does this PR create or have dependencies on CICE or any other models?
  • [x] Yes, CICE should also abort unless solve_zsal is reset to false internally (as it was in Icepack)
  • [ ] No
• Does this PR add any new test cases?
  • [ ] Yes
  • [x] No, it removes a few
• Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/.)
  • [x] Yes
  • [ ] No, does the documentation need to be updated at a later time?
    • [ ] Yes
    • [ ] No
• [x] Please provide any additional information or relevant details below: The primary module, icepack_zsalinity.F90, has been deactivated via an UNDEPRECATE_ZSAL cpp flag, and the code aborts if solve_zsal = .true. The code will be cleaned up as part of the E3SM Icepack merge project, including complete removal of all zsalinity related variables, subroutines, conditional statements, and zsal options.

[eclare108213]

Because solve_zsal is so pervasive throughout the code, I decided not to wrap every occurrence with #ifdef UNDEPRECATE_ZSAL. The changes in this PR should be sufficient to alert the community that zsalinity is being deprecated, in this initial step (but CICE also needs to be checked to make sure it aborts as expected). Testing associated with the E3SM Icepack merge will ensure that complete zsalinity deprecation does not cause unanticipated problems.

[eclare108213]

CICE aborts with -s zsal, as expected. Nothing more needs to be done there unless we want to remove zsal from the test suites now.

(icepack_init_parameters) zsalinity is being deprecated
    (icepack_warnings_setabort) T :file /Users/eclare/E3SMecosystem/CICE-Consortium/sandboxes/icepack.merge/cice.testing/icepack/columnphysics/icepack_parameters.F90 :line         1066
 (icepack_warnings_aborted) ... (icepack_init_parameters)

[eclare108213]

I added the change to icepack_warnings here, for convenience. If we remove the zsal options here, then the code won't compile, and warning messages are only provided when the code aborts a run. So I think we should keep them for now (also in the spirit of being able to easily reinstate the code if needed).

[apcraig]

It's fine to leave them. But they are no longer in the test suite (zsal tests are removed), so deleting set_nml.zsal and set_env.zsal should have no impact. I agree we cannot remove zsal as a namelist setting in ice_in though, so given that, maybe it's fine to leave the set_nml and set_env files as we do need to do another cleanup of the zsal namelist later. Thanks.

[eclare108213]

Thanks @njeffery. @apcraig that's right. I'd like to keep the zsal options available in case a user actually uses -s zsal, so that they'll get a warning message with the abort.

[eclare108213]

I need to make one more correction to the docs

[eclare108213]

Never mind - there's not actually anything related to zsalinity in the Icepack index. So this PR is good to go.

[apcraig]

Will merge when GHActions is done.