Tags

dev/gfdl/2017.09.27

8d4de1e MOM6: Merge pull request #621 from adcroft/adds_area_cell_method
7f94c58 MOM6: Merge pull request #618 from adcroft/cell_measure_volcello
5e48ccd MOM6: Merge pull request #612 from ESMG/OBC_tracers
4b4f8ef MOM6: Merge pull request #612 from ESMG/OBC_tracers
f63875d MOM6: Merge branch 'ashao-fix_T_S_flux_diags' into dev/gfdl
853bcbb *OM4_05: Update baseline to candidate OM4.configuration
1673fc7 *OM4_025: Updates baseline to final OM4.0 configuration
e7028e0 OM4: (*)Cleanup MOM_input
0ad7ba9 *OM4: Recover CM4 2017.07.05 answers
7b98a79 MOM6: Merge pull request #610 from adcroft/cmip-compatible-diagnostic-units
b557cef OM4_05: Enabled rho-space diagnostics
62bb9e6 MOM6: Merge pull request #607 from ashao/remapped_vert_remap_tendencies
474b575 OM4: Enables rho-space diagnostics
1bc3e6e OM4: Adds omldamax to ocean_daily!
6618238 OM4: Moved boundary_forcing_heat_tendency to annual_z
f38fcd1 OM4: Adds rho-space transports to diag_table
3327f1b OM4: Clean up diag_table.MOM6_spinup
9984e36 OM4: Adds monthly z-space transports
4ef960e MOM6: Merge pull request #601 from adcroft/fix_units_vhml_vhgm
4af5297 Adds sftof to OM4 diag_table
aed7f0f Fix for NCI Jenkins fail, MESO_025_23L
b312c21 OM4: Cleanup MOM_input
ecc935b MOM6: Merge pull request #595 from adcroft/add_static_cell_measures
04c5e64 MOM6: Merge pull request #593 from adcroft/fix_cell_measures
ede50cc MOM6:Merge pull request #594 from adcroft/cmor_missing_value
95d1e3c OM4: Remove _pow2 variables from diag_table
beb1964 Merge branch 'MJHarrison-GFDL-user/mjh/FMS_for_sponges' into dev/gfdl
c586afe Merge branch 'user/mjh/FMS_for_sponges' of https://github.com/MJHarrison-GFDL/MOM6-examples into MJHarrison-GFDL-user/mjh/FMS_for_sponges
f6957cf Merge branch 'obsolete_legacy_split' into dev/gfdl
578e6f1 Reset SIS2 and FMS submodule versions
776b6e6 Switch to updated version of FMS for MOM6#586
44db22b Updated parameter files for tracer-mixing
3d01bfb MOM6: +Obsoleted USE_LEGACY_SPLIT
b2b0964 Merge branch 'Hallberg-NOAA-modernize_CM2G63L' into dev/gfdl
47f9e96 Cleaned up MOM_input for CM2G63L
5ea0080 *Change barotropic solver used by CM2G63L
222ac50 MOM6: Merge pull request #585 from NOAA-GFDL/split_MOM_forcing_type
b7a8b63 icebergs: Update license to LGPLv3
06ae1dd SIS2: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
f5ebf29 Merge branch 'Hallberg-NOAA-reorder_MOM_init' into dev/gfdl
cefcb99 Merge branch 'reorder_MOM_init' of https://github.com/Hallberg-NOAA/MOM6-examples into Hallberg-NOAA-reorder_MOM_init
595b4cd Corrected version of FMS submodule
59bdfa6 Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
380517d MOM6: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
5cb23e3 MOM6: Reordered MOM6 initialization calls
3ec0ff1 MOM6: *Removed dependence of OBC solutions on external h
7e45804 Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into dev/gfdl
9e605be Added month/annual min/max of mlotst to diag_table
adeb477 Removed last vestiges of GPLv3
ecb010a MOM6: Update license to LGPLv3
9e61cfa Merge branch 'dev/gfdl' into dev/master
3f17d14 MOM6: Merge branch 'dev/master' into dev/gfdl
ea9c5e8 MOM6: Merge pull request #577 from ashao/ndiff_referenced_density
8b801de MOM6: Merge pull request #578 from NCAR/dev/ncar
18f3841 Merge branch 'nicjhan-142-fix-diag-test' into dev/gfdl
0c9c563 Merge branch '142-fix-diag-test' of https://github.com/nicjhan/MOM6-examples into nicjhan-142-fix-diag-test
3871c25 Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into dev/gfdl
1bc099a MOM6: Merge of ashao-ndiff_update_neutral_position
48c1bfe Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into dev/gfdl
58e7197 +Update the coupler_type_reform_rwh branch of FMS
b65e244 Diagnostic test requires clean diag_table to start. Closes #142
e26ee25 Reduce Baltic diagnostic max outputs within limits. #142
0ef6bf5 Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
76e81cd MOM6: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl
48fd416 *MOM6: Fix dimension conversion for GMwork term
c19391e +Use updated coupler_type_reform_rwh branch of FMS
70394d8 Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into dev/gfdl
c98073d MOM6: *Updated solutions after MOM6 PR#571
1d99df8 Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into dev/gfdl
b1df588 Merge pull request #137 from adcroft/import-neverland
b088d83 +Use the coupler_type_reform_rwh branch of FMS
01ee3be Updated docs for adcroft:import-neverland
ebc0c8d *MOM6: Corrected parentheses in APE calculation
f30621c MOM6: (*)Fixes gprime(1) when no layer coordinates are set
829ddea MOM6: *Merge branch 'ESMG-user/ksh/open_bc' into dev/gfdl
7360314 circle_obcs: specify Flather instead of legacy
717249c Turned off lateral viscosity for single column expts
7219d47 *MOM6: Bracketing fix for transform test. Changes answers.

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'

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

