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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit ebe7ca23a89e6037af45e57d89a730b909ade783
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Aug 26 11:32:09 2005 +1000

    Small fixes for pickier gcc-4.0 warnings
    
    darcs-hash:20050826013209-fbd8f-a0b842c228d480feb77461f3bec60cbd3581b69e.gz

diff --git a/src/fluid.c b/src/fluid.c
index 79b0e2e..0031305 100644
--- a/src/fluid.c
+++ b/src/fluid.c
@@ -120,8 +120,6 @@ static GfsGradient interpolate_1D1 (FttCell * cell,
   GfsGradient p;
   FttCellFace f;
 
-  g_return_val_if_fail (cell != NULL, p);
-
   f = ftt_cell_face (cell, d);
   if (f.neighbor) {
     gdouble p2;
@@ -157,8 +155,6 @@ static GfsGradient interpolate_2D1 (FttCell * cell,
   gdouble a1, a2;
   FttCellFace f1, f2;
 
-  g_return_val_if_fail (cell != NULL, p);
-  
   f1 = ftt_cell_face (cell, d1);
   if (f1.neighbor)
     p1 = average_neighbor_value (&f1, v, &y1);
@@ -216,8 +212,8 @@ static Gradient gradient_fine_coarse (const FttCellFace * face,
   gint * dp;
 #endif /* FTT_3D */
 
-  g_return_val_if_fail (face != NULL, g);
-  g_return_val_if_fail (ftt_face_type (face) == FTT_FINE_COARSE, g);
+  g_assert (face != NULL);
+  g_assert (ftt_face_type (face) == FTT_FINE_COARSE);
 
   level = ftt_cell_level (face->cell);
   s = GFS_STATE (face->cell)->solid;
diff --git a/src/ftt.h b/src/ftt.h
index 93a6402..8c552e6 100644
--- a/src/ftt.h
+++ b/src/ftt.h
@@ -578,7 +578,7 @@ FttCellFace ftt_cell_face (FttCell * cell,
 {
   FttCellFace f;
 
-  g_return_val_if_fail (cell != NULL, f);
+  g_assert (cell != NULL);
 
   f.cell = cell;
   f.neighbor = ftt_cell_neighbor (cell, d);
diff --git a/tools/gfscompare.c b/tools/gfscompare.c
index 32b52c0..dc724f7 100644
--- a/tools/gfscompare.c
+++ b/tools/gfscompare.c
@@ -61,7 +61,7 @@ GtsVertexClass * gfs_vertex_class (void)
 
 static void add_vertex (GSList * merged, GtsSurface * s)
 {
-  FttVector cm;
+  FttVector cm = {0., 0., 0.};
   gdouble ta = 0.;
   GtsVertex * v;
   GSList * i = merged;

-- 
Gerris Flow Solver