<p><b>mpetersen@lanl.gov</b> 2011-10-14 15:00:57 -0600 (Fri, 14 Oct 2011)</p><p>A few corrections to split, Barotropic subcycling, so that flux does not include the dvEdge factor.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_time_integration_split.F        2011-10-14 19:25:03 UTC (rev 1079)
+++ branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_time_integration_split.F        2011-10-14 21:00:57 UTC (rev 1080)
@@ -714,16 +714,18 @@
* block % state % time_levs(oldBtrSubcycleTime) % state % uBtrSubcycle % array(iEdge) &
+ config_btr_gam3_uWt2 &
* block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(iEdge)) &
- * block % mesh % dvEdge % array(iEdge) &
* (sshEdge + hSum)
- block % tend % ssh % array(cell1) = block % tend % ssh % array(cell1) - flux
- block % tend % ssh % array(cell2) = block % tend % ssh % array(cell2) + flux
+ block % tend % ssh % array(cell1) = block % tend % ssh % array(cell1) &
+ - flux * block % mesh % dvEdge % array(iEdge)
+ block % tend % ssh % array(cell2) = block % tend % ssh % array(cell2) &
+ + flux * block % mesh % dvEdge % array(iEdge)
block % state % time_levs(1) % state % FBtr % array(iEdge) &
= block % state % time_levs(1) % state % FBtr % array(iEdge) &
- + flux
+ + FBtr_coeff*flux
+
end do
! SSHnew = SSHold + dt/J*(-div(Flux))
Modified: branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_tracer_vadv_spline.F
===================================================================
--- branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_tracer_vadv_spline.F        2011-10-14 19:25:03 UTC (rev 1079)
+++ branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_tracer_vadv_spline.F        2011-10-14 21:00:57 UTC (rev 1080)
@@ -168,7 +168,7 @@
if(config_vert_tracer_adv.eq.'spline') then
splineOn = .true.
- call ocn_tracer_vadv_spline2_init(err2)
+ call ocn_tracer_vadv_spline2_init(err1)
call ocn_tracer_vadv_spline3_init(err2)
err = err1 .or. err2
</font>
</pre>