Branch dev_r4879_UKMO_NOC_MERGE. Create branch for the merging of UKMO and NOC developments. Begin with UKMO2_ice_shelves as the base.