dev/master/2017.05.26

Answer changes:
  - Updated OM4 configurations (47dcd96):
    - OM4_025 configuration now reflects settings used in dora run 725.
    - OM4_05 configuration now reflects settings used in dora run 714.
  - Switched to c4 versions of compilers (Intel 16, ...)
  - OBCs development:
    - 5a03b2a zeroes baroclinic accelerations on OBCs
  - Baltic_ALE_z_offline_tracer expt is no-longer periodic

Bug fixes:
  - 3802a86 affects EBT vertical structure for symmetric memory mode

47dcd96 *OM4: Updated configurations to candidates for CMIP6
c5d3cc3 OM4: Synced MOM_input with MOM_parameter.short in OM4 expts
3802a86 (*)MOM6: Bugfix: corrected allocated size of VarMix%ebt_struct
996339f Updated submodule SIS2 after layout file updates
de7ab41 Changed layout files to indicate symmetric memory
3440775 MOM6: Merge branch 'user/nnz/use_teos10_tfreeze' into dev/master
fcdfed0 +SIS2 uses symmetric memory in OM_360x320_C180
2ad5ab8 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
ab60a2f Update gitlab pipeline scripts for compiler version change
2195882 Added missed files in compiler update
d982cb0 Merge pull request #131 from NOAA-GFDL/nikizadehgfdl-patch-1
1f55a2b Merge commit 'warsaw-fixes' into dev/master
f7638d8 Updated gitlab scripts for warsaw build
b1a852c Corrected VERONA_COUPLER in MOM_parameter_doc.layout
ecb8abd *Updated compiler versions to intel 16 & pgi 16.5
4a371e4 +Updated code versions to warsaw & verona_201701
ea84b5a update SIS_override
5a03b2a *MOM6: Merge branch 'ESMG-zero_accel' into dev/master
4979172 Fix for gitlab pipeline lustre race condition
c5bff21 Merge pull request #129 from jkrasting/user/jpk/section_transport_analysis_fix
d92c483 Updates section transports script to accept daily pp-data
6edeb2b Update src/FMS to "warsaw" release
a133819 MOM6: +Set the default for THIN_HALO_UPDATES to True
3437687 Work around for firewall on PAN
6c3fc2f Updated FMS to a preWarsaw version
6a0432d Added preprocessing of geothermal data
db11564 SIS2: +(*)Made concurrent ice coupling restarts reproduce
54ec277 *Updated Baltic_ALE_z_offline_tracer
e5de6a4 Added basic tools for the gitlab pipeline to use
b6043cb Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
7d1ba6c *MOM6: Merge branch 'ESMG-user/ksh/open_bc' into dev/master
1fe3708 Removed conserve_water from input.nml files
82f866a MOM6: Merge branch 'angus-g-dense-overflow' into dev/master
eddfaeb MOM6: Merge branch 'MJHarrison-GFDL-user/mjh/bad_val_thickness' into dev/master
365124a Shortened the CVmix_SCM test cases
e47d8f2 Merge pull request #127 from jkrasting/dev/master
43a0eab Veritcal levels in TS_drift.py were reversed
6f98351 Reduced verbosity of Travis scripts
1c49770 Echo md5sum to tty for MOM6 Travis
9539294 MOM6: Merge branch 'MJHarrison-GFDL-user/mjh/salt_diag_fix' into dev/master
376df57 MOM6: Merge branch 'angus-g-ndc-module' into dev/master
b5e5d5c MOM6: Merge branch 'ESMG-user/ksh/open_bc' into dev/master
e5188ed Merge branch 'aja-travis-script-for-mom6' into dev/master
f183988 Added MOM6 code coverage badge

