<p><b>mpetersen@lanl.gov</b> 2011-05-17 13:25:13 -0600 (Tue, 17 May 2011)</p><p>Changing tracer diffusion terms to tracers/h so that we diffuse \phi rather than h\phi.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F
===================================================================
--- branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F        2011-05-17 16:50:46 UTC (rev 838)
+++ branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F        2011-05-17 19:25:13 UTC (rev 839)
@@ -931,11 +931,13 @@
cell2 = cellsOnEdge(2,iEdge)
do k=1,min(1,maxLevelEdgeTop(iEdge))
flux = u(k,iEdge) * dvEdge(iEdge) * h_edge(k,iEdge)
- tend_h(k,cell1) = tend_h(k,cell1) - flux
+! mrp temp
+ tend_h(k,cell1) = tend_h(k,cell1) - flux
tend_h(k,cell2) = tend_h(k,cell2) + flux
end do
end do
do iCell=1,nCells
+! mrp temp
tend_h(1,iCell) = tend_h(1,iCell) / areaCell(iCell)
end do
@@ -947,7 +949,8 @@
! Vertical advection computed for top layer of a z grid only.
if (config_vert_grid_type.eq.'zlevel') then
do iCell=1,nCells
- tend_h(1,iCell) = tend_h(1,iCell) + wTop(2,iCell)
+! mrp temp
+! tend_h(1,iCell) = tend_h(1,iCell) + wTop(2,iCell)
end do
endif ! coordinate type
@@ -1429,6 +1432,7 @@
do iTracer=1,num_tracers
tracer_edge = 0.5 * (tracers(iTracer,k,cell1) + tracers(iTracer,k,cell2))
flux = u(k,iEdge) * dvEdge(iEdge) * h_edge(k,iEdge) * tracer_edge
+! mrp temp
tend_tr(iTracer,k,cell1) = tend_tr(iTracer,k,cell1) - flux/areaCell(cell1)
tend_tr(iTracer,k,cell2) = tend_tr(iTracer,k,cell2) + flux/areaCell(cell2)
end do
@@ -1705,9 +1709,10 @@
do iCell=1,nCellsSolve
do k=1,maxLevelCell(iCell)
do iTracer=1,num_tracers
- tend_tr(iTracer,k,iCell) = tend_tr(iTracer,k,iCell) &
- - ( wTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
- - wTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
+! mrp temp
+! tend_tr(iTracer,k,iCell) = tend_tr(iTracer,k,iCell) &
+! - ( wTop(k ,iCell)*tracerTop(iTracer,k ,iCell) &
+! - wTop(k+1,iCell)*tracerTop(iTracer,k+1,iCell))
end do
end do
end do
@@ -1737,9 +1742,14 @@
do k=1,maxLevelEdgeTop(iEdge)
do iTracer=1,num_tracers
! \kappa_2 </font>
<font color="red">abla \phi on edge
+! my new one:
+! tracer_turb_flux = config_h_tracer_eddy_diff2 &
+! *( tracers(iTracer,k,cell2)/h(k,cell2) &
+! - tracers(iTracer,k,cell1)/h(k,cell1))/dcEdge(iEdge)
+! orig:
tracer_turb_flux = config_h_tracer_eddy_diff2 &
- *( tracers(iTracer,k,cell2)/h(k,cell2) &
- - tracers(iTracer,k,cell1)/h(k,cell1))/dcEdge(iEdge)
+ *( tracers(iTracer,k,cell2) &
+ - tracers(iTracer,k,cell1))/dcEdge(iEdge)
! div(h \kappa_2 </font>
<font color="black">abla \phi) at cell center
flux = dvEdge (iEdge) * h_edge(k,iEdge) &
</font>
</pre>