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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 309108390e56200611823b08ee5c7bc86eddd5c0
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Mar 6 18:29:16 2008 +1100

    Bug fix for sign error in new momentum source term implementation
    
    darcs-hash:20080306072916-d4795-8d542903d2cacf076a659b197730a3cd6d57e87d.gz

diff --git a/src/timestep.c b/src/timestep.c
index 8be40c2..10b0a92 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -191,15 +191,15 @@ static void add_face_source (FttCellFace * face,
 
   c = face->d/2;
   dp = (* f->s->face_value) (f->s, face, f->v);
-  GFS_FACE_NORMAL_VELOCITY_LEFT (face) -= dp*f->dt;
+  GFS_FACE_NORMAL_VELOCITY_LEFT (face) += dp*f->dt;
   if (f->g)
-    GFS_VARIABLE (face->cell, f->g[c]->i) += dp*GFS_FACE_FRACTION_LEFT (face);
+    GFS_VARIABLE (face->cell, f->g[c]->i) -= dp*GFS_FACE_FRACTION_LEFT (face);
 
   if (ftt_face_type (face) == FTT_FINE_COARSE)
     dp *= GFS_FACE_FRACTION_LEFT (face)/(GFS_FACE_FRACTION_RIGHT (face)*FTT_CELLS/2);
-  GFS_FACE_NORMAL_VELOCITY_RIGHT (face) -= dp*f->dt;
+  GFS_FACE_NORMAL_VELOCITY_RIGHT (face) += dp*f->dt;
   if (f->g)
-    GFS_VARIABLE (face->neighbor, f->g[c]->i) += dp*GFS_FACE_FRACTION_RIGHT (face);
+    GFS_VARIABLE (face->neighbor, f->g[c]->i) -= dp*GFS_FACE_FRACTION_RIGHT (face);
 }
 
 static void velocity_face_sources (GfsDomain * domain,
diff --git a/test/hydrostatic/hydrostatic.gfs b/test/hydrostatic/hydrostatic.gfs
index 0391f5c..601379c 100644
--- a/test/hydrostatic/hydrostatic.gfs
+++ b/test/hydrostatic/hydrostatic.gfs
@@ -21,9 +21,9 @@
     OutputScalarNorm { istep = 1 } v { v = V }
     EventScript { start = end } { 
         if awk '{if ($9 > 1e-12) exit (1);}' < v ; then
-            return 0;
+            exit 0;
         else
-            return $GFS_STOP;
+            exit $GFS_STOP;
         fi
     } 
 }
diff --git a/test/hydrostatic/quadratic/quadratic.gfs b/test/hydrostatic/quadratic/quadratic.gfs
index bd13a58..cce31c5 100644
--- a/test/hydrostatic/quadratic/quadratic.gfs
+++ b/test/hydrostatic/quadratic/quadratic.gfs
@@ -29,17 +29,17 @@
     OutputScalarNorm { istep = 1 } v { v = V }
     # Checks that the pressure profile is close to the exact solution
     OutputErrorNorm { istep = 1 } p { v = P } {
-        s = (cy*cy/2. + 0.5*cy) 
+        s = -(cy*cy/2. + 0.5*cy) 
         unbiased = 1 
     }
     EventScript { start = end } { 
         if awk '{if ($9 > 1e-12) exit (1);}' < v ; then :
         else
-            return $GFS_STOP;
+            exit $GFS_STOP;
         fi        
         if awk '{if ($9 > 1e-12) exit (1);}' < p ; then :
         else
-            return $GFS_STOP;
+            exit $GFS_STOP;
         fi
     } 
 }

-- 
Gerris Flow Solver