dev/master/2017.04.22

- Added MLD to tracer APIs (for John Dunne).
- Answers potentially change due to 648f057.

3d6532f MOM6: Provide mixing layer depth to tracer packages
648f057 MOM6: Switched Travis build to use debug compiler options
869750b MOM6: +Added THIN_HALO_UPDATES
fd91c16 *MOM6: Merge pull request #2 from adcroft/new_remapping_algorithm
961143b MOM6: Added CMOR name to ideal "age" tracer
198bae7 Added "unit tests" configuration
9824bde MOM6: Moved call to unit_tests and made DO_UNIT_TESTS visible
476ce1b Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
1d6b69e MOM6: Changed string lengths used in ALE documentation
37a0197 Merge branch 'nikizadehgfdl-patch-1' into dev/master
ca8ab2d Update diag_table.SIS
fda9af4 Fixed RTD badge for "latest" in README.md
6de95db Added RTD badge to README.md
19c0881 MOM6: *Corrected OBC index bounds in set_viscosity

dev/master/2017.04.17

- Answer changes for OBCs
- New ePBL options
- Major refactor of analysis

1ffd9a5 Merge branch 'jkrasting-user/jpk/manifest_refactor' into dev/master
9049d2a Merge branch 'user/jpk/manifest_refactor' of https://github.com/jkrasting/MOM6-examples into jkrasting-user/jpk/manifest_refactor
8037fbe Syncing submodules for new tag
59e130c MOM6: *Fixed OOB error introduced in recent refactor
0777fee MOM6: *Fixed OOB error introduced in recent refactor
ba6ddce MOM6: *Apply OBCs in MOM_vert_friction
aed09a0 Verified analyses on PAN; generated md5sums
21a5329 Verified analyses on GFDL workstation; generated md5sums
fa377aa Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
9028409 MOM6: Merge branch 'angus-g-regridding-modules' into dev/master
0a49b27 Corrected the circle_obcs/ocean.stats.intel file
c683df3 MOM6: +OBC projections of h in CorAdCalc
e94b9cc SIS2: Fix submodule reference
0e7b9fe MOM6: +OBC projections of h in horizontal_viscosity
47f6ce4 MOM6: +Refactored interpolation of h to q in horiz_visc
a05d739 MOM6: Merge branch 'ESMG-user/ksh/open_bc' into dev/master
e730c5c MOM6: Merge branch 'breichl-user/bgr/ePBL_T' into dev/master
ad4e328 *Added seaice.stats missed in last commit
766fbc3 MOM6: +Refactored interpolation of h to q in CorAdCalc
fe9075a7 Updated MOC figure checksums
f0eb9b2 Changed file ext to 'md5' for list of png checksums
9fb619e MOM6: *Use OBC in to set fractional thicknesses in btcalc
b9ae22d Restored split scale to meridional overturning plot
80a63cc Merge branch 'user/jpk/vertical_scale_fix' into user/jpk/manifest_refactor
c7877da Switch order of min and max in limit_range_for_scale
fe6978f Added mixed layer depth plots to web interface
6db7203 Added list of checksums for analysis figure output
b3b11a1 Several fixes to make the script work with the new CGI launcher
d5be9a5 Merge branch 'dev/master' into user/jpk/manifest_refactor
c0f5c44 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
32c0776 Changed 'zt' to 'z_l' in TS_drift plot script

