[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:53:07 UTC 2009
The following commit has been merged in the upstream branch:
commit 6d6664b249035c22c107714bfee6406f062892a4
Author: Stephane Popinet <popinet at users.sf.net>
Date: Wed Mar 8 14:26:27 2006 +1100
Removed obsolete "GtsInterface" stuff
darcs-hash:20060308032627-d4795-2a9cc9ab21dd2777d1ae73632da47d8a9bcf5b92.gz
diff --git a/src/simulation.c b/src/simulation.c
index 76f905f..c31266c 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -148,13 +148,6 @@ static void simulation_write (GtsObject * object, FILE * fp)
gts_surface_write (sim->surface, fp);
fputs ("}\n", fp);
}
-#if 1
- if (sim->interface) {
- fputs (" GtsInterface { ", fp);
- gts_surface_write (sim->interface, fp);
- fputs ("}\n", fp);
- }
-#endif
fputc ('}', fp);
}
@@ -323,36 +316,6 @@ static void simulation_read (GtsObject ** object, GtsFile * fp)
gts_file_next_token (fp);
}
- /* ------------ GtsInterface ------------ */
- else if (strmatch (fp->token->str, "GtsInterface")) {
- GtsSurface * s;
-
- if (!sim->interface)
- sim->interface = gts_surface_new (gts_surface_class (),
- gts_face_class (),
- gts_edge_class (),
- gts_vertex_normal_class ());
- if ((s = read_surface (fp, sim->interface)) == NULL)
- return;
- sim->interface = s;
- gts_file_next_token (fp);
- }
-
- /* ------------ GtsInterfaceFile ------------ */
- else if (strmatch (fp->token->str, "GtsInterfaceFile")) {
- GtsSurface * s;
-
- if (!sim->interface)
- sim->interface = gts_surface_new (gts_surface_class (),
- gts_face_class (),
- gts_edge_class (),
- gts_vertex_normal_class ());
- if ((s = read_surface_file (fp, sim->interface)) == NULL)
- return;
- sim->interface = s;
- gts_file_next_token (fp);
- }
-
/* ------------ GModule ------------ */
else if (strmatch (fp->token->str, "GModule")) {
gts_file_next_token (fp);
@@ -468,13 +431,6 @@ static void simulation_read (GtsObject ** object, GtsFile * fp)
fp->scope_max--;
gts_file_next_token (fp);
- if (sim->interface) {
- if (sim->itree)
- gts_bb_tree_destroy (sim->itree, TRUE);
- sim->itree = gts_bb_tree_surface (sim->interface);
- if (gts_surface_volume (sim->interface) < 0.)
- sim->i_is_open = TRUE;
- }
sim->refines->items = g_slist_reverse (sim->refines->items);
sim->adapts->items = g_slist_reverse (sim->adapts->items);
sim->events->items = g_slist_reverse (sim->events->items);
@@ -800,10 +756,6 @@ static void gfs_simulation_init (GfsSimulation * object)
object->surface = NULL;
object->output_surface = TRUE;
- object->interface = NULL;
- object->itree = NULL;
- object->i_is_open = FALSE;
-
object->refines = GTS_SLIST_CONTAINER (gts_container_new
(GTS_CONTAINER_CLASS
(gts_slist_container_class ())));
diff --git a/src/simulation.h b/src/simulation.h
index 969d543..cfd172f 100644
--- a/src/simulation.h
+++ b/src/simulation.h
@@ -67,10 +67,6 @@ struct _GfsSimulation {
GtsSurface * surface;
gboolean output_surface;
- GtsSurface * interface;
- GNode * itree;
- gboolean i_is_open;
-
GtsSListContainer * refines;
GtsSListContainer * adapts;
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list