[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:53:56 UTC 2009
The following commit has been merged in the upstream branch:
commit e9a07355ab0196a1953915c11caf82b8d60d3b01
Author: Stephane Popinet <popinet at users.sf.net>
Date: Tue Jan 30 14:59:30 2007 +1100
Removed obsolete AdaptNotBox stuff
darcs-hash:20070130035930-d4795-3a46336ddbc9bded3df2cd5685350e2769b4bd42.gz
diff --git a/src/adaptive.c b/src/adaptive.c
index 7696961..42aa371 100644
--- a/src/adaptive.c
+++ b/src/adaptive.c
@@ -590,89 +590,6 @@ GfsEventClass * gfs_adapt_curvature_class (void)
return klass;
}
-/* GfsAdaptNotBox: Object */
-
-static gboolean gfs_adapt_not_box_event (GfsEvent * event,
- GfsSimulation * sim)
-{
- if ((* GFS_EVENT_CLASS (GTS_OBJECT_CLASS (gfs_adapt_not_box_class ())->parent_class)->event) (event, sim)) {
- GfsAdaptNotBox * a = GFS_ADAPT_NOT_BOX (event);
-
- if (a->box && a->box->root) {
- FttVector p;
- gdouble size;
-
- ftt_cell_pos (a->box->root, &p);
- size = ftt_cell_size (a->box->root)/2.;
- a->p1.x = p.x - size; a->p2.x = p.x + size;
- a->p1.y = p.y - size; a->p2.y = p.y + size;
- a->p1.z = p.z - size; a->p2.z = p.z + size;
- return TRUE;
- }
- else
- gts_object_destroy (GTS_OBJECT (event));
- }
- return FALSE;
-}
-
-static void gfs_adapt_not_box_class_init (GfsEventClass * klass)
-{
- GFS_EVENT_CLASS (klass)->event = gfs_adapt_not_box_event;
-}
-
-static gdouble cost_not_box (FttCell * cell, GfsAdaptNotBox * a)
-{
- FttVector p;
-
- ftt_cell_pos (cell, &p);
- if (p.x < a->p1.x || p.x > a->p2.x ||
- p.y < a->p1.y || p.y > a->p2.y ||
- p.z < a->p1.z || p.z > a->p2.z)
- return 0.;
- return -G_MAXDOUBLE;
-}
-
-static void gfs_adapt_not_box_init (GfsAdaptNotBox * object)
-{
- GFS_ADAPT (object)->cost = (GtsKeyFunc) cost_not_box;
-}
-
-GfsEventClass * gfs_adapt_not_box_class (void)
-{
- static GfsEventClass * klass = NULL;
-
- if (klass == NULL) {
- GtsObjectClassInfo gfs_adapt_not_box_info = {
- "GfsAdaptNotBox",
- sizeof (GfsAdaptNotBox),
- sizeof (GfsEventClass),
- (GtsObjectClassInitFunc) gfs_adapt_not_box_class_init,
- (GtsObjectInitFunc) gfs_adapt_not_box_init,
- (GtsArgSetFunc) NULL,
- (GtsArgGetFunc) NULL
- };
- klass = gts_object_class_new (GTS_OBJECT_CLASS (gfs_adapt_class ()),
- &gfs_adapt_not_box_info);
- }
-
- return klass;
-}
-
-GfsAdaptNotBox * gfs_adapt_not_box_new (GfsEventClass * klass,
- GfsBox * box)
-{
- GfsAdaptNotBox * a;
-
- g_return_val_if_fail (klass != NULL, NULL);
- g_return_val_if_fail (box != NULL, NULL);
-
- a = GFS_ADAPT_NOT_BOX (gts_object_new (GTS_OBJECT_CLASS
- (gfs_adapt_not_box_class ())));
- a->box = box;
- gfs_event_set (GFS_EVENT (a), -1., -1., -1., -1, -1, 1);
- return a;
-}
-
#define CELL_COST(cell) (GFS_VARIABLE (cell, p->costv->i))
#define CELL_HCOARSE(c) (GFS_DOUBLE_TO_POINTER (GFS_VARIABLE (c, p->hcoarsev->i)))
#define CELL_HFINE(c) (GFS_DOUBLE_TO_POINTER (GFS_VARIABLE (c, p->hfinev->i)))
diff --git a/src/adaptive.h b/src/adaptive.h
index b2ba02d..e42b6c7 100644
--- a/src/adaptive.h
+++ b/src/adaptive.h
@@ -135,29 +135,6 @@ GfsEventClass * gfs_adapt_gradient_class (void);
GfsEventClass * gfs_adapt_curvature_class (void);
-/* GfsAdaptNotBox: Header */
-
-typedef struct _GfsAdaptNotBox GfsAdaptNotBox;
-
-struct _GfsAdaptNotBox {
- /*< private >*/
- GfsAdapt parent;
- FttVector p1, p2;
-
- /*< public >*/
- GfsBox * box;
-};
-
-#define GFS_ADAPT_NOT_BOX(obj) GTS_OBJECT_CAST (obj,\
- GfsAdaptNotBox,\
- gfs_adapt_not_box_class ())
-#define GFS_IS_ADAPT_NOT_BOX(obj) (gts_object_is_from_class (obj,\
- gfs_adapt_not_box_class ()))
-
-GfsEventClass * gfs_adapt_not_box_class (void);
-GfsAdaptNotBox * gfs_adapt_not_box_new (GfsEventClass * klass,
- GfsBox * box);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/src/boundary.c b/src/boundary.c
index cbaaed9..10d83b2 100644
--- a/src/boundary.c
+++ b/src/boundary.c
@@ -1557,72 +1557,6 @@ GfsBox * gfs_box_new (GfsBoxClass * klass)
return object;
}
-/* GfsBoxNotAdapt: Object: fixme: deprecated */
-
-static void gfs_box_not_adapt_read (GtsObject ** o, GtsFile * fp)
-{
- GfsSimulation * sim;
- GfsAdaptNotBox * a;
- GfsBoxNotAdapt * b = GFS_BOX_NOT_ADAPT (*o);
- GfsDomain * domain = gfs_box_domain (GFS_BOX (b));
-
- g_assert (GFS_IS_SIMULATION (domain));
- sim = GFS_SIMULATION (domain);
-
- g_assert (gts_container_size (GTS_CONTAINER (b->c)) == 0);
- a = gfs_adapt_not_box_new (gfs_adapt_not_box_class (), GFS_BOX (b));
- gts_container_add (GTS_CONTAINER (b->c), GTS_CONTAINEE (a));
- gts_container_add (GTS_CONTAINER (sim->adapts), GTS_CONTAINEE (a));
-
- g_warning ("GfsBoxNotAdapt is deprecated you should use functions in GfsAdapt instead");
-}
-
-static void gfs_box_not_adapt_destroy (GtsObject * object)
-{
- GfsBoxNotAdapt * b = GFS_BOX_NOT_ADAPT (object);
-
- gts_container_foreach (GTS_CONTAINER (b->c),
- (GtsFunc) gts_object_destroy, NULL);
- gts_object_destroy (GTS_OBJECT (b->c));
-
- (* GTS_OBJECT_CLASS (gfs_box_not_adapt_class ())->parent_class->destroy)
- (object);
-}
-
-static void gfs_box_not_adapt_class_init (GfsBoxClass * klass)
-{
- GTS_OBJECT_CLASS (klass)->read = gfs_box_not_adapt_read;
- GTS_OBJECT_CLASS (klass)->destroy = gfs_box_not_adapt_destroy;
-}
-
-static void gfs_box_not_adapt_init (GfsBoxNotAdapt * object)
-{
- object->c = GTS_SLIST_CONTAINER (gts_container_new
- (GTS_CONTAINER_CLASS
- (gts_slist_container_class ())));
-}
-
-GfsBoxClass * gfs_box_not_adapt_class (void)
-{
- static GfsBoxClass * klass = NULL;
-
- if (klass == NULL) {
- GtsObjectClassInfo gfs_box_not_adapt_info = {
- "GfsBoxNotAdapt",
- sizeof (GfsBoxNotAdapt),
- sizeof (GfsBoxClass),
- (GtsObjectClassInitFunc) gfs_box_not_adapt_class_init,
- (GtsObjectInitFunc) gfs_box_not_adapt_init,
- (GtsArgSetFunc) NULL,
- (GtsArgGetFunc) NULL
- };
- klass = gts_object_class_new (GTS_OBJECT_CLASS (gfs_box_class ()),
- &gfs_box_not_adapt_info);
- }
-
- return klass;
-}
-
static void box_set_pos (GfsBox * box, FttVector * pos,
GHashTable * set,
FttDirection dold)
diff --git a/src/boundary.h b/src/boundary.h
index 18b5520..1fd16f1 100644
--- a/src/boundary.h
+++ b/src/boundary.h
@@ -318,24 +318,6 @@ GfsDomain * gfs_box_domain (GfsBox * box)
return d;
}
-/* GfsBoxNotAdapt: Header */
-
-typedef struct _GfsBoxNotAdapt GfsBoxNotAdapt;
-
-struct _GfsBoxNotAdapt {
- /*< private >*/
- GfsBox parent;
- GtsSListContainer * c;
-};
-
-#define GFS_BOX_NOT_ADAPT(obj) GTS_OBJECT_CAST (obj,\
- GfsBoxNotAdapt,\
- gfs_box_not_adapt_class ())
-#define GFS_IS_BOX_NOT_ADAPT(obj) (gts_object_is_from_class (obj,\
- gfs_box_not_adapt_class ()))
-
-GfsBoxClass * gfs_box_not_adapt_class (void);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list