<p><b>mpetersen@lanl.gov</b> 2012-07-23 08:00:25 -0600 (Mon, 23 Jul 2012)</p><p>BRANCH COMMIT: Fixed some small bugs, changed a line of comment text.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/rich_vert_mix_bug/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/rich_vert_mix_bug/src/core_ocean/mpas_ocn_time_integration_split.F        2012-07-21 01:57:44 UTC (rev 2039)
+++ branches/ocean_projects/rich_vert_mix_bug/src/core_ocean/mpas_ocn_time_integration_split.F        2012-07-23 14:00:25 UTC (rev 2040)
@@ -834,7 +834,7 @@
end do
! Update halo on u and tracers, which were just updated for implicit vertical mixing. If not done,
- ! this leads to lack of volume conservation. It is required because halo updates in RK4 are only
+ ! this leads to lack of volume conservation. It is required because halo updates in stage 3 are only
! conducted on tendencies, not on the velocity and tracer fields. So this update is required to
! communicate the change due to implicit vertical mixing across the boundary.
call mpas_timer_start("se implicit vert mix halos")
Modified: branches/ocean_projects/rich_vert_mix_bug/src/core_ocean/mpas_ocn_vmix.F
===================================================================
--- branches/ocean_projects/rich_vert_mix_bug/src/core_ocean/mpas_ocn_vmix.F        2012-07-21 01:57:44 UTC (rev 2039)
+++ branches/ocean_projects/rich_vert_mix_bug/src/core_ocean/mpas_ocn_vmix.F        2012-07-23 14:00:25 UTC (rev 2040)
@@ -47,7 +47,8 @@
ocn_tracer_vmix_tend_explicit, &
ocn_vel_vmix_tend_implicit, &
ocn_tracer_vmix_tend_implicit, &
- ocn_vmix_init
+ ocn_vmix_init, &
+ ocn_vmix_implicit
!--------------------------------------------------------------------
!
@@ -592,7 +593,7 @@
subroutine ocn_vmix_implicit(dt, grid, diagnostics, state, err)!{{{
real (kind=RKIND), intent(in) :: dt
type (mesh_type), intent(in) :: grid
- type (diagnostic_type), intent(inout) :: diagnostics
+ type (diagnostics_type), intent(inout) :: diagnostics
type (state_type), intent(inout) :: state
integer, intent(out) :: err
@@ -610,22 +611,22 @@
ke_edge => state % ke_edge % array
vertViscTopOfEdge => diagnostics % vertViscTopOfEdge % array
vertDiffTopOfCell => diagnostics % vertDiffTopOfCell % array
- maxLevelCell => mesh % maxLevelCell % array
+ maxLevelCell => grid % maxLevelCell % array
- nCells = mesh % nCells
+ nCells = grid % nCells
- call ocn_vmix_coefs(mesh, state, diagnostics, err)
+ call ocn_vmix_coefs(grid, state, diagnostics, err)
!
! Implicit vertical solve for momentum
!
- call ocn_vel_vmix_tend_implicit(mesh, dt, ke_edge, vertViscTopOfEdge, h, h_edge, u, err)
+ call ocn_vel_vmix_tend_implicit(grid, dt, ke_edge, vertViscTopOfEdge, h, h_edge, u, err)
!
! Implicit vertical solve for tracers
!
- call ocn_tracer_vmix_tend_implicit(mesh, dt, vertDiffTopOfCell, h, tracers, err)
+ call ocn_tracer_vmix_tend_implicit(grid, dt, vertDiffTopOfCell, h, tracers, err)
end subroutine ocn_vmix_implicit!}}}
</font>
</pre>