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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 45cea397c61210346791bf411b4eab9174db9c91
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Jul 30 13:23:48 2009 +1000

    Removed obsolete GfsAdaptCurvature
    
    darcs-hash:20090730032348-d4795-9f1ee4d073a6c562f6567b3738c66a671c389800.gz

diff --git a/src/adaptive.c b/src/adaptive.c
index 1e0fc7d..a22415c 100644
--- a/src/adaptive.c
+++ b/src/adaptive.c
@@ -690,49 +690,6 @@ GfsEventClass * gfs_adapt_error_class (void)
   return klass;
 }
 
-/* GfsAdaptCurvature: Object */
-
-static gdouble curvature_cost (FttCell * cell, GfsAdaptGradient * a)
-{
-  FttComponent c;
-  gdouble sum2 = 0;
-  gdouble * lambda;
-
-  lambda = (gdouble *) &GFS_DOMAIN (gfs_object_simulation (a))->lambda;
-  for (c = 0; c < FTT_DIMENSION; c++) {
-    gdouble g = lambda[c]*lambda[c]*gfs_center_curvature (cell, c, a->v->i);
-
-    sum2 += g*g;
-  }
-  return sqrt (sum2);
-}
-
-static void gfs_adapt_curvature_init (GfsAdapt * object)
-{
-  object->cost = (GtsKeyFunc) curvature_cost;
-}
-
-GfsEventClass * gfs_adapt_curvature_class (void)
-{
-  static GfsEventClass * klass = NULL;
-
-  if (klass == NULL) {
-    GtsObjectClassInfo gfs_adapt_curvature_info = {
-      "GfsAdaptCurvature",
-      sizeof (GfsAdaptGradient),
-      sizeof (GfsEventClass),
-      (GtsObjectClassInitFunc) NULL,
-      (GtsObjectInitFunc) gfs_adapt_curvature_init,
-      (GtsArgSetFunc) NULL,
-      (GtsArgGetFunc) NULL
-    };
-    klass = gts_object_class_new (GTS_OBJECT_CLASS (gfs_adapt_gradient_class ()),
-				  &gfs_adapt_curvature_info);
-  }
-
-  return klass;
-}
-
 static void refine_cell_corner (FttCell * cell, GfsDomain * domain)
 {
   if (ftt_refine_corner (cell))
diff --git a/src/adaptive.h b/src/adaptive.h
index 37c270b..4747c22 100644
--- a/src/adaptive.h
+++ b/src/adaptive.h
@@ -150,13 +150,6 @@ struct _GfsAdaptError {
 
 GfsEventClass * gfs_adapt_error_class  (void);
 
-/* GfsAdaptCurvature: Header */
-
-#define GFS_IS_ADAPT_CURVATURE(obj)         (gts_object_is_from_class (obj,\
-						 gfs_adapt_curvature_class ()))
-
-GfsEventClass * gfs_adapt_curvature_class  (void);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/src/init.c b/src/init.c
index 91c0d68..7b59600 100644
--- a/src/init.c
+++ b/src/init.c
@@ -167,7 +167,6 @@ GtsObjectClass ** gfs_classes (void)
       gfs_adapt_function_class (),
       gfs_adapt_gradient_class (),
         gfs_adapt_error_class (),
-        gfs_adapt_curvature_class (),
 
     gfs_event_sum_class (),
       gfs_event_sum_direction_class (),

-- 
Gerris Flow Solver