<p><b>mpetersen@lanl.gov</b> 2011-05-17 10:50:46 -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:38:11 UTC (rev 837)
+++ branches/ocean_projects/timesplitting_mrp/src/core_ocean/module_time_integration.F        2011-05-17 16:50:46 UTC (rev 838)
@@ -1738,8 +1738,8 @@
do iTracer=1,num_tracers
! \kappa_2 </font>
<font color="red">abla \phi on edge
tracer_turb_flux = config_h_tracer_eddy_diff2 &
- *( tracers(iTracer,k,cell2) &
- - tracers(iTracer,k,cell1))/dcEdge(iEdge)
+ *( tracers(iTracer,k,cell2)/h(k,cell2) &
+ - tracers(iTracer,k,cell1)/h(k,cell1))/dcEdge(iEdge)
! div(h \kappa_2 </font>
<font color="gray">abla \phi) at cell center
flux = dvEdge (iEdge) * h_edge(k,iEdge) &
@@ -1781,11 +1781,11 @@
do iTracer=1,num_tracers
delsq_tracer(iTracer,k,cell1) = delsq_tracer(iTracer,k,cell1) &
+ dvEdge(iEdge)*h_edge(k,iEdge) &
- *(tracers(iTracer,k,cell2) - tracers(iTracer,k,cell1)) &
+ *(tracers(iTracer,k,cell2)/h(k,cell2) - tracers(iTracer,k,cell1)/h(k,cell1)) &
/dcEdge(iEdge) * boundaryMask(k,iEdge)
delsq_tracer(iTracer,k,cell2) = delsq_tracer(iTracer,k,cell2) &
- dvEdge(iEdge)*h_edge(k,iEdge) &
- *(tracers(iTracer,k,cell2) - tracers(iTracer,k,cell1)) &
+ *(tracers(iTracer,k,cell2)/h(k,cell2) - tracers(iTracer,k,cell1)/h(k,cell1)) &
/dcEdge(iEdge) * boundaryMask(k,iEdge)
end do
end do
@@ -1847,7 +1847,8 @@
do iTracer=1,num_tracers
! compute \kappa_v d\phi/dz
fluxVertTop(iTracer,k) = vertDiffTopOfCell(k,iCell) &
- * (tracers(iTracer,k-1,iCell) - tracers(iTracer,k,iCell) )&
+ * ( tracers(iTracer,k-1,iCell)/h(k-1,iCell) &
+ - tracers(iTracer,k ,iCell)/h(k ,iCell) ) &
* 2 / (h(k-1,iCell) + h(k,iCell))
enddo
enddo
</font>
</pre>