<p><b>dwj07@fsu.edu</b> 2012-01-23 15:54:08 -0700 (Mon, 23 Jan 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Fixing namelist flags that control the different advecton schemes.<br>
<br>
Also removing the debugging print statements.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection.F 2012-01-23 22:52:28 UTC (rev 1412)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection.F 2012-01-23 22:54:08 UTC (rev 1413)
@@ -183,12 +183,12 @@
! type (dm_info), intent(in) :: dminfo
! type (exchange_list), pointer :: cellsToSend, cellsToRecv
-! if(monotonicOn) then
+ if(monotonicOn) then
! call mpas_tracer_advection_mono_tend( tend, s_old, s_new, diag, grid, dt, dminfo, cellsToSend, cellsToRecv)
call mpas_tracer_advection_mono_tend(tracers, uh, w, zDistance, zWeightUp, zWeightDown, grid, tend)
-! else
-! call mpas_tracer_advection_std_tend(tracers, uh, w, zDistance, zWeightUp, zWeightDown, grid, tend)
-! endif
+ else
+ call mpas_tracer_advection_std_tend(tracers, uh, w, zDistance, zWeightUp, zWeightDown, grid, tend)
+ endif
end subroutine mpas_tracer_advection_tend!}}}
subroutine mpas_tracer_advection_init(err)!{{{
Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_mono.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_mono.F 2012-01-23 22:52:28 UTC (rev 1412)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_mono.F 2012-01-23 22:54:08 UTC (rev 1413)
@@ -92,8 +92,6 @@
! do one tracer at a time
do iTracer = 1, num_tracers
- write(0,*) ' mono transport for tracer ',iTracer
-
do iCell = 1, grid%nCells
do k=1, grid%nVertLevels
tracer_cur(k,iCell) = tracers(iTracer,k,iCell)
Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std.F 2012-01-23 22:52:28 UTC (rev 1412)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std.F 2012-01-23 22:54:08 UTC (rev 1413)
@@ -49,8 +49,6 @@
err = 0
- write(*,*) 'std init'
-
call mpas_tracer_advection_std_hadv_init(err_tmp)
err = ior(err, err_tmp)
call mpas_tracer_advection_std_vadv_init(err_tmp)
</font>
</pre>