<p><b>mpetersen@lanl.gov</b> 2013-03-01 08:32:20 -0700 (Fri, 01 Mar 2013)</p><p>branch commit, sea_level_pressure. Change variable name to seaSurfacePressure, merge trunk.<br>
</p><hr noshade><pre><font color="gray">Index: branches/ocean_projects/sea_level_pressure
===================================================================
--- branches/ocean_projects/sea_level_pressure 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure 2013-03-01 15:32:20 UTC (rev 2528)
Property changes on: branches/ocean_projects/sea_level_pressure
___________________________________________________________________
Modified: svn:mergeinfo
## -29,4 +29,4 ##
/branches/omp_blocks/multiple_blocks:1803-2084
/branches/source_renaming:1082-1113
/branches/time_manager:924-962
-/trunk/mpas:2486-2493
+/trunk/mpas:2486-2527
\ No newline at end of property
Modified: branches/ocean_projects/sea_level_pressure/src/core_hyd_atmos/Registry
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_hyd_atmos/Registry 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure/src/core_hyd_atmos/Registry 2013-03-01 15:32:20 UTC (rev 2528)
@@ -96,7 +96,7 @@
var persistent real edgeNormalVectors ( R3 nEdges ) 0 o edgeNormalVectors mesh - -
var persistent real localVerticalUnitVectors ( R3 nCells ) 0 o localVerticalUnitVectors mesh - -
-var persistent real cellTangentPlane ( R3 TWO nEdges ) 0 o cellTangentPlane mesh - -
+var persistent real cellTangentPlane ( R3 TWO nCells ) 0 o cellTangentPlane mesh - -
var persistent integer cellsOnCell ( maxEdges nCells ) 0 iro cellsOnCell mesh - -
var persistent integer verticesOnCell ( maxEdges nCells ) 0 iro verticesOnCell mesh - -
Modified: branches/ocean_projects/sea_level_pressure/src/core_init_nhyd_atmos/Registry
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_init_nhyd_atmos/Registry 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure/src/core_init_nhyd_atmos/Registry 2013-03-01 15:32:20 UTC (rev 2528)
@@ -108,7 +108,7 @@
var persistent real edgeNormalVectors ( R3 nEdges ) 0 io edgeNormalVectors mesh - -
var persistent real localVerticalUnitVectors ( R3 nCells ) 0 io localVerticalUnitVectors mesh - -
-var persistent real cellTangentPlane ( R3 TWO nEdges ) 0 io cellTangentPlane mesh - -
+var persistent real cellTangentPlane ( R3 TWO nCells ) 0 io cellTangentPlane mesh - -
var persistent integer cellsOnCell ( maxEdges nCells ) 0 io cellsOnCell mesh - -
var persistent integer verticesOnCell ( maxEdges nCells ) 0 io verticesOnCell mesh - -
Modified: branches/ocean_projects/sea_level_pressure/src/core_nhyd_atmos/Registry
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_nhyd_atmos/Registry 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure/src/core_nhyd_atmos/Registry 2013-03-01 15:32:20 UTC (rev 2528)
@@ -113,7 +113,7 @@
var persistent real edgeNormalVectors ( R3 nEdges ) 0 iro edgeNormalVectors mesh - -
var persistent real localVerticalUnitVectors ( R3 nCells ) 0 iro localVerticalUnitVectors mesh - -
-var persistent real cellTangentPlane ( R3 TWO nEdges ) 0 iro cellTangentPlane mesh - -
+var persistent real cellTangentPlane ( R3 TWO nCells ) 0 iro cellTangentPlane mesh - -
var persistent integer cellsOnCell ( maxEdges nCells ) 0 iro cellsOnCell mesh - -
var persistent integer verticesOnCell ( maxEdges nCells ) 0 iro verticesOnCell mesh - -
Index: branches/ocean_projects/sea_level_pressure/src/core_ocean
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_ocean 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure/src/core_ocean 2013-03-01 15:32:20 UTC (rev 2528)
Property changes on: branches/ocean_projects/sea_level_pressure/src/core_ocean
___________________________________________________________________
Modified: svn:mergeinfo
## -31,4 +31,4 ##
/branches/omp_blocks/openmp_test/src/core_ocean_elements:2161-2201
/branches/source_renaming/src/core_ocean:1082-1113
/branches/time_manager/src/core_ocean:924-962
-/trunk/mpas/src/core_ocean:2486-2493
+/trunk/mpas/src/core_ocean:2486-2527
\ No newline at end of property
Modified: branches/ocean_projects/sea_level_pressure/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_ocean/Registry 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure/src/core_ocean/Registry 2013-03-01 15:32:20 UTC (rev 2528)
@@ -207,7 +207,7 @@
var persistent real edgeNormalVectors ( R3 nEdges ) 0 o edgeNormalVectors mesh - -
var persistent real localVerticalUnitVectors ( R3 nCells ) 0 o localVerticalUnitVectors mesh - -
-var persistent real cellTangentPlane ( R3 TWO nEdges ) 0 o cellTangentPlane mesh - -
+var persistent real cellTangentPlane ( R3 TWO nCells ) 0 o cellTangentPlane mesh - -
var persistent integer cellsOnCell ( maxEdges nCells ) 0 iro cellsOnCell mesh - -
var persistent integer verticesOnCell ( maxEdges nCells ) 0 iro verticesOnCell mesh - -
@@ -372,5 +372,5 @@
var persistent integer edgeSignOnVertex ( maxEdges nVertices ) 0 - edgeSignOnVertex mesh - -
var persistent integer kiteIndexOnCell ( maxEdges nCells ) 0 - kiteIndexOnCell mesh - -
-% Sea level pressure, for coupling
-var persistent real seaLevelPressure ( nCells Time ) 0 ir seaLevelPressure mesh - -
+% Sea surface pressure, for coupling
+var persistent real seaSurfacePressure ( nCells Time ) 0 ir seaSurfacePressure mesh - -
Modified: branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_diagnostics.F
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_diagnostics.F 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure/src/core_ocean/mpas_ocn_diagnostics.F 2013-03-01 15:32:20 UTC (rev 2528)
@@ -97,7 +97,7 @@
real (kind=RKIND), dimension(:), allocatable:: pTop, div_hu
real (kind=RKIND), dimension(:), pointer :: &
- bottomDepth, fVertex, dvEdge, dcEdge, areaCell, areaTriangle, ssh, seaLevelPressure
+ bottomDepth, fVertex, dvEdge, dcEdge, areaCell, areaTriangle, ssh, seaSurfacePressure
real (kind=RKIND), dimension(:,:), pointer :: &
weightsOnEdge, kiteAreasOnVertex, h_edge, h, u, v, pressure,&
circulation, vorticity, ke, ke_edge, MontPot, wTop, zMid, &
@@ -159,7 +159,7 @@
kiteIndexOnCell => grid % kiteIndexOnCell % array
verticesOnCell => grid % verticesOnCell % array
- seaLevelPressure => grid % seaLevelPressure % array
+ seaSurfacePressure => grid % seaSurfacePressure % array
nCells = grid % nCells
nEdges = grid % nEdges
@@ -427,7 +427,7 @@
! Pressure for generalized coordinates.
! Pressure at top surface may be due to atmospheric pressure
! or an ice-shelf depression.
- pressure(1,iCell) = seaLevelPressure(iCell) + rho(1,iCell)*gravity &
+ pressure(1,iCell) = seaSurfacePressure(iCell) + rho(1,iCell)*gravity &
* 0.5*h(1,iCell)
do k=2,maxLevelCell(iCell)
Modified: branches/ocean_projects/sea_level_pressure/src/core_sw/Registry
===================================================================
--- branches/ocean_projects/sea_level_pressure/src/core_sw/Registry 2013-02-28 22:41:18 UTC (rev 2527)
+++ branches/ocean_projects/sea_level_pressure/src/core_sw/Registry 2013-03-01 15:32:20 UTC (rev 2528)
@@ -97,7 +97,7 @@
var persistent real edgeNormalVectors ( R3 nEdges ) 0 o edgeNormalVectors mesh - -
var persistent real localVerticalUnitVectors ( R3 nCells ) 0 o localVerticalUnitVectors mesh - -
-var persistent real cellTangentPlane ( R3 TWO nEdges ) 0 o cellTangentPlane mesh - -
+var persistent real cellTangentPlane ( R3 TWO nCells ) 0 o cellTangentPlane mesh - -
var persistent integer cellsOnCell ( maxEdges nCells ) 0 iro cellsOnCell mesh - -
var persistent integer verticesOnCell ( maxEdges nCells ) 0 iro verticesOnCell mesh - -
</font>
</pre>