<p><b>dwj07@fsu.edu</b> 2013-04-03 11:03:40 -0600 (Wed, 03 Apr 2013)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Renaming variables:<br>
v -> tangentialVelocity<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-03 16:58:43 UTC (rev 2716)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/Registry.xml 2013-04-03 17:03:40 UTC (rev 2717)
@@ -606,7 +606,7 @@
<var name="zMid" type="real" dimensions="nVertLevels nCells Time" units="m"
description="z-coordinate of the mid-depth of the layer"
/>
- <var name="v" type="real" dimensions="nVertLevels nEdges Time" units="m s^{-1}"
+ <var name="tangentialVelocity" type="real" dimensions="nVertLevels nEdges Time" units="m s^{-1}"
description="horizontal velocity, tangential to an edge"
/>
<var name="uTransport" type="real" dimensions="nVertLevels nEdges 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-03 16:58:43 UTC (rev 2716)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_diagnostics.F 2013-04-03 17:03:40 UTC (rev 2717)
@@ -99,7 +99,7 @@
real (kind=RKIND), dimension(:), pointer :: &
bottomDepth, fVertex, dvEdge, dcEdge, areaCell, areaTriangle, ssh, seaSurfacePressure
real (kind=RKIND), dimension(:,:), pointer :: &
- weightsOnEdge, kiteAreasOnVertex, layerThicknessEdge, layerThickness, normalVelocity, v, pressure,&
+ weightsOnEdge, kiteAreasOnVertex, layerThicknessEdge, layerThickness, normalVelocity, tangentialVelocity, pressure,&
circulation, relativeVorticity, ke, ke_edge, MontPot, wTop, zMid, &
potentialVorticityEdge, potentialVorticityVertex, potentialVorticityCell, gradVor_n, gradVor_t, divergence, &
density, displacedDensity, temperature, salinity, kev, kevc, uBolusGM, uTransport, &
@@ -107,12 +107,12 @@
real (kind=RKIND), dimension(:,:,:), pointer :: tracers, deriv_two
character :: c1*6
- layerThickness => s % layerThickness % array
- normalVelocity => s % normalVelocity % array
+ layerThickness => s % layerThickness % array
+ normalVelocity => s % normalVelocity % array
uTransport => s % uTransport % array
uBolusGM => s % uBolusGM % array
- v => s % v % array
- layerThicknessEdge => s % layerThicknessEdge % array
+ tangentialVelocity => s % tangentialVelocity % array
+ layerThicknessEdge => s % layerThicknessEdge % array
circulation => s % circulation % array
relativeVorticity => s % relativeVorticity % array
divergence => s % divergence % array
@@ -203,7 +203,7 @@
divergence(:,:) = 0.0
vertVelocityTop(:,:)=0.0
ke(:,:) = 0.0
- v(:,:) = 0.0
+ tangentialVelocity(:,:) = 0.0
do iVertex = 1, nVertices
invAreaTri1 = 1.0 / areaTriangle(iVertex)
do i = 1, vertexDegree
@@ -243,7 +243,7 @@
do i=1,nEdgesOnEdge(iEdge)
eoe = edgesOnEdge(i,iEdge)
do k = 1,maxLevelEdgeTop(iEdge)
- v(k,iEdge) = v(k,iEdge) + weightsOnEdge(i,iEdge) * normalVelocity(k, eoe)
+ tangentialVelocity(k,iEdge) = tangentialVelocity(k,iEdge) + weightsOnEdge(i,iEdge) * normalVelocity(k, eoe)
end do
end do
end do
@@ -361,7 +361,7 @@
do k = 1,maxLevelEdgeBot(iEdge)
potentialVorticityEdge(k,iEdge) = potentialVorticityEdge(k,iEdge) &
- config_apvm_scale_factor * dt* ( normalVelocity(k,iEdge) * gradVor_n(k,iEdge) &
- + v(k,iEdge) * gradVor_t(k,iEdge) )
+ + tangentialVelocity(k,iEdge) * gradVor_t(k,iEdge) )
enddo
enddo
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-03 16:58:43 UTC (rev 2716)
+++ branches/ocean_projects/variable_name_change/src/core_ocean/mpas_ocn_global_diagnostics.F 2013-04-03 17:03:40 UTC (rev 2717)
@@ -46,7 +46,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, v, layerThicknessEdge, relativeVorticity, ke, potentialVorticityEdge, potentialVorticityVertex, &
+ real (kind=RKIND), dimension(:,:), pointer :: layerThickness, normalVelocity, tangentialVelocity, layerThicknessEdge, relativeVorticity, ke, potentialVorticityEdge, potentialVorticityVertex, &
potentialVorticityCell, gradVor_n, gradVor_t, pressure, MontPot, wTop, density, tracerTemp
real (kind=RKIND), dimension(:,:,:), pointer :: tracers
@@ -89,7 +89,7 @@
normalVelocity => state % normalVelocity % array
density => state % density % array
tracers => state % tracers % array
- v => state % v % array
+ tangentialVelocity => state % tangentialVelocity % array
wTop => state % wTop % array
layerThicknessEdge => state % layerThicknessEdge % array
relativeVorticity => state % relativeVorticity % array
@@ -103,7 +103,7 @@
pressure => state % pressure % array
variableIndex = 0
- ! h
+ ! layerThickness
variableIndex = variableIndex + 1
call ocn_compute_field_area_weighted_local_stats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), layerThickness(:,1:nCellsSolve), &
sums_tmp(variableIndex), mins_tmp(variableIndex), maxes_tmp(variableIndex), verticalSumMins_tmp(variableIndex), verticalSumMaxes_tmp(variableIndex))
@@ -113,7 +113,7 @@
verticalSumMins(variableIndex) = min(verticalSumMins(variableIndex), verticalSumMins_tmp(variableIndex))
verticalSumMaxes(variableIndex) = max(verticalSumMaxes(variableIndex), verticalSumMaxes_tmp(variableIndex))
- ! u
+ ! normalVelocity
variableIndex = variableIndex + 1
call ocn_compute_field_volume_weighted_local_stats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), layerThicknessEdge(:,1:nEdgesSolve), &
normalVelocity(:,1:nEdgesSolve), sums_tmp(variableIndex), mins_tmp(variableIndex), maxes_tmp(variableIndex), verticalSumMins_tmp(variableIndex), &
@@ -124,10 +124,10 @@
verticalSumMins(variableIndex) = min(verticalSumMins(variableIndex), verticalSumMins_tmp(variableIndex))
verticalSumMaxes(variableIndex) = max(verticalSumMaxes(variableIndex), verticalSumMaxes_tmp(variableIndex))
- ! v
+ ! tangentialVelocity
variableIndex = variableIndex + 1
call ocn_compute_field_volume_weighted_local_stats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), layerThicknessEdge(:,1:nEdgesSolve), &
- v(:,1:nEdgesSolve), sums_tmp(variableIndex), mins_tmp(variableIndex), maxes_tmp(variableIndex), verticalSumMins_tmp(variableIndex), &
+ tangentialVelocity(:,1:nEdgesSolve), 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))
@@ -354,11 +354,11 @@
variableIndex = variableIndex + 1
averages(variableIndex) = sums(variableIndex)/(areaCellGlobal*nVertLevels)
- ! u
+ ! normalVelocity
variableIndex = variableIndex + 1
averages(variableIndex) = sums(variableIndex)/volumeEdgeGlobal
- ! v
+ ! tangentialVelocity
variableIndex = variableIndex + 1
averages(variableIndex) = sums(variableIndex)/volumeEdgeGlobal
</font>
</pre>