dev/gfdl/2018.08.25 24106e5 icebergs: Merge pull request #59 from wfcooke/user/wfc/calving_restart_timestamp 2741a88 MOM6: Merge pull request #844 from adcroft/avoid-domain_aux-for-wind-stagger b864fed MOM6: Merge branch 'Hallberg-NOAA-streamline_restore_state' into dev/gfdl 5dcd7c3 SIS2: +Temporarily avoid new update_ocean_model args f45003c Use IO_LAYOUT=2,2 in global_ALE 5007183 MOM6: Merge pull request #841 from adcroft/fix-oob-restart-filename f6ae30c MOM6: Merge pull request #839 from MJHarrison-GFDL/rotation_angle_diagnostic e795958 Merge branch 'Hallberg-NOAA-use_stress_mag' into dev/gfdl 9f11b05 Updated examples with use_stress_mag d11c6a4 SIS2: Merge branch 'Hallberg-NOAA-add_stress_mag' into dev/gfdl 98b627c Merge branch 'dev/master' into dev/gfdl 78cfb2d MOM6: Merge pull request #820 from adcroft/fix-doxy-1.8.4 7e5d936 MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl fbe2918 MOM6: Merge pull request #820 from adcroft/fix-doxy-1.8.4 ed36e93 MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl 054912d Merge branch 'dev/master' into dev/gfdl 9025815 MOM6: Merge branch 'gustavo-marques-update_KPP' into dev/master aeda3c9 SIS2: Merge branch 'Hallberg-NOAA-dOxyGenize_SIS2' into dev/gfdl e937dd8 Merge branch 'Hallberg-NOAA-vertex_shearmix' into dev/gfdl ea2a6be MOM6: Merge pull request #801 from Hallberg-NOAA/vertex_shearmix ab45a7d Merge branch 'vertex_shearmix' of https://github.com/Hallberg-NOAA/MOM6-examples into Hallberg-NOAA-vertex_shearmix 7632200 MOM6: Merge pull request #799 from adcroft/aniso-hor-visc 4bac59b Update examples with VERTEX_SHEAR a2162e4 MOM6: Merge branch 'ESMG-cleaning' into dev/gfdl f894815 MOM6: *Merge branch 'ESMG-dev/esmg' into dev/gfdl f1e9681 Merge branch 'dev/master' into dev/gfdl 5d17daf MOM6: Merge pull request #787 from NOAA-GFDL/dev-master-candidate-2018-06-03 48d4f8d MOM6: Merge branch 'dev/master' into dev/gfdl 0a13ed9 MOM6: Merge branch 'gustavo-marques-add_old_double_diffusion' into dev/master f2aa2bd MOM6: Merge branch 'gustavo-marques-legacy_diabatic_driver' into dev/master 20799a1 MOM6: Merge pull request #774 from NOAA-GFDL/dev-master-candidate-2018-05-15 72580e8 MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl bed9677 Merge branch 'adcroft-disable-kpp-in-single-col-bml' into dev/gfdl f2fd688 Disable KPP in single_column/BML experiment dc9b61d gitlab: Adds testing of MOM6_parameter_doc and updates coverage d84538c MOM6: Merge pull request #760 from ESMG/dev/esmg 3bcc768 MOM6: Merge branch 'MJHarrison-GFDL-MOM6_DA_rename' into dev/gfdl ae71364 Travis: added script to build with OpenMP c465130 mkmf: Updated to allow -l option 7339de5 MOM6: Merge branch 'Hallberg-NOAA-correct_reset_dtbt' into dev/gfdl 28a4377 Merge branch 'correct_reset_dtbt' of https://github.com/Hallberg-NOAA/MOM6-examples into Hallberg-NOAA-correct_reset_dtbt b06285a MOM6: Merge branch 'MJHarrison-GFDL-MOM6_DA' into dev/gfdl c903983 MOM6: Merged dev/ncar & dev/master into dev/gfdl 1091210 MOM6: Merged dev/ncar into dev/master fd12185 Revert "mkmf: Updated to latest version on master branch" 2beb300 mkmf: Updated to latest version on master branch 4c080d1 MOM6: (*)Do not recalculate DTBT every coupled timestep b40aa92 MOM6: Merge branch 'breichl-breichl/user/bgr/waves_update' into dev/gfdl