Merge branch 'mark-petersen/update_mpas_200910' (PR #3825)

Update mpas-source: GM/Redi and surface buoyancy fixes

This PR brings in a new mpas-source submodule with changes only to the
ocean core, plus scripts updates corresponding to Registry changes in
the ocean. It includes three changes to improve ocean heat uptake:
* Fixes limiting on redi k33 (MPAS-Dev/MPAS-Model/pull/684);
* Fixes surface buoyancy forcing calculation
  (MPAS-Dev/MPAS-Model/pull/690); and
* Revert GM buoyancy gradient calculation to v1 form
  (MPAS-Dev/MPAS-Model/pull/687).

[NML]
[non-BFB]

components/mpas-ocean/bld/build-namelist

@@ -595,6 +595,7 @@ add_default($nl, 'config_Rayleigh_bottom_damping_coeff');
 #########################
 
 add_default($nl, 'config_use_cvmix');
+add_default($nl, 'config_cvmix_use_kpp_buoyancyForcing_fix');
 add_default($nl, 'config_cvmix_prandtl_number');
 add_default($nl, 'config_use_cvmix_background');
 add_default($nl, 'config_cvmix_background_diffusion');

components/mpas-ocean/bld/build-namelist-section

@@ -136,6 +136,7 @@ add_default($nl, 'config_Rayleigh_bottom_damping_coeff');
 #########################
 
 add_default($nl, 'config_use_cvmix');
+add_default($nl, 'config_cvmix_use_kpp_buoyancyForcing_fix');
 add_default($nl, 'config_cvmix_prandtl_number');
 add_default($nl, 'config_use_cvmix_background');
 add_default($nl, 'config_cvmix_background_diffusion');

components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml

@@ -178,6 +178,7 @@
 
 <!-- cvmix -->
 <config_use_cvmix>.true.</config_use_cvmix>
+<config_cvmix_use_kpp_buoyancyForcing_fix>.true.</config_cvmix_use_kpp_buoyancyForcing_fix>
 <config_cvmix_prandtl_number>1.0</config_cvmix_prandtl_number>
 <config_use_cvmix_background>.true.</config_use_cvmix_background>
 <config_cvmix_background_diffusion>0.0</config_cvmix_background_diffusion>

components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml

@@ -595,6 +595,14 @@ Valid values: True or False
 Default: Defined in namelist_defaults.xml
 </entry>
 
+<entry id="config_cvmix_use_kpp_buoyancyForcing_fix" type="logical"
+	category="cvmix" group="cvmix">
+If true CVMix KPP buoyancy forcing fix for sea ice is enabled
+
+Valid values: True or False
+Default: Defined in namelist_defaults.xml
+</entry>
+
 <entry id="config_cvmix_prandtl_number" type="real"
 	category="cvmix" group="cvmix">
 Prandtl number to be used within the CVMix parameterization suite