dev/master/2016.12.23 OM4 answers changed by: - Possibly significant change/bug fix: - 66ce27b SIS2: *Fixed a bug when RECATEGORIZE_ICE=True - Round-off changes: - 6c4541d SIS2: *Changed Rad%t_skin from degK to degC - e094c5b SIS2: *Do not do frazil merge of 0 size ice-free part d36bcc9 MOM6: Merge branch 'sternalon-adding_flag_to_zero_fluxes' into dev/master f72a93a MOM6: Merge branch 'sternalon-sea_level_calculation' into dev/master 2c14d56 Merge pull request #117 from nicjhan/328-diagnostic-testing-fixes 0c31987 SIS2: +Fixed spelling errors in parameter descriptions c08287e SIS2: *+Set SIS2_FILLING_FRAZIL = True by default 8712523 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master 2d10104 MOM6: Added hybrid z*-sigma coordinate for ice-shelf cavities 47da424 Changed 3 tests to use SIS2_FILLING_FRAZIL=True 2734c0d Set SIS2_FILLING_FRAZIL in the SIS_input files e094c5b SIS2: *Do not do frazil merge of 0 size ice-free part 419b20a icebergs: Merge branch 'sternalon-fixing_modulos' into dev/master 6c4541d SIS2: *Changed Rad%t_skin from degK to degC 66ce27b SIS2: *Fixed a bug when RECATEGORIZE_ICE=True c93182b Made ice_ocean_SIS2/SIS2 test EULERIAN_TSURF=False eff9c5c SIS2: Added FIA%Tskin_avg & altered TS diagnostic 72c8b57 SIS2: *+Obsoleted ICE_CHANNEL_VISCOSITY