dev/master/2017.07.05 ed23886 SIS2: Renamed variables "mod" to "mdl" ac3d222 MOM6: Fix openMP directive in MOM_forcing_type.F90 9830339 MOM6: Multiple merges aece112 Added links to geothermal heat flux data for OM4 88f6a72 Fix warnings about unregistered diagnostics c894445 Merge pull request #136 from nikizadeh/user/nnz/diag_table_comma_bugs ac59bae Adding missing commas to diag_table.MOM6 16ab065 *SIS2: Merge branch 'nikizadeh-user/nnz/loop_index_bug_fix' into dev/gfdl c533764 icebergs: Updates to avoid id roll-over 92e1e7d MOM6: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl 0144c64 Corrected MOM_param_docs for OM4_05 322ca6c OM4: Updated grid files for angle_dx fix e480b26 *Merge of ESMG-user/ksh/open_bc ea3db5d OM4 preprocessing: Use version of MIDAS compatible with PAN e7593fb Preprocessing: corrected checksums for intermediate files 7f61415 OM4 preprocessing: added analysis grid for OM4_05 0300c4c OM4 preprocessing: New ocean_hgrid.nc with fixed angles 8dd165a Jenkins: updated Jenkins scripts for geothermal fluxes c1b5010 OM4: Re-factored pre-processing of OM4 grids d8f5878 Renamed mis-spelled directory dc2a84c OM4: Added geothermal pre-processing for OM4_05 3a1d93e MOM6: Merge branch 'ashao-offline_tracer_updates' into dev/gfdl 179ccf8 Fixed flow_downslope input.nml 9b67a00 MOM6: *Merge branch 'nicjhan-516-transform-fail-uhtot-uses-tauy'