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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 67c58dc5c5a67bf791384196b8933aa6b6ed8377
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Oct 3 06:48:45 2007 +1000

    Miscellaneous doc/comments fixes
    
    darcs-hash:20071002204845-d4795-171f668fa3afec199ab1d1a83516413a77f0c5b7.gz

diff --git a/THANKS b/THANKS
index 434f0e3..06dc1a3 100644
--- a/THANKS
+++ b/THANKS
@@ -8,3 +8,4 @@ Frank Griessbaum
 Ben Moat
 Vladimir Kolobov
 Philip Rubini
+Geordie McBain
diff --git a/doc/examples/rt/rt.gfs b/doc/examples/rt/rt.gfs
index ddfc629..4b8ef7d 100644
--- a/doc/examples/rt/rt.gfs
+++ b/doc/examples/rt/rt.gfs
@@ -45,7 +45,7 @@
   # The tracer T is used to track both phases
   VariableTracerVOF {} T
  
-  # The initial sinusoidal interface (translated by -0.5 along the y-axis)
+  # The initial sinusoidal interface (translated by 0.5 along the y-axis)
   InitFraction {} T (0.05*cos (2.*M_PI*x) + y) { ty = 0.5 }
 
   AdaptVorticity { istep = 1 } { maxlevel = 7 cmax = 2e-2 }
diff --git a/doc/examples/tangaroa/tangaroa.gfs b/doc/examples/tangaroa/tangaroa.gfs
index 3b8f76c..4902ace 100644
--- a/doc/examples/tangaroa/tangaroa.gfs
+++ b/doc/examples/tangaroa/tangaroa.gfs
@@ -38,7 +38,7 @@
   OutputProjectionStats { istep = 1 } stderr
 
   # Store in SU the integral over time of U
-  # At the end of the simulation U/(Total integration time) = U/1.
+  # At the end of the simulation SU/(Total integration time) = SU/1.
   # is the mean velocity
   EventSum { start = 1 istep = 1 } U SU
   EventSum { start = 1 istep = 1 } V SV
diff --git a/src/fluid.h b/src/fluid.h
index bc1f09c..7c63d1b 100644
--- a/src/fluid.h
+++ b/src/fluid.h
@@ -149,10 +149,6 @@ gdouble               gfs_cell_dirichlet_gradient_flux (FttCell * cell,
 gdouble               gfs_cell_dirichlet_value         (FttCell * cell,
 							GfsVariable * v,
 							gint max_level);
-void                  gfs_face_gradient_flux_centered(const FttCellFace * face,
-						      GfsGradient * g,
-						      guint v,
-						      gint max_level);
 
 void                  gfs_normal_divergence          (FttCell * cell,
 						      GfsVariable * v);
diff --git a/src/vof.c b/src/vof.c
index f8a2dd5..8fced95 100644
--- a/src/vof.c
+++ b/src/vof.c
@@ -1181,7 +1181,7 @@ static void vof_face_value (FttCellFace * face, VofParms * p)
     g_assert_not_reached ();
   }
 }
-  
+
 static void vof_flux (FttCellFace * face, VofParms * p)
 {
   gdouble un = GFS_FACE_NORMAL_VELOCITY (face)*p->par->dt/ftt_cell_size (face->cell);
@@ -2018,7 +2018,7 @@ gdouble gfs_height_curvature (FttCell * cell, GfsVariableTracerVOF * t, gdouble
       return kappa;
 
   /* Could not compute curvature from the simple algorithm along any direction:
-   * Try circle fitting of the collected interface positions */
+   * Try parabola fitting of the collected interface positions */
 
   if (independent_positions (interface, n) < 3*(FTT_DIMENSION - 1))
     return G_MAXDOUBLE;

-- 
Gerris Flow Solver