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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 0301158767a43b641ae9f75f5666ef85e5e26724
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Nov 29 14:23:49 2005 +1100

    Fix for use of uninitialised heap info in adaptive refinement
    
    darcs-hash:20051129032349-fbd8f-211f39b226973955b12bd483bba217974b83cdc4.gz

diff --git a/src/adaptive.c b/src/adaptive.c
index 78e08f4..7a685df 100644
--- a/src/adaptive.c
+++ b/src/adaptive.c
@@ -839,7 +839,7 @@ static void fill_heaps (FttCell * cell, AdaptParams * p)
     if (level < maxlevel (cell, p->sim))
       GFS_DOUBLE_TO_POINTER (GFS_VARIABLE (cell, p->hcoarsev->i)) = 
 	gts_eheap_insert_with_key (p->hcoarse, cell, - CELL_COST (cell));
-    if (parent && GFS_VARIABLE (parent, p->hfinev->i) == 0. && !GFS_IS_MIXED (parent) && 
+    if (parent && !GFS_IS_MIXED (parent) && GFS_VARIABLE (parent, p->hfinev->i) == 0. &&
 	level > minlevel (parent, p->sim))
       GFS_DOUBLE_TO_POINTER (GFS_VARIABLE (parent, p->hfinev->i)) = 
 	gts_eheap_insert_with_key (p->hfine, parent, CELL_COST (parent));

-- 
Gerris Flow Solver