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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 91629d195154231db742b87547b98b9c1ac8eca8
Author: Stephane Popinet <popinet at users.sourceforge.net>
Date:   Mon Nov 1 10:06:48 2004 +1100

    Removed upstream self-intersection checks (gerris--mainline--0.7--patch-15)
    
    gerris--mainline--0.7--patch-15
    Keywords:
    
    This can cause the solid fractions algorithm to fail due to
    consistency checks being violated by self-intersecting surfaces.
    
    The messages will be a bit obscure. We'll fix that as we go.
    
    The advantage is that in possibly a large number of cases with "minor"
    self-intersections (e.g. nearly collocated vertices etc...) the
    algorithm will proceed and should produce valid solid fractions.
    
    darcs-hash:20041031230648-aabb8-c086bc04404feb52f7b2c6f8094da8993766364b.gz

diff --git a/src/simulation.c b/src/simulation.c
index f802d8e..3f28460 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -265,15 +265,8 @@ static GtsSurface * read_surface_file (GtsFile * fp, GtsSurface * surface)
   }
   
   if (surface) {
-    GtsSurface * self;
-    
     gts_surface_merge (surface, s);
     gts_object_destroy (GTS_OBJECT (s));
-    if ((self = gts_surface_is_self_intersecting (surface))) {
-      gts_object_destroy (GTS_OBJECT (self));
-      gts_file_error (fp, "merged surface is self-intersecting");
-      return NULL;
-    }
     return surface;
   }
   return s;
@@ -314,15 +307,8 @@ static GtsSurface * read_surface (GtsFile * fp, GtsSurface * surface)
   }
   
   if (surface) {
-    GtsSurface * self;
-    
     gts_surface_merge (surface, s);
     gts_object_destroy (GTS_OBJECT (s));
-    if ((self = gts_surface_is_self_intersecting (surface))) {
-      gts_object_destroy (GTS_OBJECT (self));
-      gts_file_error (fp, "merged surface is self-intersecting");
-      return NULL;
-    }
     return surface;
   }
   return s;
diff --git a/src/solid.c b/src/solid.c
index 6645576..3680130 100644
--- a/src/solid.c
+++ b/src/solid.c
@@ -558,7 +558,7 @@ static void solid_fractions_from_children (FttCell * cell, InitSolidParams * p)
     if (FTT_CELL_IS_ROOT (cell))
       g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR,
 	     "root cell is entirely outside of the fluid domain\n"
-	     "the solid surface orientation may be incorrect\n");
+	     "the solid surface orientation may be incorrect");
     else
       ftt_cell_destroy (cell, p->cleanup, p->data);
   }

-- 
Gerris Flow Solver