<p><b>dwj07@fsu.edu</b> 2013-04-15 09:34:56 -0600 (Mon, 15 Apr 2013)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Renaming:<br>
wTop --> vertTransportVelocityTop<br>
MontPot --> montgomeryPotential<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml 2013-04-15 15:34:56 UTC (rev 2749)
@@ -702,13 +702,13 @@
<var name="normalVelocityForcingReconstructMeridional" type="real" dimensions="nVertLevels nCells Time" streams="o" units="N m^{-2}"
description="wind stress in the northward direction"
/>
- <var name="MontPot" type="real" dimensions="nVertLevels nCells Time" units="m^2 s^{-2}"
+ <var name="montgomeryPotential" type="real" dimensions="nVertLevels nCells Time" units="m^2 s^{-2}"
description="Montgomery potential, may be used as the pressure for isopycnal coordinates."
/>
<var name="pressure" type="real" dimensions="nVertLevels nCells Time" units="N m^{-2}"
description="pressure used in the momentum equation"
/>
- <var name="wTop" type="real" dimensions="nVertLevelsP1 nCells Time" units="m s^{-1}"
+ <var name="vertTransportVelocityTop" type="real" dimensions="nVertLevelsP1 nCells Time" units="m s^{-1}"
description="vertical transport through the layer interface at the top of the cell"
/>
<var name="vertVelocityTop" type="real" dimensions="nVertLevelsP1 nCells Time" units="m s^{-1}"
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_diagnostics.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_diagnostics.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_diagnostics.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -8,7 +8,7 @@
!> \version SVN:$Id:$
!> \details
!> This module contains the routines for computing
-!> diagnostic variables, and other quantities such as wTop.
+!> diagnostic variables, and other quantities such as vertTransportVelocityTop.
!
!-----------------------------------------------------------------------
@@ -41,7 +41,7 @@
!--------------------------------------------------------------------
public :: ocn_diagnostic_solve, &
- ocn_wtop, &
+ ocn_vert_transport_velocity_top, &
ocn_fuperp, &
ocn_filter_btr_mode_vel, &
ocn_filter_btr_mode_tend_vel, &
@@ -100,7 +100,7 @@
bottomDepth, fVertex, dvEdge, dcEdge, areaCell, areaTriangle, ssh, seaSurfacePressure
real (kind=RKIND), dimension(:,:), pointer :: &
weightsOnEdge, kiteAreasOnVertex, layerThicknessEdge, layerThickness, normalVelocity, tangentialVelocity, pressure,&
- circulation, relativeVorticity, kineticEnergy, kineticEnergyEdge, MontPot, wTop, zMid, &
+ circulation, relativeVorticity, kineticEnergy, kineticEnergyEdge, montgomeryPotential, vertTransportVelocityTop, zMid, &
potentialVorticityEdge, potentialVorticityVertex, potentialVorticityCell, gradVor_n, gradVor_t, divergence, &
density, displacedDensity, temperature, salinity, kineticEnergyVertex, kineticEnergyVertexOnCells, uBolusGM, uTransport, &
vertVelocityTop, BruntVaisalaFreqTop
@@ -127,7 +127,7 @@
gradVor_t => s % gradVor_t % array
density => s % density % array
displacedDensity=> s % displacedDensity % array
- MontPot => s % MontPot % array
+ montgomeryPotential => s % montgomeryPotential % array
pressure => s % pressure % array
zMid => s % zMid % array
ssh => s % ssh % array
@@ -399,14 +399,14 @@
! For isopycnal mode, p is the Montgomery Potential.
! At top layer it is g*SSH, where SSH may be off by a
! constant (ie, bottomDepth can be relative to top or bottom)
- MontPot(1,iCell) = gravity &
+ montgomeryPotential(1,iCell) = gravity &
* (bottomDepth(iCell) + sum(layerThickness(1:nVertLevels,iCell)))
do k=2,nVertLevels
pTop(k) = pTop(k-1) + density(k-1,iCell)*gravity* layerThickness(k-1,iCell)
! from delta M = p delta / density
- MontPot(k,iCell) = MontPot(k-1,iCell) &
+ montgomeryPotential(k,iCell) = montgomeryPotential(k-1,iCell) &
+ pTop(k)*(1.0/density(k,iCell) - 1.0/density(k-1,iCell))
end do
@@ -483,7 +483,7 @@
!***********************************************************************
!
-! routine ocn_wtop
+! routine ocn_vert_transport_velocity_top
!
!> \brief Computes vertical transport
!> \author Mark Petersen
@@ -494,7 +494,7 @@
!> cell.
!
!-----------------------------------------------------------------------
- subroutine ocn_wtop(grid,layerThickness,layerThicknessEdge,normalVelocity,wTop, err)!{{{
+ subroutine ocn_vert_transport_velocity_top(grid,layerThickness,layerThicknessEdge,normalVelocity,vertTransportVelocityTop, err)!{{{
!-----------------------------------------------------------------
!
@@ -521,7 +521,7 @@
!-----------------------------------------------------------------
real (kind=RKIND), dimension(:,:), intent(out) :: &
- wTop !< Output: vertical transport at top of cell
+ vertTransportVelocityTop !< Output: vertical transport at top of cell
integer, intent(out) :: err !< Output: error flag
@@ -568,7 +568,7 @@
if (config_vert_coord_movement.eq.'isopycnal') then
! set vertical transport to zero in isopycnal case
- wTop=0.0
+ vertTransportVelocityTop=0.0
return
end if
@@ -605,16 +605,16 @@
end if
! Vertical transport through layer interface at top and bottom is zero.
- wTop(1,iCell) = 0.0
- wTop(maxLevelCell(iCell)+1,iCell) = 0.0
+ vertTransportVelocityTop(1,iCell) = 0.0
+ vertTransportVelocityTop(maxLevelCell(iCell)+1,iCell) = 0.0
do k=maxLevelCell(iCell),2,-1
- wTop(k,iCell) = wTop(k+1,iCell) - div_hu(k) - h_tend_col(k)
+ vertTransportVelocityTop(k,iCell) = vertTransportVelocityTop(k+1,iCell) - div_hu(k) - h_tend_col(k)
end do
end do
deallocate(div_hu, h_tend_col)
- end subroutine ocn_wtop!}}}
+ end subroutine ocn_vert_transport_velocity_top!}}}
!***********************************************************************
!
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_global_diagnostics.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_global_diagnostics.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_global_diagnostics.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -47,7 +47,7 @@
real (kind=RKIND) :: volumeCellGlobal, volumeEdgeGlobal, CFLNumberGlobal, localCFL, localSum, areaCellGlobal, areaEdgeGlobal, areaTriangleGlobal
real (kind=RKIND), dimension(:), pointer :: areaCell, dcEdge, dvEdge, areaTriangle, areaEdge
real (kind=RKIND), dimension(:,:), pointer :: layerThickness, normalVelocity, tangentialVelocity, layerThicknessEdge, relativeVorticity, kineticEnergy, potentialVorticityEdge, potentialVorticityVertex, &
- potentialVorticityCell, gradVor_n, gradVor_t, pressure, MontPot, wTop, density, tracerTemp
+ potentialVorticityCell, gradVor_n, gradVor_t, pressure, montgomeryPotential, vertTransportVelocityTop, density, tracerTemp
real (kind=RKIND), dimension(:,:,:), pointer :: tracers
real (kind=RKIND), dimension(kMaxVariables) :: sums, mins, maxes, averages, verticalSumMins, verticalSumMaxes, reductions
@@ -90,7 +90,7 @@
density => state % density % array
tracers => state % tracers % array
tangentialVelocity => state % tangentialVelocity % array
- wTop => state % wTop % array
+ vertTransportVelocityTop => state % vertTransportVelocityTop % array
layerThicknessEdge => state % layerThicknessEdge % array
relativeVorticity => state % relativeVorticity % array
kineticEnergy => state % kineticEnergy % array
@@ -99,7 +99,7 @@
potentialVorticityCell => state % potentialVorticityCell % array
gradVor_n => state % gradVor_n % array
gradVor_t => state % gradVor_t % array
- MontPot => state % MontPot % array
+ montgomeryPotential => state % montgomeryPotential % array
pressure => state % pressure % array
variableIndex = 0
@@ -246,10 +246,10 @@
verticalSumMins(variableIndex) = min(verticalSumMins(variableIndex), verticalSumMins_tmp(variableIndex))
verticalSumMaxes(variableIndex) = max(verticalSumMaxes(variableIndex), verticalSumMaxes_tmp(variableIndex))
- ! MontPot
+ ! montgomeryPotential
variableIndex = variableIndex + 1
call ocn_compute_field_volume_weighted_local_stats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), layerThickness(:,1:nCellsSolve), &
- MontPot(:,1:nCellsSolve), sums_tmp(variableIndex), mins_tmp(variableIndex), maxes_tmp(variableIndex), verticalSumMins_tmp(variableIndex), &
+ montgomeryPotential(:,1:nCellsSolve), sums_tmp(variableIndex), mins_tmp(variableIndex), maxes_tmp(variableIndex), verticalSumMins_tmp(variableIndex), &
verticalSumMaxes_tmp(variableIndex))
sums(variableIndex) = sums(variableIndex) + sums_tmp(variableIndex)
mins(variableIndex) = min(mins(variableIndex), mins_tmp(variableIndex))
@@ -257,10 +257,10 @@
verticalSumMins(variableIndex) = min(verticalSumMins(variableIndex), verticalSumMins_tmp(variableIndex))
verticalSumMaxes(variableIndex) = max(verticalSumMaxes(variableIndex), verticalSumMaxes_tmp(variableIndex))
- ! wTop vertical velocity
+ ! vertTransportVelocityTop vertical velocity
variableIndex = variableIndex + 1
call ocn_compute_field_volume_weighted_local_stats(dminfo, nVertLevels+1, nCellsSolve, areaCell(1:nCellsSolve), layerThickness(:,1:nCellsSolve), &
- wTop(:,1:nCellsSolve), sums_tmp(variableIndex), mins_tmp(variableIndex), maxes_tmp(variableIndex), verticalSumMins_tmp(variableIndex), &
+ vertTransportVelocityTop(:,1:nCellsSolve), sums_tmp(variableIndex), mins_tmp(variableIndex), maxes_tmp(variableIndex), verticalSumMins_tmp(variableIndex), &
verticalSumMaxes_tmp(variableIndex))
sums(variableIndex) = sums(variableIndex) + sums_tmp(variableIndex)
mins(variableIndex) = min(mins(variableIndex), mins_tmp(variableIndex))
@@ -402,11 +402,11 @@
variableIndex = variableIndex + 1
averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
- ! MontPot
+ ! montgomeryPotential
variableIndex = variableIndex + 1
averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
- ! wTop vertical velocity
+ ! vertTransportVelocityTop vertical velocity
variableIndex = variableIndex + 1
averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
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 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tendency.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -91,14 +91,14 @@
type (state_type), intent(in) :: s !< Input: State information
type (mesh_type), intent(in) :: grid !< Input: Grid information
- real (kind=RKIND), dimension(:,:), pointer :: layerThicknessEdge, wTop, tend_layerThickness, uTransport
+ real (kind=RKIND), dimension(:,:), pointer :: layerThicknessEdge, vertTransportVelocityTop, tend_layerThickness, uTransport
integer :: err
call mpas_timer_start("ocn_tend_h")
uTransport => s % uTransport % array
- wTop => s % wTop % array
+ vertTransportVelocityTop => s % vertTransportVelocityTop % array
layerThicknessEdge => s % layerThicknessEdge % array
tend_layerThickness => tend % layerThickness % array
@@ -126,7 +126,7 @@
! height tendency: vertical advection term -d/dz(hw)
!
call mpas_timer_start("vadv", .false., thickVadvTimer)
- call ocn_thick_vadv_tend(grid, wtop, tend_layerThickness, err)
+ call ocn_thick_vadv_tend(grid, vertTransportVelocityTop, tend_layerThickness, err)
call mpas_timer_stop("vadv", thickVadvTimer)
call mpas_timer_stop("ocn_tend_h")
@@ -157,7 +157,7 @@
real (kind=RKIND), dimension(:,:), pointer :: &
layerThicknessEdge, h, normalVelocity, density, zMid, pressure, &
tend_normalVelocity, circulation, relativeVorticity, viscosity, kineticEnergy, kineticEnergyEdge, potentialVorticityEdge, &
- MontPot, wTop, divergence, vertViscTopOfEdge
+ montgomeryPotential, vertTransportVelocityTop, divergence, vertViscTopOfEdge
real (kind=RKIND), dimension(:,:), pointer :: normalVelocityForcing
@@ -167,7 +167,7 @@
normalVelocity => s % normalVelocity % array
density => s % density % array
- wTop => s % wTop % array
+ vertTransportVelocityTop => s % vertTransportVelocityTop % array
zMid => s % zMid % array
layerThicknessEdge => s % layerThicknessEdge % array
viscosity => s % viscosity % array
@@ -176,7 +176,7 @@
kineticEnergy => s % kineticEnergy % array
kineticEnergyEdge => s % kineticEnergyEdge % array
potentialVorticityEdge => s % potentialVorticityEdge % array
- MontPot => s % MontPot % array
+ montgomeryPotential => s % montgomeryPotential % array
pressure => s % pressure % array
vertViscTopOfEdge => d % vertViscTopOfEdge % array
@@ -203,7 +203,7 @@
! velocity tendency: vertical advection term -w du/dz
!
call mpas_timer_start("vadv", .false., velVadvTimer)
- call ocn_vel_vadv_tend(grid, normalVelocity, layerThicknessEdge, wtop, tend_normalVelocity, err)
+ call ocn_vel_vadv_tend(grid, normalVelocity, layerThicknessEdge, vertTransportVelocityTop, tend_normalVelocity, err)
call mpas_timer_stop("vadv", velVadvTimer)
!
@@ -211,7 +211,7 @@
!
call mpas_timer_start("pressure grad", .false., velPgradTimer)
if (config_pressure_gradient_type.eq.'MontgomeryPotential') then
- call ocn_vel_pressure_grad_tend(grid, MontPot, zMid, density, tend_normalVelocity, err)
+ call ocn_vel_pressure_grad_tend(grid, montgomeryPotential, zMid, density, tend_normalVelocity, err)
else
call ocn_vel_pressure_grad_tend(grid, pressure, zMid, density, tend_normalVelocity, err)
end if
@@ -263,7 +263,7 @@
real (kind=RKIND), intent(in) :: dt !< Input: Time step
real (kind=RKIND), dimension(:,:), pointer :: &
- uTransport, layerThickness,wTop, layerThicknessEdge, vertDiffTopOfCell, tend_layerThickness, normalThicknessFlux
+ uTransport, layerThickness,vertTransportVelocityTop, layerThicknessEdge, vertDiffTopOfCell, tend_layerThickness, normalThicknessFlux
real (kind=RKIND), dimension(:,:,:), pointer :: &
tracers, tend_tr
@@ -273,7 +273,7 @@
uTransport => s % uTransport % array
layerThickness => s % layerThickness % array
- wTop => s % wTop % array
+ vertTransportVelocityTop => s % vertTransportVelocityTop % array
tracers => s % tracers % array
layerThicknessEdge => s % layerThicknessEdge % array
vertDiffTopOfCell => d % vertDiffTopOfCell % array
@@ -304,7 +304,7 @@
! Monotonoic Advection, or standard advection
call mpas_timer_start("adv", .false., tracerHadvTimer)
- call mpas_ocn_tracer_advection_tend(tracers, normalThicknessFlux, wTop, layerThickness, layerThickness, dt, grid, tend_layerThickness, tend_tr)
+ call mpas_ocn_tracer_advection_tend(tracers, normalThicknessFlux, vertTransportVelocityTop, layerThickness, layerThickness, dt, grid, tend_layerThickness, tend_tr)
call mpas_timer_stop("adv", tracerHadvTimer)
!
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_thick_vadv.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_thick_vadv.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_thick_vadv.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -62,7 +62,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_thick_vadv_tend(grid, wTop, tend, err)!{{{
+ subroutine ocn_thick_vadv_tend(grid, vertTransportVelocityTop, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -71,7 +71,7 @@
!-----------------------------------------------------------------
real (kind=RKIND), dimension(:,:), intent(in) :: &
- wTop !< Input: vertical velocity on top layer
+ vertTransportVelocityTop !< Input: vertical velocity on top layer
type (mesh_type), intent(in) :: &
grid !< Input: grid information
@@ -121,7 +121,7 @@
do iCell=1,nCells
do k=1,maxLevelCell(iCell)
- tend(k,iCell) = tend(k,iCell) + wTop(k+1,iCell) - wTop(k,iCell)
+ tend(k,iCell) = tend(k,iCell) + vertTransportVelocityTop(k+1,iCell) - vertTransportVelocityTop(k,iCell)
end do
end do
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 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_rk4.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -150,12 +150,12 @@
block => domain % blocklist
do while (associated(block))
! advection of u uses u, while advection of layerThickness and tracers use uTransport.
- call ocn_wtop(block % mesh, block % provis % layerThickness % array, block % provis % layerThicknessEdge % array, &
- block % provis % normalVelocity % array, block % provis % wTop % array, err)
+ call ocn_vert_transport_velocity_top(block % mesh, block % provis % layerThickness % array, block % provis % layerThicknessEdge % array, &
+ block % provis % normalVelocity % array, block % provis % vertTransportVelocityTop % array, err)
call ocn_tend_vel(block % tend, block % provis, block % diagnostics, block % mesh)
- call ocn_wtop(block % mesh, block % provis % layerThickness % array, block % provis % layerThicknessEdge % array, &
- block % provis % uTransport % array, block % provis % wTop % array, err)
+ 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)
if (config_filter_btr_mode) then
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 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_time_integration_split.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -188,12 +188,12 @@
stage1_tend_time = min(split_explicit_step,2)
- ! compute wTop. Use u (rather than uTransport) for momentum advection.
+ ! compute vertTransportVelocityTop. Use u (rather than uTransport) for momentum advection.
! Use the most recent time level available.
- call ocn_wtop(block % mesh, block % state % time_levs(stage1_tend_time) % state % layerThickness % array, &
+ call ocn_vert_transport_velocity_top(block % mesh, block % state % time_levs(stage1_tend_time) % state % layerThickness % array, &
block % state % time_levs(stage1_tend_time) % state % layerThicknessEdge % array, &
block % state % time_levs(stage1_tend_time) % state % normalVelocity % array, &
- block % state % time_levs(stage1_tend_time) % state % wTop % array, err)
+ block % state % time_levs(stage1_tend_time) % state % vertTransportVelocityTop % array, err)
call ocn_tend_vel(block % tend, block % state % time_levs(stage1_tend_time) % state, block % diagnostics, block % mesh)
@@ -774,12 +774,12 @@
block => domain % blocklist
do while (associated(block))
- ! compute wTop. Use uTransport for advection of layerThickness and tracers.
+ ! compute vertTransportVelocityTop. Use uTransport for advection of layerThickness and tracers.
! Use time level 1 values of layerThickness and layerThicknessEdge because layerThickness has not yet been computed for time level 2.
- call ocn_wtop(block % mesh, block % state % time_levs(1) % state % layerThickness % array, &
+ call ocn_vert_transport_velocity_top(block % mesh, block % state % time_levs(1) % state % layerThickness % array, &
block % state % time_levs(1) % state % layerThicknessEdge % array, &
block % state % time_levs(2) % state % uTransport % array, &
- block % state % time_levs(2) % state % wTop % array, err)
+ block % state % time_levs(2) % state % vertTransportVelocityTop % array, err)
call ocn_tend_h(block % tend, block % state % time_levs(2) % state, block % mesh)
block => block % next
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -70,7 +70,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_tend(grid, h, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_tend(grid, h, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -80,7 +80,7 @@
real (kind=RKIND), dimension(:,:), intent(in) :: &
h, & !< Input: layer thickness
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -125,8 +125,8 @@
if(.not.vadvOn) return
- call ocn_tracer_vadv_stencil_tend(grid, h, wTop, tracers, tend, err1)
- call ocn_tracer_vadv_spline_tend(grid, h, wTop, tracers, tend, err2)
+ call ocn_tracer_vadv_stencil_tend(grid, h, vertTransportVelocityTop, tracers, tend, err1)
+ call ocn_tracer_vadv_spline_tend(grid, h, vertTransportVelocityTop, tracers, tend, err2)
err = ior(err1, err2)
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -72,7 +72,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_spline_tend(grid, h, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_spline_tend(grid, h, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -82,7 +82,7 @@
real (kind=RKIND), dimension(:,:), intent(in) :: &
h, & !< Input: layer thickness
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -128,11 +128,11 @@
if(.not.splineOn) return
call mpas_timer_start("spline 2", .false., spline2_timer)
- call ocn_tracer_vadv_spline2_tend(grid, h, wTop, tracers, tend, err1)
+ call ocn_tracer_vadv_spline2_tend(grid, h, vertTransportVelocityTop, tracers, tend, err1)
call mpas_timer_stop("spline 2", spline2_timer)
call mpas_timer_start("spline 3", .false., spline3_timer)
- call ocn_tracer_vadv_spline3_tend(grid, h, wTop, tracers, tend, err2)
+ call ocn_tracer_vadv_spline3_tend(grid, h, vertTransportVelocityTop, tracers, tend, err2)
call mpas_timer_stop("spline 3", spline3_timer)
err = ior(err1, err2)
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -63,7 +63,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_spline2_tend(grid, layerThickness, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_spline2_tend(grid, layerThickness, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -73,7 +73,7 @@
real (kind=RKIND), dimension(:,:), intent(in) :: &
layerThickness, & !< Input: layer thickness
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -150,8 +150,8 @@
do k=1,maxLevelCell(iCell)
do iTracer=1,num_tracers
tend(iTracer,k,iCell) = tend(iTracer,k,iCell) &
- - ( wTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
- - wTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
+ - ( vertTransportVelocityTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
+ - vertTransportVelocityTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
end do
end do
end do
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -64,7 +64,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_spline3_tend(grid, layerThickness, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_spline3_tend(grid, layerThickness, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -74,7 +74,7 @@
real (kind=RKIND), dimension(:,:), intent(in) :: &
layerThickness, & !< Input: layer thickness
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -173,8 +173,8 @@
do k=1,maxLevelCell(iCell)
do iTracer=1,num_tracers
tend(iTracer,k,iCell) = tend(iTracer,k,iCell) &
- - ( wTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
- - wTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
+ - ( vertTransportVelocityTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
+ - vertTransportVelocityTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
end do
end do
end do
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -74,7 +74,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_stencil_tend(grid, h, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_stencil_tend(grid, h, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -84,7 +84,7 @@
real (kind=RKIND), dimension(:,:), intent(in) :: &
h, & !< Input: layer thickness
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -130,13 +130,13 @@
if(.not. stencilOn) return
call mpas_timer_start("stencil 2", .false., stencil2_timer)
- call ocn_tracer_vadv_stencil2_tend(grid, wTop, tracers, tend, err1)
+ call ocn_tracer_vadv_stencil2_tend(grid, vertTransportVelocityTop, tracers, tend, err1)
call mpas_timer_stop("stencil 2", stencil2_timer)
call mpas_timer_start("stencil 3", .false., stencil3_timer)
- call ocn_tracer_vadv_stencil3_tend(grid, h, wTop, tracers, tend, err2)
+ call ocn_tracer_vadv_stencil3_tend(grid, h, vertTransportVelocityTop, tracers, tend, err2)
call mpas_timer_stop("stencil 3", stencil3_timer)
call mpas_timer_start("stencil 4", .false., stencil4_timer)
- call ocn_tracer_vadv_stencil4_tend(grid, h, wTop, tracers, tend, err3)
+ call ocn_tracer_vadv_stencil4_tend(grid, h, vertTransportVelocityTop, tracers, tend, err3)
call mpas_timer_stop("stencil 4", stencil4_timer)
err = ior(err1, ior(err2, err3))
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -63,7 +63,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_stencil2_tend(grid, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_stencil2_tend(grid, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -72,7 +72,7 @@
!-----------------------------------------------------------------
real (kind=RKIND), dimension(:,:), intent(in) :: &
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -149,8 +149,8 @@
do k=1,maxLevelCell(iCell)
do iTracer=1,num_tracers
tend(iTracer,k,iCell) = tend(iTracer,k,iCell) &
- - ( wTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
- - wTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
+ - ( vertTransportVelocityTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
+ - vertTransportVelocityTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
end do
end do
end do
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -63,7 +63,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_stencil3_tend(grid, layerThickness, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_stencil3_tend(grid, layerThickness, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -73,7 +73,7 @@
real (kind=RKIND), dimension(:,:), intent(in) :: &
layerThickness, & !< Input: layer thickness
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -109,7 +109,7 @@
integer, dimension(:), pointer :: maxLevelCell
- real (kind=RKIND) :: cSignWTop, flux3Coef
+ real (kind=RKIND) :: cSignVertTransportVelocityTop, flux3Coef
real (kind=RKIND), dimension(:,:,:), allocatable :: tracerTop
@@ -149,13 +149,13 @@
/ (layerThickness(k-1,iCell) + layerThickness(k,iCell))
end do
do k=3,maxLevelCell(iCell)-1
- cSignWTop = sign(flux3Coef,wTop(k,iCell))
+ cSignVertTransportVelocityTop = sign(flux3Coef,vertTransportVelocityTop(k,iCell))
do iTracer=1,num_tracers
tracerTop(iTracer,k,iCell) = &
- ( (-1.+ cSignWTop)*tracers(iTracer,k-2,iCell) &
- +( 7.-3.*cSignWTop)*tracers(iTracer,k-1,iCell) &
- +( 7.+3.*cSignWTop)*tracers(iTracer,k ,iCell) &
- +(-1.- cSignWTop)*tracers(iTracer,k+1,iCell) &
+ ( (-1.+ cSignVertTransportVelocityTop)*tracers(iTracer,k-2,iCell) &
+ +( 7.-3.*cSignVertTransportVelocityTop)*tracers(iTracer,k-1,iCell) &
+ +( 7.+3.*cSignVertTransportVelocityTop)*tracers(iTracer,k ,iCell) &
+ +(-1.- cSignVertTransportVelocityTop)*tracers(iTracer,k+1,iCell) &
)/12.
end do
end do
@@ -173,8 +173,8 @@
do k=1,maxLevelCell(iCell)
do iTracer=1,num_tracers
tend(iTracer,k,iCell) = tend(iTracer,k,iCell) &
- - ( wTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
- - wTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
+ - ( vertTransportVelocityTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
+ - vertTransportVelocityTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
end do
end do
end do
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -63,7 +63,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_tracer_vadv_stencil4_tend(grid, layerThickness, wTop, tracers, tend, err)!{{{
+ subroutine ocn_tracer_vadv_stencil4_tend(grid, layerThickness, vertTransportVelocityTop, tracers, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -73,7 +73,7 @@
real (kind=RKIND), dimension(:,:), intent(in) :: &
layerThickness, & !< Input: layer thickness
- wTop !< Input: vertical tracer in top layer
+ vertTransportVelocityTop !< Input: vertical tracer in top layer
real (kind=RKIND), dimension(:,:,:), intent(in) :: &
tracers !< Input: tracers
@@ -109,7 +109,7 @@
integer, dimension(:), pointer :: maxLevelCell
- real (kind=RKIND) :: cSingWTop, flux3Coef
+ real (kind=RKIND) :: flux3Coef
real (kind=RKIND), dimension(:,:,:), allocatable :: tracerTop
@@ -168,8 +168,8 @@
do k=1,maxLevelCell(iCell)
do iTracer=1,num_tracers
tend(iTracer,k,iCell) = tend(iTracer,k,iCell) &
- - ( wTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
- - wTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
+ - ( vertTransportVelocityTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
+ - vertTransportVelocityTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
end do
end do
end do
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_vel_pressure_grad.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_vel_pressure_grad.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_vel_pressure_grad.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -128,7 +128,7 @@
! For pure isopycnal coordinates, we are still using
! grad(M), the gradient of Montgomery Potential, because
! we have set density0Inv=1 and gdensity0Inv=0 in the init routine,
- ! and pressure is passed in as MontPot.
+ ! and pressure is passed in as montgomeryPotential.
do iEdge=1,nEdgesSolve
cell1 = cellsOnEdge(1,iEdge)
Modified: branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_vel_vadv.F
===================================================================
--- branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_vel_vadv.F 2013-04-15 15:13:46 UTC (rev 2748)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_vel_vadv.F 2013-04-15 15:34:56 UTC (rev 2749)
@@ -64,7 +64,7 @@
!
!-----------------------------------------------------------------------
- subroutine ocn_vel_vadv_tend(grid, u, layerThicknessEdge, wTop, tend, err)!{{{
+ subroutine ocn_vel_vadv_tend(grid, u, layerThicknessEdge, vertTransportVelocityTop, tend, err)!{{{
!-----------------------------------------------------------------
!
@@ -76,7 +76,7 @@
u !< Input: Horizontal velocity
real (kind=RKIND), dimension(:,:), intent(in) :: &
layerThicknessEdge,&!< Input: thickness at edge
- wTop !< Input: Vertical velocity on top layer
+ vertTransportVelocityTop !< Input: Vertical velocity on top layer
type (mesh_type), intent(in) :: &
grid !< Input: grid information
@@ -109,7 +109,7 @@
integer, dimension(:), pointer :: maxLevelEdgeTop
integer, dimension(:,:), pointer :: cellsOnEdge, edgeMask
- real (kind=RKIND) :: wTopEdge
+ real (kind=RKIND) :: vertTransportVelocityTopEdge
real (kind=RKIND), dimension(:), allocatable :: w_dudzTopEdge
if(.not.velVadvOn) return
@@ -130,10 +130,10 @@
do k=2,maxLevelEdgeTop(iEdge)
! Average w from cell center to edge
- wTopEdge = 0.5*(wTop(k,cell1)+wTop(k,cell2))
+ vertTransportVelocityTopEdge = 0.5*(vertTransportVelocityTop(k,cell1)+vertTransportVelocityTop(k,cell2))
! compute dudz at vertical interface with first order derivative.
- w_dudzTopEdge(k) = wTopEdge * (u(k-1,iEdge)-u(k,iEdge)) &
+ w_dudzTopEdge(k) = vertTransportVelocityTopEdge * (u(k-1,iEdge)-u(k,iEdge)) &
/ (0.5*(layerThicknessEdge(k-1,iEdge) + layerThicknessEdge(k,iEdge)))
end do
w_dudzTopEdge(maxLevelEdgeTop(iEdge)+1) = 0.0
</font>
</pre>