<p><b>ringler@lanl.gov</b> 2012-04-13 16:07:31 -0600 (Fri, 13 Apr 2012)</p><p><br>
closure branch with new I/O<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/closureN/src/core_ocean/Makefile
===================================================================
--- branches/omp_blocks/io/src/core_ocean/Makefile        2012-04-12 20:38:58 UTC (rev 1779)
+++ branches/ocean_projects/closureN/src/core_ocean/Makefile        2012-04-13 22:07:31 UTC (rev 1780)
@@ -11,6 +11,7 @@
            mpas_ocn_vel_hmix.o \
            mpas_ocn_vel_hmix_del2.o \
            mpas_ocn_vel_hmix_del4.o \
+           mpas_ocn_vel_hmix_leith.o \
            mpas_ocn_vel_forcing.o \
            mpas_ocn_vel_forcing_windstress.o \
            mpas_ocn_vel_forcing_bottomdrag.o \
@@ -86,12 +87,14 @@
 
 mpas_ocn_vel_vadv.o:
 
-mpas_ocn_vel_hmix.o: mpas_ocn_vel_hmix_del2.o mpas_ocn_vel_hmix_del4.o
+mpas_ocn_vel_hmix.o: mpas_ocn_vel_hmix_del2.o mpas_ocn_vel_hmix_del4.o mpas_ocn_vel_hmix_leith.o
 
 mpas_ocn_vel_hmix_del2.o:
 
 mpas_ocn_vel_hmix_del4.o:
 
+mpas_ocn_vel_hmix_leith.o:
+
 mpas_ocn_vel_forcing.o: mpas_ocn_vel_forcing_windstress.o mpas_ocn_vel_forcing_bottomdrag.o mpas_ocn_vel_forcing_rayleigh.o
 
 mpas_ocn_vel_forcing_windstress.o:
@@ -177,6 +180,7 @@
                                           mpas_ocn_vel_hmix.o \
                                           mpas_ocn_vel_hmix_del2.o \
                                           mpas_ocn_vel_hmix_del4.o \
+                                          mpas_ocn_vel_hmix_leith.o \
                                           mpas_ocn_vel_forcing.o \
                                           mpas_ocn_vel_forcing_windstress.o \
                                           mpas_ocn_vel_forcing_bottomdrag.o \

Modified: branches/ocean_projects/closureN/src/core_ocean/Registry
===================================================================
--- branches/omp_blocks/io/src/core_ocean/Registry        2012-04-12 20:38:58 UTC (rev 1779)
+++ branches/ocean_projects/closureN/src/core_ocean/Registry        2012-04-13 22:07:31 UTC (rev 1780)
@@ -57,6 +57,8 @@
 namelist logical   hmix     config_rayleigh_friction    false
 namelist real      hmix     config_rayleigh_damping_coeff 0.0
 namelist real      hmix     config_apvm_scale_factor      0.0
+namelist real      hmix     config_leith_parameter        0.0
+namelist real      hmix     config_leith_dx               0.0
 namelist character vmix     config_vert_visc_type       const
 namelist character vmix     config_vert_diff_type       const
 namelist logical   vmix     config_implicit_vertical_mix  .true.
@@ -132,6 +134,7 @@
 var persistent real    meshDensity ( nCells ) 0 iro meshDensity mesh - -
 var persistent real    meshScalingDel2 ( nEdges ) 0 ro meshScalingDel2 mesh - -
 var persistent real    meshScalingDel4 ( nEdges ) 0 ro meshScalingDel4 mesh - -
+var persistent real    meshScaling ( nEdges ) 0 ro meshScaling mesh - -
 
 var persistent integer cellsOnEdge ( TWO nEdges ) 0 iro cellsOnEdge mesh - -
 var persistent integer nEdgesOnCell ( nCells ) 0 iro nEdgesOnCell mesh - -

Modified: branches/ocean_projects/closureN/src/core_ocean/mpas_ocn_vel_hmix.F
===================================================================
--- branches/omp_blocks/io/src/core_ocean/mpas_ocn_vel_hmix.F        2012-04-12 20:38:58 UTC (rev 1779)
+++ branches/ocean_projects/closureN/src/core_ocean/mpas_ocn_vel_hmix.F        2012-04-13 22:07:31 UTC (rev 1780)
@@ -21,6 +21,7 @@
    use mpas_timer
    use ocn_vel_hmix_del2
    use ocn_vel_hmix_del4
+   use ocn_vel_hmix_leith
 
    implicit none
    private
@@ -47,7 +48,7 @@
    !
    !--------------------------------------------------------------------
 
-   type (timer_node), pointer :: del2Timer, del4Timer
+   type (timer_node), pointer :: del2Timer, del4Timer, leithTimer
 
 
 !***********************************************************************
@@ -112,7 +113,7 @@
       !
       !-----------------------------------------------------------------
 
-      integer :: err1, err2
+      integer :: err1, err2, err3
 
       !-----------------------------------------------------------------
       !
@@ -128,8 +129,12 @@
       call mpas_timer_start(&quot;del4&quot;, .false., del4Timer)
       call ocn_vel_hmix_del4_tend(grid, divergence, vorticity, tend, err2)
       call mpas_timer_stop(&quot;del4&quot;, del4Timer)
+      call mpas_timer_start(&quot;leith&quot;, .false., leithTimer)
+      call ocn_vel_hmix_leith_tend(grid, vorticity, tend, err3)
+      call mpas_timer_stop(&quot;leith&quot;, leithTimer)
 
       err = ior(err1, err2)
+      err = ior(err, err3)
 
    !--------------------------------------------------------------------
 
@@ -163,12 +168,14 @@
 
       integer, intent(out) :: err !&lt; Output: error flag
 
-      integer :: err1, err2
+      integer :: err1, err2, err3
 
       call ocn_vel_hmix_del2_init(err1)
       call ocn_vel_hmix_del4_init(err2)
+      call ocn_vel_hmix_leith_init(err3)
 
       err = ior(err1, err2)
+      err = ior(err,  err3)
 
    !--------------------------------------------------------------------
 

</font>
</pre>