User/mjh/ice shelf#63

adcroft merged 3 commits into

dev/mastermom-ocean/MOM6:dev/masterfrom

user/mjh/ice_shelfmom-ocean/MOM6:user/mjh/ice_shelfCopy head branch name to clipboard