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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 43519142ade2951d57e88152077cc817366df57c
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Aug 26 10:01:46 2009 +1000

    BcSubcritical now tolerates negative depths
    
    darcs-hash:20090826000146-d4795-9f734844b2da97d3936ef049b2b78117ee69e8a4.gz

diff --git a/src/river.c b/src/river.c
index a45ef64..83435b7 100644
--- a/src/river.c
+++ b/src/river.c
@@ -521,8 +521,9 @@ static void subcritical (FttCellFace * f, GfsBc * b)
   GfsRiver * river = GFS_RIVER (b->v->domain);
   gdouble hi = GFS_VALUE (f->neighbor, river->v[0]);
 
+  g_assert (hi >= 0.);
   GFS_VALUE (f->cell, b->v) = GFS_VALUE (f->neighbor, b->v) + 
-    (FTT_FACE_DIRECT (f) ? -1. : 1.)*2.*hi*(sqrt (river->g*hi) - sqrt (river->g*hb));
+    (FTT_FACE_DIRECT (f) ? -1. : 1.)*2.*hi*(sqrt (river->g*hi) - sqrt (river->g*MAX (hb, 0.)));
 }
 
 static void bc_subcritical_read (GtsObject ** o, GtsFile * fp)

-- 
Gerris Flow Solver