<p><b>dwj07@fsu.edu</b> 2013-02-20 13:40:41 -0700 (Wed, 20 Feb 2013)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Merging trunk with branch.<br>
</p><hr noshade><pre><font color="gray">Index: branches/ocean_projects/sea_level_pressure
===================================================================
--- branches/ocean_projects/sea_level_pressure        2013-02-20 20:32:54 UTC (rev 2493)
+++ branches/ocean_projects/sea_level_pressure        2013-02-20 20:40:41 UTC (rev 2494)

Property changes on: branches/ocean_projects/sea_level_pressure
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,7 ##
 /branches/ocean_projects/ale_vert_coord_new:1387-1428
 /branches/ocean_projects/cesm_coupling:2147-2344
 /branches/ocean_projects/diagnostics_revision:2439-2462
+/branches/ocean_projects/explicit_vmix_removal:2488-2490
 /branches/ocean_projects/gmvar:1214-1514,1517-1738
 /branches/ocean_projects/imp_vert_mix_error:1847-1887
 /branches/ocean_projects/imp_vert_mix_mrp:754-986
## -28,3 +29,4 ##
 /branches/omp_blocks/multiple_blocks:1803-2084
 /branches/source_renaming:1082-1113
 /branches/time_manager:924-962
+/trunk/mpas:2486-2493
\ No newline at end of property
Modified: branches/ocean_projects/sea_level_pressure/namelist.input.ocean
===================================================================
--- branches/ocean_projects/sea_level_pressure/namelist.input.ocean        2013-02-20 20:32:54 UTC (rev 2493)
+++ branches/ocean_projects/sea_level_pressure/namelist.input.ocean        2013-02-20 20:40:41 UTC (rev 2494)
@@ -69,7 +69,6 @@
         config_Rayleigh_damping_coeff = 0.0
 /
 &amp;vmix
-        config_implicit_vertical_mix = .true.
         config_convective_visc = 1.0
         config_convective_diff = 1.0
 /

Index: branches/ocean_projects/sea_level_pressure/src/core_ocean
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_ocean        2013-02-20 20:32:54 UTC (rev 2493)
+++ branches/ocean_projects/sea_level_pressure/src/core_ocean        2013-02-20 20:40:41 UTC (rev 2494)

Property changes on: branches/ocean_projects/sea_level_pressure/src/core_ocean
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,7 ##
 /branches/ocean_projects/ale_vert_coord_new/src/core_ocean:1387-1428
 /branches/ocean_projects/cesm_coupling/src/core_ocean:2147-2344
 /branches/ocean_projects/diagnostics_revision/src/core_ocean:2439-2462
+/branches/ocean_projects/explicit_vmix_removal/src/core_ocean:2488-2490
 /branches/ocean_projects/gmvar/src/core_ocean:1214-1514,1517-1738
 /branches/ocean_projects/imp_vert_mix_error/src/core_ocean:1847-1887
 /branches/ocean_projects/imp_vert_mix_mrp/src/core_ocean:754-986
## -30,3 +31,4 ##
 /branches/omp_blocks/openmp_test/src/core_ocean_elements:2161-2201
 /branches/source_renaming/src/core_ocean:1082-1113
 /branches/time_manager/src/core_ocean:924-962
+/trunk/mpas/src/core_ocean:2486-2493
\ No newline at end of property
Modified: branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_vmix.F
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_vmix.F        2013-02-20 20:32:54 UTC (rev 2493)
+++ branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_vmix.F        2013-02-20 20:40:41 UTC (rev 2494)
@@ -445,8 +445,7 @@
 !&gt; \version SVN:$Id$
 !&gt; \details 
 !&gt;  This routine initializes a variety of quantities related to 
-!&gt;  vertical mixing in the ocean. This primarily determines if
-!&gt;  explicit or implicit vertical mixing is to be used.
+!&gt;  vertical mixing in the ocean. 
 !
 !-----------------------------------------------------------------------
 

Modified: branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2013-02-20 20:32:54 UTC (rev 2493)
+++ branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2013-02-20 20:40:41 UTC (rev 2494)
@@ -234,7 +234,7 @@
                   vertViscTopOfEdge(k,iEdge) = config_convective_visc
                end if
             else
-               ! for Ri&lt;0 and implicit mix, use convective diffusion
+               ! for Ri&lt;0 use the convective value for the viscosity
                vertViscTopOfEdge(k,iEdge) = config_convective_visc
             end if
          end do
@@ -327,7 +327,7 @@
                   vertDiffTopOfCell(k,iCell) = config_convective_diff
                end if
              else
-               ! for Ri&lt;0 and implicit mix, use convective diffusion
+               ! for Ri&lt;0 use the convective value for the diffusion
                vertDiffTopOfCell(k,iCell) = config_convective_diff
             end if
          end do

</font>
</pre>