[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit fb1c0e1c3b27abe0a1f10be28aa375c32e15d9b3
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Aug 9 15:46:34 2005 +1000

    Fix for incorrect merging test case reference
    
    darcs-hash:20050809054634-fbd8f-34cf1c059568163de852ad2fafecc8db3eed82e5.gz

diff --git a/test/euler/merging/merging.sh b/test/euler/merging/merging.sh
index a63fe14..e906190 100644
--- a/test/euler/merging/merging.sh
+++ b/test/euler/merging/merging.sh
@@ -56,10 +56,10 @@ def order(r,color='black'):
 
 print 'Circle',
 order(Curve('simc.err',1,2))
-order(Curve('simc.err',1,2), 'blue')
+order(Curve('simc.err.ref',1,2), 'blue')
 print 'Adaptive',
 order(Curve('sim.err',1,2))
-order(Curve('sim.err',1,2), 'blue')
+order(Curve('sim.err.ref',1,2), 'blue')
 
 print r"""\hline
 Domain   & \multicolumn{5}{c|}{\$L_\infty\$} \\\ \hline
@@ -67,10 +67,10 @@ Domain   & \multicolumn{5}{c|}{\$L_\infty\$} \\\ \hline
 
 print 'Circle',
 order(Curve('simc.err',1,3))
-order(Curve('simc.err',1,3), 'blue')
+order(Curve('simc.err.ref',1,3), 'blue')
 print 'Adaptive',
 order(Curve('sim.err',1,3))
-order(Curve('sim.err',1,3), 'blue')
+order(Curve('sim.err.ref',1,3), 'blue')
 
 print r"\hline\end{tabular}"
 EOF
diff --git a/test/euler/merging/sim.err.ref b/test/euler/merging/sim.err.ref
index 4e826e3..7e3bc56 100644
--- a/test/euler/merging/sim.err.ref
+++ b/test/euler/merging/sim.err.ref
@@ -1,4 +1,3 @@
 6 2.581e-02 4.400e-01
 7 1.084e-02 1.888e-01
 8 3.357e-03 4.862e-02
-9 2.073e-03 2.560e-02
diff --git a/test/euler/merging/simc.err.ref b/test/euler/merging/simc.err.ref
index a8d83b7..c29e1cf 100644
--- a/test/euler/merging/simc.err.ref
+++ b/test/euler/merging/simc.err.ref
@@ -1,4 +1,3 @@
 6 2.599e-02 4.470e-01
 7 1.043e-02 1.861e-01
 8 2.674e-03 4.852e-02
-9 6.892e-04 1.322e-02

-- 
Gerris Flow Solver