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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 982f955ac63faf2ec9d3c095d4d7bd0b1ad49d20
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Wed Jan 19 08:25:22 2005 +1100

    Clearer error message for boundaries outside fluid domain
    
    darcs-hash:20050118212522-fbd8f-0115fba1e61e0a423b6f989588f8424cf68f01d7.gz

diff --git a/src/boundary.c b/src/boundary.c
index ae18d5d..7070a02 100644
--- a/src/boundary.c
+++ b/src/boundary.c
@@ -348,7 +348,10 @@ static void match (FttCell * cell, GfsBoundary * boundary)
 
   cell->flags |= GFS_FLAG_BOUNDARY;
   if (neighbor == NULL || ftt_cell_level (neighbor) < level) {
-    g_assert (!FTT_CELL_IS_ROOT (cell));
+    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");
     ftt_cell_destroy (cell, (FttCellCleanupFunc) gfs_cell_cleanup, NULL);
     boundary->changed = TRUE;
     return;
@@ -357,7 +360,10 @@ static void match (FttCell * cell, GfsBoundary * boundary)
     GfsSolidVector * s = GFS_STATE (neighbor)->solid;
 
     if (s && s->s[FTT_OPPOSITE_DIRECTION (boundary->d)] == 0.) {
-      g_assert (!FTT_CELL_IS_ROOT (cell));
+      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");
       ftt_cell_destroy (cell, (FttCellCleanupFunc) gfs_cell_cleanup, NULL);
       boundary->changed = TRUE;
       return;

-- 
Gerris Flow Solver