<p><b>mpetersen@lanl.gov</b> 2010-09-01 09:39:11 -0600 (Wed, 01 Sep 2010)</p><p>Clean up tracer IC in dissipation branch.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/dissipation/namelist.input.ocean
===================================================================
--- branches/dissipation/namelist.input.ocean        2010-08-31 22:06:15 UTC (rev 486)
+++ branches/dissipation/namelist.input.ocean        2010-09-01 15:39:11 UTC (rev 487)
@@ -15,7 +15,7 @@
 
 &amp;restart
    config_restart_interval = 115200
-   config_do_restart = .fasle.
+   config_do_restart = .false.
    config_restart_time = 31104000
 /
 
@@ -26,8 +26,8 @@
 &amp;hmix
    config_h_mom_eddy_visc2 = 0.0
    config_h_mom_eddy_visc4 = 5.0e8
-   config_h_tracer_eddy_visc2 = 10.0
-   config_h_tracer_eddy_visc4 = 0.0
+   config_h_tracer_eddy_diff2 = 10.0
+   config_h_tracer_eddy_diff4 = 0.0
 /
 &amp;vmix
    config_vert_visc_type  = 'const'

Modified: branches/dissipation/src/core_ocean/module_test_cases.F
===================================================================
--- branches/dissipation/src/core_ocean/module_test_cases.F        2010-08-31 22:06:15 UTC (rev 486)
+++ branches/dissipation/src/core_ocean/module_test_cases.F        2010-09-01 15:39:11 UTC (rev 487)
@@ -118,13 +118,11 @@
          nVertices   = block_ptr % mesh % nVertices
          nVertLevels = block_ptr % mesh % nVertLevels
 
-         !!!! setting velocity to zero
-         !u_src = 0
          pi=3.1415
-         ! Central Pacific, away from boundaries:
+         ! Tracer blob in Central Pacific, away from boundaries:
          !latCenter=pi/16;  lonCenter=9./8.*pi
 
-         ! Central Pacific, near boundaries:
+         ! Tracer blob in Central Pacific, near boundaries:
          latCenter=pi*2./16;  lonCenter=13./16.*pi
 
          if (config_vert_grid_type.eq.'zlevel') then
@@ -156,22 +154,20 @@
               ! tracers(index_salinity,iLevel,iCell) = 1.4 + iLevel*0.6  ! salinity
 
               ! for x3, 25 layer test
-              tracers(index_temperature,iLevel,iCell) = 10.0  ! temperature
-              tracers(index_salinity,iLevel,iCell) = 1.4 !+ iLevel*0.6  ! salinity
+              !tracers(index_temperature,iLevel,iCell) = 10.0  ! temperature
+              !tracers(index_salinity,iLevel,iCell) = 1.4 + iLevel*0.6  ! salinity
 
               ! tracers(index_tracer1,iLevel,iCell) = 1.0
-               tracers(index_tracer2,iLevel,iCell) = dist 
-              !   (yCell(iCell)/4000.e3 + xCell(iCell)/2500.e3 )/2.0
+              ! tracers(index_tracer2,iLevel,iCell) = &amp;
+              !    (yCell(iCell)/4000.e3 + xCell(iCell)/2500.e3 )/2.0
 
-              !tracers(index_tracer1,iLevel,iCell) = latCell(iCell)
-              !tracers(index_tracer2,iLevel,iCell) = lonCell(iCell)
+              ! Tracer blob 
+              !if (dist.lt.pi/16) then
+              !  tracers(index_tracer1,iLevel,iCell) = 1.0
+              !!else  
+              !  tracers(index_tracer1,iLevel,iCell) = 0.0
+              !endif
 
-              if (dist.lt.pi/16) then
-                tracers(index_tracer1,iLevel,iCell) = 1.0
-              else  
-                tracers(index_tracer1,iLevel,iCell) = 0.0
-              endif
-
               rho(iLevel,iCell) = 1000.0*(  1.0 &amp;
                  - 2.5e-4*tracers(index_temperature,iLevel,iCell) &amp;
                  + 7.6e-4*tracers(index_salinity,iLevel,iCell))
@@ -181,15 +177,6 @@
 
         endif
 
-! mrp for isopycnal test
-           if (config_vert_grid_type.eq.'isopycnal') then
-             rho(1,:)=1000.0
-             rho(2,:)=1003.0
-             rho(3,:)=1008.0
-           endif
-! mrp for isopycnal test
-
-
          ! print some diagnostics
          print '(10a)', 'ilevel',&amp;
             '  rho      ',&amp;

</font>
</pre>