dev/master/2017.04.05

- Bug fix for limiter in two-streamfunction form of MLE (might affect future OM4)

578c20c *MOM6: Merge branch 'nicjhan-449-viscousbbl-indexing-error' into dev/master
3481d0b MOM6: Merge branch 'gustavo-marques-read_interfaces_ale_rho' into dev/master

commit 578c20c2cbc49ea47ee4173cda767edba18afbdd includes
- NOAA-GFDL/MOM6@f201ca0 Merge branch 'nicjhan-449-viscousbbl-indexing-error' into dev/master
- NOAA-GFDL/MOM6@e18dbab Merge branch '449-viscousbbl-indexing-error' of https://github.com/nicjhan/MOM6 into nicjhan-449-viscousbbl-indexing-error

commit 3481d0b45ccc77893f2510ed39dd3fef42320452 includes:
- Bug fix for limiter in two-streamfunction form of MLE (might affect future OM4)
- NOAA-GFDL/MOM6@a9b6f95 Merge branch 'gustavo-marques-read_interfaces_ale_rho' into dev/master
- NOAA-GFDL/MOM6@a0827ae Merge branch 'read_interfaces_ale_rho' of https://github.com/gustavo-marques/MOM6 into gustavo-marques-read_interfaces_ale_rho
- NOAA-GFDL/MOM6@3fca34a (*)Fixed limiter to second MLE streamfunction
- NOAA-GFDL/MOM6@b97c040 Merge branch 'angus-g-xml-docs-production' into dev/master
- NOAA-GFDL/MOM6@beb48a9 Documented sphinx dependencies
- NOAA-GFDL/MOM6@9eb5704 Merge branch 'xml-docs-production' of https://github.com/angus-g/MOM6 into angus-g-xml-docs-production
- NOAA-GFDL/MOM6@876f946 Do btcalc on the symmetric computational domain
- NOAA-GFDL/MOM6@92d7b33 Added "silly value" routine for OBC h's
- NOAA-GFDL/MOM6@5567c23 Add Read The Docs YAML configuration file
- NOAA-GFDL/MOM6@20fdba2 Generate the correct files in conf.py
- NOAA-GFDL/MOM6@d8b20d8 Convert Doxygen XML to native Sphinx documentation
- NOAA-GFDL/MOM6@7a8ad24 Adds option to read density interfaces from a file in ALE/rho mode

dev/master/2017.04.02

- Adds new MLE option of second filtering time-scale
- OM4 answers changed by bugfix 33c902e

237b094 MOM6: Merge branch 'ashao-make_diabatic_cs_private' into dev/master
f88ecf0 MOM6: Implemented second/slower MLE transport
33c902e *MOM6: Bugfix: Effective MLD in MLE was whole number of layers
84fe368 MOM6: Allow MLE running-mean filter to be applied to diagnosed MLD
0cf1b6c SIS2: +Optionally iterate skin temperature and optics
816c11b MOM6: Merge branch 'ashao-reorder_transport_diag_post' into dev/master
ffd83a7 Merge pull request #121 from jkrasting/user/jpk/month_labels
495ed3c SIS2: *+Corrected a bug in the latent heat of sublimation
0fc5df5 Cleaned up labels for monthly SST plots
931c25c Merge pull request #120 from jkrasting/dev/master
b693685 Updated analysis Makefile with sst_monthly target
b4fa869 Script to plot monthly SST bias
6f41024 Fix for recent change of table rendering
503b8a3 Merge pull request #1 from NOAA-GFDL/dev/master

