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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 7a4dee7decbde03ac3580727aaa43a58a7891958
Author: Stephane Popinet <popinet at users.sourceforge.net>
Date:   Mon Nov 1 10:03:11 2004 +1100

    Changed "temporary" to "permanent" for GfsVariable (gerris--mainline--0.7--patch-12)
    
    gerris--mainline--0.7--patch-12
    Keywords: temporary
    
    permanent is a pointer to the permanent variable stored in this
    temporary variable.
    
    darcs-hash:20041031230311-aabb8-5f0818b3204d84957a21c24aa3db2824ae39dc5b.gz

diff --git a/src/fluid.c b/src/fluid.c
index d96268f..346b0d4 100644
--- a/src/fluid.c
+++ b/src/fluid.c
@@ -2072,7 +2072,7 @@ GfsVariableClass * gfs_variable_class (void)
  */
 GfsVariable * gfs_variable_new (GfsVariableClass * klass,
 				GtsObject * parent,
-				const gchar * name, 
+				const gchar * name,
 				gboolean centered,
 				guint i)
 {
@@ -2084,6 +2084,7 @@ GfsVariable * gfs_variable_new (GfsVariableClass * klass,
   v->i = i;
   v->centered = centered;
   v->p = parent;
+  v->permanent = v;
 
   return v;
 }
diff --git a/src/fluid.h b/src/fluid.h
index e972c99..f857254 100644
--- a/src/fluid.h
+++ b/src/fluid.h
@@ -104,12 +104,12 @@ struct _GfsVariable {
   /*< public >*/
   guint i;
   gchar * name;
-  gboolean centered, temporary;
+  gboolean centered;
   GfsVariableDerivedFunc derived;
   GfsVariableFineCoarseFunc fine_coarse;
   GtsContainer * sources;
   GfsSurfaceGenericBc * surface_bc;
-  GfsVariable * next;
+  GfsVariable * next, * permanent;
   GtsObject * p;
 };
 
diff --git a/src/init.c b/src/init.c
index 934f3fb..bbb971e 100644
--- a/src/init.c
+++ b/src/init.c
@@ -159,23 +159,23 @@ void gfs_init (int * argc, char *** argv)
 
   /* Initialize permanent variables */
   gfs_div = v = gfs_variable_new (gfs_variable_class (), NULL, NULL, FALSE, i++);
-  v->temporary = TRUE;
+  v->permanent = NULL;
   g_assert (v->i == GFS_DIV);
   gfs_dp = v = v->next = gfs_variable_new (gfs_variable_class (), NULL, NULL, TRUE, i++);
-  v->temporary = TRUE;
+  v->permanent = NULL;
   g_assert (v->i  == GFS_DP);
   gfs_res = v = v->next = gfs_variable_new (gfs_variable_class (), NULL, NULL, FALSE, i++);
-  v->temporary = TRUE;
+  v->permanent = NULL;
   g_assert (v->i == GFS_RES);
   gfs_gx = v = v->next = gfs_variable_new (gfs_variable_class (), NULL, NULL, FALSE, i++);
-  v->temporary = TRUE;
+  v->permanent = NULL;
   g_assert (v->i  == GFS_GX);
   gfs_gy = v = v->next = gfs_variable_new (gfs_variable_class (), NULL, NULL, FALSE, i++);
-  v->temporary = TRUE;
+  v->permanent = NULL;
   g_assert (v->i  == GFS_GY);
 #if (!FTT_2D)
   gfs_gz = v = v->next = gfs_variable_new (gfs_variable_class (), NULL, NULL, FALSE, i++);
-  v->temporary = TRUE;
+  v->permanent = NULL;
   g_assert (v->i  == GFS_GZ);
 #endif /* FTT_3D */
   gfs_centered_variables = gfs_p = v = v->next = 

-- 
Gerris Flow Solver