<p><b>mpetersen@lanl.gov</b> 2010-03-24 11:16:59 -0600 (Wed, 24 Mar 2010)</p><p>Added temperature and salinity as names in the tracer super-array.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/z-level_mrp/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/z-level_mrp/src/core_ocean/Registry        2010-03-23 22:36:20 UTC (rev 157)
+++ branches/ocean_projects/z-level_mrp/src/core_ocean/Registry        2010-03-24 17:16:59 UTC (rev 158)
@@ -29,7 +29,6 @@
dim R3 3
dim vertexDegree vertexDegree
dim nVertLevels nVertLevels
-dim nTracers nTracers
#
# var type name_in_file ( dims ) iro- name_in_code super-array array_class
@@ -94,7 +93,8 @@
# Prognostic variables: read from input, saved in restart, and written to output
var real u ( nVertLevels nEdges Time ) iro u - -
var real h ( nVertLevels nCells Time ) iro h - -
-var real tracers ( nTracers nVertLevels nCells Time ) iro tracers - -
+var real temperature ( nVertLevels nCells Time ) iro temperature tracers dynamics
+var real salinity ( nVertLevels nCells Time ) iro salinity tracers dynamics
# Diagnostic fields: only written to output
var real v ( nVertLevels nEdges Time ) o v - -
Modified: branches/ocean_projects/z-level_mrp/src/core_ocean/module_time_integration.F
===================================================================
--- branches/ocean_projects/z-level_mrp/src/core_ocean/module_time_integration.F        2010-03-23 22:36:20 UTC (rev 157)
+++ branches/ocean_projects/z-level_mrp/src/core_ocean/module_time_integration.F        2010-03-24 17:16:59 UTC (rev 158)
@@ -151,7 +151,7 @@
block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
call dmpar_exch_halo_field3dReal(domain % dminfo, block % intermediate_step(TEND) % tracers % array(:,:,:), &
- block % mesh % nTracers, block % mesh % nVertLevels, block % mesh % nCells, &
+ num_tracers, block % mesh % nVertLevels, block % mesh % nCells, &
block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
block => block % next
end do
@@ -449,7 +449,7 @@
cell2 = grid % cellsOnEdge % array(2,iEdge)
if (cell1 > 0 .and. cell2 > 0) then
do k=1,grid % nVertLevels
- do iTracer=1,grid % nTracers
+ do iTracer=1,num_tracers
tracer_edge = 0.5 * (s % tracers % array(iTracer,k,cell1) + s % tracers % array(iTracer,k,cell2))
flux = s % u % array(k,iEdge) * grid % dvEdge % array(iEdge) * s % h_edge % array(k,iEdge) * tracer_edge
tend % tracers % array(iTracer,k,cell1) = tend % tracers % array(iTracer,k,cell1) - flux
@@ -461,7 +461,7 @@
do iCell=1,grid % nCellsSolve
do k=1,grid % nVertLevelsSolve
- do iTracer=1,grid % nTracers
+ do iTracer=1,num_tracers
tend % tracers % array(iTracer,k,iCell) = tend % tracers % array(iTracer,k,iCell) / grid % areaCell % array(iCell)
end do
end do
</font>
</pre>