dev/master/2017.02.21 - Streamfunction solver (Ferrari et al., 2010) added to thickness_diffuse (89f781d) - SIS2 diagnostics (31138ca) 2a3d490 SIS2: Merge branch 'user/nnz/fix_esm_dust_flux' into dev/master 3211a00 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master 2b1eea5 SIS2: +Added REDO_FAST_ICE_UPDATE acdbf51 icebergs: Merge branch 'sternalon-Mixed_melting' into dev/master 89f781d MOM6: Implemented Ferrari et al. streamfunction GM formulation 56fcb78 Corrected circle_obcs MOM_input 41b8145 Merge pull request #119 from NOAA-GFDL/user/wh/mikesdiagnostics 8c180b8 MOM6: Merge branch 'ESMG-user/ksh/open_bc' into dev/master 31138ca Additional diagnostics for SIS2 from Bill Hurlin de226a3 Merge branch 'dev/master' into segment_loops faa0d68 MOM6: Merge branch 'angus-g-ppm-advection' into dev/master