<p><b>dwj07@fsu.edu</b> 2013-04-15 12:57:58 -0600 (Mon, 15 Apr 2013)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Changing ocn_tend_h to ocn_tend_thick<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tendency.F        2013-04-15 18:02:18 UTC (rev 2751)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tendency.F        2013-04-15 18:57:58 UTC (rev 2752)
@@ -56,7 +56,7 @@
!
!--------------------------------------------------------------------
- public :: ocn_tend_h, &
+ public :: ocn_tend_thick, &
ocn_tend_vel, &
ocn_tend_tracer, &
ocn_tendency_init
@@ -73,7 +73,7 @@
!***********************************************************************
!
-! routine ocn_tend_h
+! routine ocn_tend_thick
!
!> \brief Computes thickness tendency
!> \author Doug Jacobsen
@@ -84,7 +84,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tend_h(tend, s, grid)!{{{
+ subroutine ocn_tend_thick(tend, s, grid)!{{{
implicit none
type (tend_type), intent(inout) :: tend !< Input/Output: Tendency structure
@@ -95,7 +95,7 @@
integer :: err
- call mpas_timer_start("ocn_tend_h")
+ call mpas_timer_start("ocn_tend_thick")
uTransport => s % uTransport % array
vertTransportVelocityTop => s % vertTransportVelocityTop % array
@@ -129,9 +129,9 @@
call ocn_thick_vadv_tend(grid, vertTransportVelocityTop, tend_layerThickness, err)
call mpas_timer_stop("vadv", thickVadvTimer)
- call mpas_timer_stop("ocn_tend_h")
+ call mpas_timer_stop("ocn_tend_thick")
- end subroutine ocn_tend_h!}}}
+ end subroutine ocn_tend_thick!}}}
!***********************************************************************
!
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F        2013-04-15 18:02:18 UTC (rev 2751)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F        2013-04-15 18:57:58 UTC (rev 2752)
@@ -156,7 +156,7 @@
call ocn_vert_transport_velocity_top(block % mesh, block % provis % layerThickness % array, block % provis % layerThicknessEdge % array, &
block % provis % uTransport % array, block % provis % vertTransportVelocityTop % array, err)
- call ocn_tend_h(block % tend, block % provis, block % mesh)
+ call ocn_tend_thick(block % tend, block % provis, block % mesh)
if (config_filter_btr_mode) then
call ocn_filter_btr_mode_tend_vel(block % tend, block % provis, block % mesh)
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F        2013-04-15 18:02:18 UTC (rev 2751)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F        2013-04-15 18:57:58 UTC (rev 2752)
@@ -781,7 +781,7 @@
block % state % time_levs(2) % state % uTransport % array, &
block % state % time_levs(2) % state % vertTransportVelocityTop % array, err)
- call ocn_tend_h(block % tend, block % state % time_levs(2) % state, block % mesh)
+ call ocn_tend_thick(block % tend, block % state % time_levs(2) % state, block % mesh)
block => block % next
end do
</font>
</pre>