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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 67c2714406b1dd1c974f19b9ee623b8311879811
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Mon Oct 23 15:00:48 2006 +1000

    Added missing variable descriptions
    
    darcs-hash:20061023050048-d4795-dec33ea75ba4c923d48b52b481d6f1b64d585ec8.gz

diff --git a/src/tension.c b/src/tension.c
index 32a9383..47ed774 100644
--- a/src/tension.c
+++ b/src/tension.c
@@ -322,6 +322,11 @@ static void variable_curvature_read (GtsObject ** o, GtsFile * fp)
     return;
   }
   gts_file_next_token (fp);
+  
+  if (GFS_VARIABLE1 (v)->description)
+    g_free (GFS_VARIABLE1 (v)->description);
+  GFS_VARIABLE1 (v)->description = g_strjoin (" ", "Curvature of the interface defined by tracer",
+					      v->f->name, NULL);
 }
 
 static void variable_curvature_write (GtsObject * o, FILE * fp)
@@ -456,10 +461,10 @@ static void curvature_fine_coarse (FttCell * parent, GfsVariable * v)
     GFS_VARIABLE (parent, v->i) = G_MAXDOUBLE;
 }
 
-static void variable_curvature_init (GfsVariableCurvature * v)
+static void variable_curvature_init (GfsVariable * v)
 {
-  GFS_VARIABLE1 (v)->coarse_fine = curvature_coarse_fine;
-  GFS_VARIABLE1 (v)->fine_coarse = curvature_fine_coarse;
+  v->coarse_fine = curvature_coarse_fine;
+  v->fine_coarse = curvature_fine_coarse;
 }
 
 GfsVariableClass * gfs_variable_curvature_class (void)
diff --git a/src/variable.c b/src/variable.c
index 59bd022..3e0a5bd 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -265,6 +265,7 @@ static void variable_tracer_init (GfsVariableTracer * v)
   v->advection.flux = gfs_face_advection_flux;
   v->advection.v = GFS_VARIABLE1 (v);
   v->advection.fv = NULL;
+  GFS_VARIABLE1 (v)->description = g_strdup ("Tracer");
 }
 
 GfsVariableClass * gfs_variable_tracer_class (void)
@@ -312,6 +313,11 @@ static void variable_residual_class_init (GfsEventClass * klass)
   klass->event = variable_residual_event;
 }
 
+static void variable_residual_init (GfsVariable * v)
+{
+  v->description = g_strdup ("Residual of the Poisson equation");
+}
+
 GfsVariableClass * gfs_variable_residual_class (void)
 {
   static GfsVariableClass * klass = NULL;
@@ -322,7 +328,7 @@ GfsVariableClass * gfs_variable_residual_class (void)
       sizeof (GfsVariable),
       sizeof (GfsVariableClass),
       (GtsObjectClassInitFunc) variable_residual_class_init,
-      (GtsObjectInitFunc) NULL,
+      (GtsObjectInitFunc) variable_residual_init,
       (GtsArgSetFunc) NULL,
       (GtsArgGetFunc) NULL
     };
@@ -365,6 +371,10 @@ static void variable_filtered_read (GtsObject ** o, GtsFile * fp)
     return;
   }
   gts_file_next_token (fp);
+
+  if (GFS_VARIABLE1 (v)->description)
+    g_free (GFS_VARIABLE1 (v)->description);
+  GFS_VARIABLE1 (v)->description = g_strjoin (" ", "Variable", v->v->name, "filtered", NULL);
 }
 
 static void variable_filtered_write (GtsObject * o, FILE * fp)

-- 
Gerris Flow Solver