<p><b>mpetersen@lanl.gov</b> 2013-03-01 08:45:06 -0700 (Fri, 01 Mar 2013)</p><p>trunk commit, ocean core only. Merge sea_level_pressure branch to trunk. mpas-o now has the ability to specify a pressure at the top surface, either from the atmosphere or an ice shelf.<br>
</p><hr noshade><pre><font color="gray">Index: trunk/mpas
===================================================================
--- trunk/mpas        2013-03-01 15:32:20 UTC (rev 2528)
+++ trunk/mpas        2013-03-01 15:45:06 UTC (rev 2529)
Property changes on: trunk/mpas
___________________________________________________________________
Modified: svn:mergeinfo
## -17,6 +17,7 ##
/branches/ocean_projects/option3_b4b_test:2201-2231
/branches/ocean_projects/partial_bottom_cells:2172-2226
/branches/ocean_projects/restart_reproducibility:2239-2272
+/branches/ocean_projects/sea_level_pressure:2488-2528
/branches/ocean_projects/split_explicit_mrp:1134-1138
/branches/ocean_projects/split_explicit_timestepping:1044-1097
/branches/ocean_projects/vert_adv_mrp:704-745
\ No newline at end of property
Index: trunk/mpas/src/core_ocean
===================================================================
--- trunk/mpas/src/core_ocean        2013-03-01 15:32:20 UTC (rev 2528)
+++ trunk/mpas/src/core_ocean        2013-03-01 15:45:06 UTC (rev 2529)
Property changes on: trunk/mpas/src/core_ocean
___________________________________________________________________
Modified: svn:mergeinfo
## -17,6 +17,7 ##
/branches/ocean_projects/option3_b4b_test/src/core_ocean:2201-2231
/branches/ocean_projects/partial_bottom_cells/src/core_ocean:2172-2226
/branches/ocean_projects/restart_reproducibility/src/core_ocean:2239-2272
+/branches/ocean_projects/sea_level_pressure/src/core_ocean:2488-2528
/branches/ocean_projects/split_explicit_mrp/src/core_ocean:1134-1138
/branches/ocean_projects/split_explicit_timestepping/src/core_ocean:1044-1097
/branches/ocean_projects/vert_adv_mrp/src/core_ocean:704-745
\ No newline at end of property
Modified: trunk/mpas/src/core_ocean/Registry
===================================================================
--- trunk/mpas/src/core_ocean/Registry        2013-03-01 15:32:20 UTC (rev 2528)
+++ trunk/mpas/src/core_ocean/Registry        2013-03-01 15:45:06 UTC (rev 2529)
@@ -371,3 +371,6 @@
var persistent integer edgeSignOnCell ( maxEdges nCells ) 0 - edgeSignOnCell mesh - -
var persistent integer edgeSignOnVertex ( maxEdges nVertices ) 0 - edgeSignOnVertex mesh - -
var persistent integer kiteIndexOnCell ( maxEdges nCells ) 0 - kiteIndexOnCell mesh - -
+
+% Sea surface pressure, for coupling
+var persistent real seaSurfacePressure ( nCells Time ) 0 ir seaSurfacePressure mesh - -
Modified: trunk/mpas/src/core_ocean/mpas_ocn_diagnostics.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_diagnostics.F        2013-03-01 15:32:20 UTC (rev 2528)
+++ trunk/mpas/src/core_ocean/mpas_ocn_diagnostics.F        2013-03-01 15:45:06 UTC (rev 2529)
@@ -97,7 +97,7 @@
real (kind=RKIND), dimension(:), allocatable:: pTop, div_hu
real (kind=RKIND), dimension(:), pointer :: &
- bottomDepth, fVertex, dvEdge, dcEdge, areaCell, areaTriangle, ssh
+ 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, &
@@ -158,6 +158,8 @@
maxLevelVertexBot => grid % maxLevelVertexBot % array
kiteIndexOnCell => grid % kiteIndexOnCell % array
verticesOnCell => grid % verticesOnCell % array
+
+ seaSurfacePressure => grid % seaSurfacePressure % array
nCells = grid % nCells
nEdges = grid % nEdges
@@ -422,9 +424,10 @@
else
do iCell=1,nCells
- ! pressure for generalized coordinates
- ! assume atmospheric pressure at the surface is zero for now.
- pressure(1,iCell) = rho(1,iCell)*gravity &
+ ! Pressure for generalized coordinates.
+ ! Pressure at top surface may be due to atmospheric pressure
+ ! or an ice-shelf depression.
+ pressure(1,iCell) = seaSurfacePressure(iCell) + rho(1,iCell)*gravity &
* 0.5*h(1,iCell)
do k=2,maxLevelCell(iCell)
Modified: trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F        2013-03-01 15:32:20 UTC (rev 2528)
+++ trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F        2013-03-01 15:45:06 UTC (rev 2529)
@@ -126,7 +126,7 @@
if (.not.config_do_restart) call ocn_init_split_timestep(domain)
- write (0,'(a,a10)') ' Vertical coordinate movement is: ',config_vert_coord_movement
+ write (0,'(a,a)') ' Vertical coordinate movement is: ',trim(config_vert_coord_movement)
if (config_vert_coord_movement.ne.'isopycnal'.and. &
config_vert_coord_movement.ne.'fixed'.and. &
</font>
</pre>