dev/master/2017.03.17

- New "s" tuning options and Langmuir turbulence in ePBL

c5949e4 MOM6: Merge branch 'breichl-user/bgr/ePBL_MLDless_mstar' into dev/master
a7bca67 *MOM6: Fix to SIMPLE boundaries after recent change.

dev/master/2017.03.12

- Provides new option for calculating m* in ePBL

fdcbceb (*)MOM6: Add new method for determining ePBL mstar in stabilizing conditions.
a25d2b2 SIS2: Code clean-up in SIS2_ice_thm
c5d7d75 MOM6: Added parameter to MLE to shrink/stretch effective MLD
c924b24 *MOM6: Merge branch 'ESMG-user/mjh/remove_extensions' into dev/master
881c3e8 MOM6: Added oblique OBC in barotropic
b8e86b4 Added isopycnal mixing test "tracer mixing"
1a1b57b MOM6: Added logging of target densities in "rho" ALE mode
c244cb9 MOM6: Adds the option to ignore fluxes applied over land
4287ce1 *Reduced length of mixed_layer_restrat_2d test
0b5a7b2 MOM6: Merge branch 'user/mjh/fix_diagnostics' into dev/master
e7a9a32 SIS2: +Moved ocean_part_min into ice_grid_type
02e3e82 SIS2: +Added run-time parameter REORDER_0C_HEATFLUX
03585ac Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
df0d400 Added notebooks for double_gyre and flow_downslope

dev/master/2017.02.23

- Adjusts formulation of Ferrari et al.

3a7ded8 Deleted bank example that was added by mistake
19b21d6 *Updated global_ALE to test Ferrari et al.
e58a8b9 MOM6: Added compensating scaling in Ferrari et al streamfunction

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

dev/master/2017.02.10

OM4_025 changes:
- Reverting to ePBL "n" settings

8832b0b MOM6: Merge branch 'breichl-user/bgr/EPBL_LT_function' into dev/master
b6af64f *OM4_025: Revert "*OM4_025: Moved baseline forward to use ePBL "o" settings"
cbb9d1a SIS2: Changed the internal sign convention for drdt
a06a05f SIS2: +Corrected flux-linearization diagnostics
f73f542 SIS2: +Added INTERPOLATE_FLUXES and heat flux arrays

dev/master/2017.02.03

- New code to cap m* in ePBL.
  - This is a possible fix for te very cold gyres (deep mixing used "p" configuration or ePBL)

d059666 Added MSTAR to OM4_025 diag_table
4048c45 MOM6: Merge branch 'breichl-user/bgr/EPBL_LT_function' into dev/master
5e4c4a8 MOM6: Merge branch 'breichl-user/bgr/EPBL_LT_function' into dev/master

dev/master/2017.01.30

- Moved "baseline" forward to ePBL "o".
- New Langmuir turbulence parameters.

86340d0 *OM4_025: Moved baseline forward to use ePBL "o" settings
becd8ad OM4: Added Langmuir number diagnostic
490e47a MOM6: Merge branch 'breichl-user/bgr/EPBL_LT_function' into dev/master

dev/master/2017.01.27

- Allows newer Langmuir turbulence enhancement of ePBL mixing.
- CM4 answers changed:
  - SIS2 reconfig (4ceac1c).
  - MEKE bug fix (395f21b).
- a59cb16 only affects OM4 NYF CORE II, not CM4.

4ceac1c *OM4_025: Switched to more robust SIS2 settings
b674daa MOM6: +Use MOM_debugging and call MOM_debugging_init
a59cb16 *OM4_025: Use correctly regridded runoff
079e96e MOM6: Merge branch 'breichl-user/bgr/EPBL_LT_function' into dev/master
7a99cab SIS2: +Renamed SIS_error_checking to SIS_debugging
395f21b MOM6: *Fixed a bug in step_forward_MEKE
549d37b MOM6: +Merge branch 'ashao-coupled_offline_clean' into dev/master

dev/master/2017.01.20

CM4 answers change due to:
- Major bugfix in neutral diffusion (111e81f)
- Minor SIS2 update (ae61f34)

