dev/master/2015.09.21 606f31e *Reverted "low mixing" changes in OM4 3e870ad Removed KPP diagnostics from OM4 diag_table a938ddd MOM6: Added apply_topography_edits_from_file() fa2dcd9 *New OM4 vertical grid e6bdc71 Updates for CMOR diagnostic names; more needed. 3ab12cd FMS: Updated FMS to allow for 4d restarts using visible branch. 7abab01 FMS: Updated FMS to allow for 4d restarts. 6df2291 Move umo,vmo from diag_to_Z to dynamics_split_RK2 edfc2ce Move umo,vmo from diag_to_Z to dynamics_split_RK2 66a5f36 Placeholder diag table for building CMIP6 diags. 307ce4a Merge pull request #49 from NOAA-GFDL/user/jpk/diagnostic_and_analysis_edits 1e1b32b Merge branch 'user/smg/remove_KPP_BEFORE_KAPPA_SHEAR' into dev/master 8b3eb68 *Changed default for KPP_BEFORE_KAPPA_SHEAR 4fe33ff SIS2: Minor fix for generate_test_icebergs, used in debugging 5a75341 Layer ave T&S to diagtable; sea ice analysis mod 7332c1b Removed obsolete KPP_BEFORE_KAPPA_SHEAR b0ddfa0 **Remove obsolete KPP_BEFORE_KAPPA_SHEAR 75dc4c4 Diagnostic KH_t = CMOR diftrblo added. 646b04f Diagnostic updates for Kd_heat, Kd_salt, mldsq a86f3d2 Corrected units on squared MLD diagnostic: m-->m2 8d1dcdf Fixed paths to MIDAS in ocn_annual.frepp dc55b38 Added netcdf file of isolated topography edits 6838432 Record version of MIDAS in Makefile 26b950f Moved OM4 grid generation to ice_ocean_SIS2/OM4_025/ 2b529ce Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master 968c398 Change CMOR name "rlds" to "rlntds" as per CMIP6. ae837e0 Change CMOR name "rlds" to "rlntds" as per CMIP6. 2c6167f Updated available_diag after commit 744756ac 744756a MOM6: +Created MOM_diabatic_aux.F90