<p><b>duda</b> 2010-11-05 10:45:00 -0600 (Fri, 05 Nov 2010)</p><p>BRANCH COMMIT<br>
<br>
Parameterize pv upwinding in sw and ocean cores as well. <br>
<br>
<br>
M    src/core_sw/Registry<br>
M    src/core_sw/module_time_integration.F<br>
M    src/core_ocean/Registry<br>
M    src/core_ocean/module_time_integration.F<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_nonhydrostatic/src/core_ocean/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_ocean/Registry        2010-11-05 16:28:19 UTC (rev 596)
+++ branches/atmos_nonhydrostatic/src/core_ocean/Registry        2010-11-05 16:45:00 UTC (rev 597)
@@ -19,6 +19,7 @@
 namelist real      hmix     config_h_mom_eddy_visc4     0.0
 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 character vmix     config_vert_visc_type    const
 namelist character vmix     config_vert_diff_type    const
 namelist real      vmix     config_vert_viscosity    2.5e-4

Modified: branches/atmos_nonhydrostatic/src/core_ocean/module_time_integration.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_ocean/module_time_integration.F        2010-11-05 16:28:19 UTC (rev 596)
+++ branches/atmos_nonhydrostatic/src/core_ocean/module_time_integration.F        2010-11-05 16:45:00 UTC (rev 597)
@@ -1470,7 +1470,7 @@
       !
       do iEdge = 1,nEdges
          do k = 1,nVertLevels
-           pv_edge(k,iEdge) = pv_edge(k,iEdge) - 0.5 * v(k,iEdge) * dt * gradPVt(k,iEdge)
+           pv_edge(k,iEdge) = pv_edge(k,iEdge) - config_apvm_upwinding * v(k,iEdge) * dt * gradPVt(k,iEdge)
          enddo
       enddo
 
@@ -1510,7 +1510,7 @@
       !
       do iEdge = 1,nEdges
          do k = 1,nVertLevels
-           pv_edge(k,iEdge) = pv_edge(k,iEdge) - 0.5 * u(k,iEdge) * dt * gradPVn(k,iEdge)
+           pv_edge(k,iEdge) = pv_edge(k,iEdge) - config_apvm_upwinding * u(k,iEdge) * dt * gradPVn(k,iEdge)
          enddo
       enddo
 

Modified: branches/atmos_nonhydrostatic/src/core_sw/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_sw/Registry        2010-11-05 16:28:19 UTC (rev 596)
+++ branches/atmos_nonhydrostatic/src/core_sw/Registry        2010-11-05 16:45:00 UTC (rev 597)
@@ -12,6 +12,7 @@
 namelist integer   sw_model config_tracer_adv_order     2
 namelist logical   sw_model config_positive_definite    false
 namelist logical   sw_model config_monotonic            false
+namelist real      sw_model config_apvm_upwinding       0.5
 namelist character io       config_input_name        grid.nc
 namelist character io       config_output_name       output.nc
 namelist character io       config_restart_name      restart.nc

Modified: branches/atmos_nonhydrostatic/src/core_sw/module_time_integration.F
===================================================================
--- branches/atmos_nonhydrostatic/src/core_sw/module_time_integration.F        2010-11-05 16:28:19 UTC (rev 596)
+++ branches/atmos_nonhydrostatic/src/core_sw/module_time_integration.F        2010-11-05 16:45:00 UTC (rev 597)
@@ -921,7 +921,7 @@
       !
       do iEdge = 1,nEdges
          do k = 1,nVertLevels
-           pv_edge(k,iEdge) = pv_edge(k,iEdge) - 0.5 * v(k,iEdge) * dt * gradPVt(k,iEdge)
+           pv_edge(k,iEdge) = pv_edge(k,iEdge) - config_apvm_upwinding * v(k,iEdge) * dt * gradPVt(k,iEdge)
          enddo
       enddo
 
@@ -963,7 +963,7 @@
       !
       do iEdge = 1,nEdges
          do k = 1,nVertLevels
-           pv_edge(k,iEdge) = pv_edge(k,iEdge) - 0.5 * u(k,iEdge) * dt * gradPVn(k,iEdge)
+           pv_edge(k,iEdge) = pv_edge(k,iEdge) - config_apvm_upwinding * u(k,iEdge) * dt * gradPVn(k,iEdge)
          enddo
       enddo
 

</font>
</pre>