<p><b>ringler@lanl.gov</b> 2012-03-01 21:46:59 -0700 (Thu, 01 Mar 2012)</p><p><br>
remove hard-wiring of APVM upwinding that was set to 0.5 * dt<br>
<br>
the upwinding is now controlled by config_apvm_scale_factor (with a default of 0.0)<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/monotonic_advection/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/monotonic_advection/src/core_ocean/Registry        2012-03-02 03:53:52 UTC (rev 1572)
+++ branches/ocean_projects/monotonic_advection/src/core_ocean/Registry        2012-03-02 04:46:59 UTC (rev 1573)
@@ -44,9 +44,9 @@
 namelist logical   hmix     config_include_KE_vertex false
 namelist real      hmix     config_h_tracer_eddy_diff2  0.0
 namelist real      hmix     config_h_tracer_eddy_diff4  0.0
-namelist real      hmix     config_apvm_upwinding       0.5
 namelist logical   hmix     config_rayleigh_friction    false
 namelist real      hmix     config_rayleigh_damping_coeff 0.0
+namelist real      hmix     config_apvm_scale_factor      0.0
 namelist character vmix     config_vert_visc_type       const
 namelist character vmix     config_vert_diff_type       const
 namelist logical   vmix     config_implicit_vertical_mix  .true.

Modified: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tendency.F        2012-03-02 03:53:52 UTC (rev 1572)
+++ branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tendency.F        2012-03-02 04:46:59 UTC (rev 1573)
@@ -781,7 +781,7 @@
       do iEdge = 1,nEdges
          do k = 1,maxLevelEdgeBot(iEdge)
            pv_edge(k,iEdge) = pv_edge(k,iEdge) &amp;
-             - 0.5 * dt* (  u(k,iEdge) * gradPVn(k,iEdge) &amp;
+             - config_apvm_scale_factor * dt* (  u(k,iEdge) * gradPVn(k,iEdge) &amp;
                           + v(k,iEdge) * gradPVt(k,iEdge) )
          enddo
       enddo

</font>
</pre>