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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 2f5e402a00e7f8e1be8a3243123bcde1bc80aa58
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Jul 18 15:31:23 2006 +1000

    Advection update using averaged values for momentum in mixed cells was ignored
    
    This caused the channel test case to fail. Ultimately however this average value
    hack should not be used at all.
    
    darcs-hash:20060718053123-d4795-6458811cb899d4b14b86dce4f787e9ad6205f01a.gz

diff --git a/src/advection.c b/src/advection.c
index 85efe23..93764d7 100644
--- a/src/advection.c
+++ b/src/advection.c
@@ -922,7 +922,6 @@ void gfs_advection_params_read (GfsAdvectionParams * par, GtsFile * fp)
   var[3].data = &scheme;
   var[4].data = &par->average;
 
-  gfs_advection_params_init (par);
   gts_file_assign_variables (fp, var);
 
   if (fp->type != GTS_ERROR && (par->cfl <= 0. || par->cfl > 1.))
diff --git a/test/channel/orderU.ref b/test/channel/orderU.ref
index 88b9e4f..fe9f76e 100644
--- a/test/channel/orderU.ref
+++ b/test/channel/orderU.ref
@@ -1,2 +1,2 @@
-5 1.153e-04 2.892e-04 2.093e-03
-6 5.165e-05 1.665e-04 3.138e-03
+5 1.149e-04 2.891e-04 2.095e-03
+6 5.161e-05 1.665e-04 3.138e-03
diff --git a/test/channel/orderV.ref b/test/channel/orderV.ref
index 728ac53..25fd097 100644
--- a/test/channel/orderV.ref
+++ b/test/channel/orderV.ref
@@ -1,2 +1,2 @@
-5 1.768e-04 5.414e-04 4.751e-03
+5 1.768e-04 5.413e-04 4.751e-03
 6 5.011e-05 1.962e-04 2.536e-03
diff --git a/test/channel/orderfU.ref b/test/channel/orderfU.ref
index 9c982d7..54ba2cb 100644
--- a/test/channel/orderfU.ref
+++ b/test/channel/orderfU.ref
@@ -1,2 +1,2 @@
-5 9.682e-05 2.509e-04 2.093e-03
-6 3.503e-05 1.089e-04 1.388e-03
+5 9.636e-05 2.509e-04 2.095e-03
+6 3.498e-05 1.089e-04 1.388e-03

-- 
Gerris Flow Solver