Eliminates the need to use ZSTAR_RIGID_SURFACE_THRESHOLD#378

adcroft merged 3 commits into

mom-ocean:dev/mastermom-ocean/MOM6:dev/masterfrom

gustavo-marques:ale/ice_shelfgustavo-marques/MOM6:ale/ice_shelfCopy head branch name to clipboard