<p><b>mpetersen@lanl.gov</b> 2011-10-11 15:01:57 -0600 (Tue, 11 Oct 2011)</p><p>Move dvEdge factor out of FBtr, so that this variable is really flux=U*H, to avoid confusion. dvEdge belongs with the divergence operator.<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-11 20:43:03 UTC (rev 1062)
+++ branches/ocean_projects/split_explicit_timestepping/src/core_ocean/mpas_ocn_time_integration_split.F        2011-10-11 21:01:57 UTC (rev 1063)
@@ -461,11 +461,12 @@
* block % state % time_levs(oldBtrSubcycleTime) % state % uBtrSubcycle % array(iEdge) &
+ config_btr_gam1_uWt1 &
* 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) &
@@ -861,11 +862,14 @@
block % tend % ssh % array(cell1) &
= block % tend % ssh % array(cell1) &
- - block % state % time_levs(1) % state % FBtr % array(iEdge)
+ - block % state % time_levs(1) % state % FBtr % array(iEdge) &
+ * block % mesh % dvEdge % array(iEdge)
+
block % tend % ssh % array(cell2) &
= block % tend % ssh % array(cell2) &
- + block % state % time_levs(1) % state % FBtr % array(iEdge)
+ + block % state % time_levs(1) % state % FBtr % array(iEdge) &
+ * block % mesh % dvEdge % array(iEdge)
end do
@@ -919,7 +923,6 @@
enddo
uCorr = ucorr_coef*(( block % state % time_levs(1) % state % FBtr % array(iEdge) &
- /block % mesh % dvEdge % array(iEdge) &
- uhSum)/hSum)
! put u^{tr}, the velocity for tracer transport, in uNew
</font>
</pre>