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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit b043824a87d73ceceda0389252bd7e6e807b390c
Author: Stephane Popinet <popinet at users.sourceforge.net>
Date:   Tue Nov 16 08:57:45 2004 +1100

    Weaker solid fraction consistency checks to accomodate mixed cell refinement (gerris--ocean--0.7--patch-12)
    
    gerris--ocean--0.7--patch-12
    Keywords:
    
    darcs-hash:20041115215745-aabb8-47c6925a2e6dc60ce53655f3f4aef6252499c244.gz

diff --git a/src/solid.c b/src/solid.c
index 1d6519e..ee8d4bb 100644
--- a/src/solid.c
+++ b/src/solid.c
@@ -733,9 +733,7 @@ static gboolean check_area_fractions (const FttCell * root)
       }
       else { /* fine/coarse boundary */
 	g_assert (ftt_cell_level (neighbor.c[i]) == level - 1);
-	/* check for mixed cell refinement violation (topology.fig) */
-	g_return_val_if_fail (GFS_IS_FLUID (neighbor.c[i]), FALSE);
-	if (GFS_IS_MIXED (root) && 1. - solid->s[i] >= 1e-10) {
+	if (GFS_IS_FLUID (neighbor.c[i]) && GFS_IS_MIXED (root) && 1. - solid->s[i] >= 1e-10) {
 	  g_warning ("file %s: line %d (%s): s[%d]: %g",
 		     __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION,
 		     i, solid->s[i]);

-- 
Gerris Flow Solver