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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 80e910a3bc04dc78d39106d7e5c628dcf2cc56d5
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jun 19 10:22:01 2009 +1000

    New 'keep' option for gfsjoin2D
    
    darcs-hash:20090619002201-d4795-f2b0305bb9dd52a1a37def8a167662d91a630089.gz

diff --git a/tools/gfsjoin2.c b/tools/gfsjoin2.c
index 230dfc3..12bbabc 100644
--- a/tools/gfsjoin2.c
+++ b/tools/gfsjoin2.c
@@ -36,12 +36,14 @@ static void add_box (GfsBox * box, GfsSimulation * sim)
   gts_container_add (GTS_CONTAINER (sim), GTS_CONTAINEE (box));
 }
 
-static void hash_id (GfsBox * box, GHashTable * hash)
+static void add_id (GfsBox * box, GPtrArray * ids)
 {
-  g_hash_table_insert (hash, &box->id, box);
+  if (box->id > ids->len)
+    g_ptr_array_set_size (ids, box->id);
+  g_ptr_array_index (ids, box->id - 1) = box;
 }
 
-static void convert_boundary_mpi_into_edges (GfsBox * box, GHashTable * hash)
+static void convert_boundary_mpi_into_edges (GfsBox * box, GPtrArray * ids)
 {
 #ifdef HAVE_MPI
   FttDirection d;
@@ -54,31 +56,28 @@ static void convert_boundary_mpi_into_edges (GfsBox * box, GHashTable * hash)
 		 "gfsjoin: id < 0, you maybe trying to join old parallel simulation files\n");
 	exit (1);
       }
-      GfsBox * nbox = g_hash_table_lookup (hash, &b->id);
-      if (!nbox) {
-	fprintf (stderr, "gfsjoin: inconsistent MPI boundary: pid = %d, id = %d\n",
-		 b->process, b->id);
-	exit (1);
-      }
-      if (nbox->pid != b->process) {
-	fprintf (stderr, "gfsjoin: inconsistent MPI boundary: pid = %d, nbox->pid = %d\n",
-		 b->process, nbox->pid);
-	exit (1);
-      }
-      if (!GFS_IS_BOUNDARY_MPI (nbox->neighbor[FTT_OPPOSITE_DIRECTION (d)])) {
-	fprintf (stderr, "gfsjoin: inconsistent MPI boundary: nbox[%d] is not an MPI boundary\n",
-		 FTT_OPPOSITE_DIRECTION (d));
-	exit (1);
+      GfsBox * nbox = g_ptr_array_index (ids, b->id - 1);
+      if (nbox) {
+	if (nbox->pid != b->process) {
+	  fprintf (stderr, "gfsjoin: inconsistent MPI boundary: pid = %d, nbox->pid = %d\n",
+		   b->process, nbox->pid);
+	  exit (1);
+	}
+	if (!GFS_IS_BOUNDARY_MPI (nbox->neighbor[FTT_OPPOSITE_DIRECTION (d)])) {
+	  fprintf (stderr, "gfsjoin: inconsistent MPI boundary: nbox[%d] is not an MPI boundary\n",
+		   FTT_OPPOSITE_DIRECTION (d));
+	  exit (1);
+	}
+	GfsBoundaryMpi * nb = GFS_BOUNDARY_MPI (nbox->neighbor[FTT_OPPOSITE_DIRECTION (d)]);
+	if (box->pid != nb->process || box->id != nb->id) {
+	  fprintf (stderr, "gfsjoin: inconsistent MPI boundary\n"
+		   "box->pid != nb->process || box->id != nb->id\n");
+	  exit (1);
+	}
+	gts_object_destroy (GTS_OBJECT (b));
+	gts_object_destroy (GTS_OBJECT (nb));
+	gfs_gedge_new (gfs_gedge_class (), box, nbox, d);
       }
-      GfsBoundaryMpi * nb = GFS_BOUNDARY_MPI (nbox->neighbor[FTT_OPPOSITE_DIRECTION (d)]);
-      if (box->pid != nb->process || box->id != nb->id) {
-	fprintf (stderr, "gfsjoin: inconsistent MPI boundary\n"
-		 "box->pid != nb->process || box->id != nb->id\n");
-	exit (1);
-      }
-      gts_object_destroy (GTS_OBJECT (b));
-      gts_object_destroy (GTS_OBJECT (nb));
-      gfs_gedge_new (gfs_gedge_class (), box, nbox, d);
     }
 #endif /* HAVE_MPI */
 }
@@ -86,7 +85,7 @@ static void convert_boundary_mpi_into_edges (GfsBox * box, GHashTable * hash)
 int main (int argc, char * argv[])
 {
   int c = 0;
-  gboolean verbose = FALSE;
+  gboolean verbose = FALSE, keep = FALSE;
 
   gfs_init (&argc, &argv);
 
@@ -94,18 +93,22 @@ int main (int argc, char * argv[])
   while (c != EOF) {
 #ifdef HAVE_GETOPT_LONG
     static struct option long_options[] = {
+      {"keep", no_argument, NULL, 'k'},
       {"help", no_argument, NULL, 'h'},
       {"verbose", no_argument, NULL, 'v'},
       { NULL }
     };
     int option_index = 0;
     switch ((c = getopt_long (argc, argv, 
-			      "hv",
+			      "hvk",
 			      long_options, &option_index))) {
 #else /* not HAVE_GETOPT_LONG */
     switch ((c = getopt (argc, argv, 
-			 "hv"))) {
+			 "hvk"))) {
 #endif /* not HAVE_GETOPT_LONG */
+    case 'k': /* keep */
+      keep = TRUE;
+      break;
     case 'v': /* verbose */
       verbose = TRUE;
       break;
@@ -114,6 +117,7 @@ int main (int argc, char * argv[])
 	       "Usage: gfsjoin [OPTION] NAME1 NAME2... > JOINED\n"
 	       "Joins several parallel Gerris simulation files\n"
 	       "\n"
+	       "  -k      --keep        keep MPI boundaries\n"
 	       "  -v      --verbose     display statistics and other info\n"
 	       "  -h      --help        display this help and exit\n"
 	       "\n"
@@ -166,12 +170,16 @@ int main (int argc, char * argv[])
   for (c = 1; c < argc - optind; c++)
     gts_container_foreach (GTS_CONTAINER (sim[c]), (GtsFunc) add_box, sim[0]);
 
-  /* Create hash table for fast linking of ids to GfsBox pointers */
-  GHashTable * hash = g_hash_table_new (g_int_hash, g_int_equal);
-  gts_container_foreach (GTS_CONTAINER (sim[0]), (GtsFunc) hash_id, hash);
+  if (!keep) {
+    /* Create array for fast linking of ids to GfsBox pointers */
+    GPtrArray * ids = g_ptr_array_new ();
+    gts_container_foreach (GTS_CONTAINER (sim[0]), (GtsFunc) add_id, ids);
+    
+    /* Convert GfsBoundaryMpi into graph edges */
+    gts_container_foreach (GTS_CONTAINER (sim[0]), (GtsFunc) convert_boundary_mpi_into_edges, ids);
 
-  /* Convert GfsBoundaryMpi into graph edges */
-  gts_container_foreach (GTS_CONTAINER (sim[0]), (GtsFunc) convert_boundary_mpi_into_edges, hash);
+    g_ptr_array_free (ids, TRUE);
+  }
 
   gfs_simulation_write (sim[0], -1, stdout);
 

-- 
Gerris Flow Solver