Corrected ocean_icetest.in to have correct CPP flag
Merge branch 'daves_edits' of github.com:dgwyther/romsIceShelf into daves_edits