dev/master/2017.06.12 - OM4 answers changes due to multiple bug fixes in GM/MEKE: - cc1e320 updates solutions with GM EBT vertical structure. - 3b56fdf fixes masking of terms in MEKE and slope calculations. cc1e320 *MOM6: Merge branch 'MJHarrison-GFDL-user/mjh/fix-meke' into dev/gfdl 5e194c6 adjustment_2d had inconsistent input.nml and MOM_input f1c7b15 *MOM6: Merge branch 'ESMG-user/ksh/open_bc' into dev/gfdl 2aaf4c6 Pipeline: Removed scripts which now live with regressions cad9e60 Removed seaice.stats files c653d6b MOM6: Fix typo in log message for USE_VISBECK_SLOPE_BUG 3c9e098 Merge pull request #132 from NOAA-GFDL/user/smg/diag_table_updates 76288b0 Merge pull request #134 from nicjhan/133-test-build-cpp-define 5b5aa64 Update test build scripts with new CPP define _USE_LEGACY_LAND_. Closes #133 0209c5c +Merged in "This adds the 2D Leith viscosity #507" 3b56fdf *Merged in User/mjh/fix meke #506 60eace9 Updated coupler to add Concurrent_ice_1deg 265cb2b Enabled geothermal heat diagnostic; static field. e30625b Initial commit for streamlined MOM6 diag table for use in spin-up. 8e6e5d5 MOM6: *Fix two MEKE bugs 7e2dfcc *Merge branch 'ESMG-user/ksh/open_bc' into dev/gfdl 3512f36 Updated .gitignore after deleting stats files a23fe0c Moved regression stats files b822cf4 Partially reverting c7f5c191d71c67 fbd12b1 Corrected new expt Concurrent_ice_1deg c7f5c19 Updated coupler to permit concurrent_ice coupling 68831f6 Added coupled_.../Concurrent_ice_1deg test case