Also:
- Fixed iceberg restart issue (false positive checking for duplicates)
- Corrected ocean_daily in OM4_025 diag_table
- Fixed cg_ebt diagnostic

98f4cc0 SIS2: Corrected OMP directives
8adedb2 MOM6: Added inter_method='none' for some static coordinates
111e81f MOM6: *Merge branch 'dev/master' into resurrect_ppm_neutral_diffusion
c461822 SIS2: *Make answers invariant to MIN_OCEAN_PARTSIZE > 0
3b5a659 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
ae61f34 SIS2: +Make answers invariant to MIN_OCEAN_PARTSIZE > 0
b4d597e Replaced 5daily with daily in OM4_025 diag_table
16366e2 MOM6: If diagnosing cg_ebt then always find modal structure
a3f154e icebergs: Fix for when iceberg ids are negative
b0f9790 SIS2: +Added runtime parameter MIN_OCEAN_PARTSIZE
0d99385 Moved Jenkins status into a table at top

(tag dev/master/2017.01.18 was not used for production and so I included those commits here)

dev/master/2017.01.18

- Fixed iceberg restart issue (false positive checking for duplicates)
- Corrected ocean_daily in OM4_025 diag_table
- Fixed cg_ebt diagnostic

b4d597e Replaced 5daily with daily in OM4_025 diag_table
16366e2 MOM6: If diagnosing cg_ebt then always find modal structure
a3f154e icebergs: Fix for when iceberg ids are negative
b0f9790 SIS2: +Added runtime parameter MIN_OCEAN_PARTSIZE
0d99385 Moved Jenkins status into a table at top

dev/master/2017.01.08

- Bug fixes for OM4 with new variant of SIS2
- Provides new options in ePBL (79c1c14)
- Provides option to use TEOS-10 (eb45808)

7e27669 SIS2: *Corrected 't_surf_ice' in a query_initalized call
eb45808 MOM6: Merge branch 'user/nnz/add_NEMO' into dev/master
79c1c14 MOM6: Merge branch 'breichl-user/bgr/EPBL_Len' into dev/master
61f47ad Updated CM4 diag_table and section transport script
879f4a8 MOM6: Corrected CMOR names, cell measures for some diagnostics
9e34751 SIS2: *Corrected a bug with FILLING_FRAZIL=True

dev/master/2016.12.23

OM4 answers changed by:
  - Possibly significant change/bug fix:
    - 66ce27b SIS2: *Fixed a bug when RECATEGORIZE_ICE=True
  - Round-off changes:
    - 6c4541d SIS2: *Changed Rad%t_skin from degK to degC
    - e094c5b SIS2: *Do not do frazil merge of 0 size ice-free part

d36bcc9 MOM6: Merge branch 'sternalon-adding_flag_to_zero_fluxes' into dev/master
f72a93a MOM6: Merge branch 'sternalon-sea_level_calculation' into dev/master
2c14d56 Merge pull request #117 from nicjhan/328-diagnostic-testing-fixes
0c31987 SIS2: +Fixed spelling errors in parameter descriptions
c08287e SIS2: *+Set SIS2_FILLING_FRAZIL = True by default
8712523 Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6-examples into dev/master
2d10104 MOM6: Added hybrid z*-sigma coordinate for ice-shelf cavities
47da424 Changed 3 tests to use SIS2_FILLING_FRAZIL=True
2734c0d Set SIS2_FILLING_FRAZIL in the SIS_input files
e094c5b SIS2: *Do not do frazil merge of 0 size ice-free part
419b20a icebergs: Merge branch 'sternalon-fixing_modulos' into dev/master
6c4541d SIS2: *Changed Rad%t_skin from degK to degC
66ce27b SIS2: *Fixed a bug when RECATEGORIZE_ICE=True
c93182b Made ice_ocean_SIS2/SIS2 test EULERIAN_TSURF=False
eff9c5c SIS2: Added FIA%Tskin_avg & altered TS diagnostic
72c8b57 SIS2: *+Obsoleted ICE_CHANNEL_VISCOSITY