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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 0476ec61c8507e5c6b9061fa4e21a5e746015d06
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Tue Dec 19 11:51:59 2006 +1100

    Replaced assertion with warning in solid fractions calculation
    
    darcs-hash:20061219005159-d4795-999dc36887612c8d9dca5269ddc5217a62730410.gz

diff --git a/src/solid.c b/src/solid.c
index 7edb3a3..1f11f54 100644
--- a/src/solid.c
+++ b/src/solid.c
@@ -844,8 +844,11 @@ static void paint_mixed_leaf (FttCell * cell, GfsVariable * status)
 	    if (child.c[j])
 	      w += GFS_IS_FLUID (child.c[j]) ? 1. : 
 		GFS_STATE (child.c[j])->solid->s[FTT_OPPOSITE_DIRECTION (i)];
+	  if (w/k <= 0. || w/k >= 1.)
+	    g_warning ("file %s: line %d (%s): w/k=%g solid->s[%d]=%g",
+		       __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION,
+		       w/k, i, solid->s[i]);
 	  solid->s[i] = w/k;
-	  g_assert (solid->s[i] > 0. && solid->s[i] < 1.);
 	}
       }
     gts_fifo_destroy (fifo);

-- 
Gerris Flow Solver