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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit ca4fea1dd0bfcb0435ceb653a30d3ee78a6cf530
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Mon Aug 14 10:11:29 2006 +1000

    Updated stability criterion for surface tension
    
    darcs-hash:20060814001129-d4795-14d76e9e4028217923db99b5847725078251c491.gz

diff --git a/src/tension.c b/src/tension.c
index 777f91a..0347759 100644
--- a/src/tension.c
+++ b/src/tension.c
@@ -237,11 +237,10 @@ static gdouble gfs_source_tension_stability (GfsSourceGeneric * s,
   h = ftt_level_size (p.depth);
   if (p.alpha) {
     gdouble rhom = (1./p.amin + 1./p.amax)/2.;
-    gdouble rhod = p.amin < p.amax ? p.amin/p.amax : p.amax/p.amin;
-    return 3.*sqrt (rhom*rhod*h*h*h/sigma);
+    return sqrt (rhom*h*h*h/(2.*M_PI*sigma));
   }
   else
-    return 3.*sqrt (h*h*h/sigma);
+    return sqrt (h*h*h/(2.*M_PI*sigma));
 }
 
 static void gfs_source_tension_class_init (GfsSourceGenericClass * klass)

-- 
Gerris Flow Solver