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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit a516bfb6bf61eb7073d58d0b7dd37d51d5edd1fe
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Wed Jul 6 10:54:14 2005 +1000

    Fix for merging conflict of speck removal stuff
    
    darcs-hash:20050706005414-fbd8f-0807683c4b640f9a66b2768c9213eac88d0c1e49.gz

diff --git a/src/simulation.c b/src/simulation.c
index 09477e2..deaa01c 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -860,7 +860,9 @@ void gfs_simulation_refine (GfsSimulation * sim)
   if (sim->surface) {
     gfs_domain_timer_start (domain, "solid_fractions");
     gfs_domain_init_solid_fractions (domain, sim->surface, TRUE,
-				     (FttCellCleanupFunc) gfs_cell_cleanup, NULL);
+				     (FttCellCleanupFunc) gfs_cell_cleanup, NULL, 
+				     NULL);
+    gfs_domain_remove_specks (domain);
     gfs_domain_match (domain);
     gfs_domain_timer_stop (domain, "solid_fractions");
   }

-- 
Gerris Flow Solver