Changeset 40386 for trunk

Timestamp:

Apr 9, 2018, 8:46:51 AM (8 years ago)

Author:

eugene

Message:

add option to skip parallel groups when updating database

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/reload_catalogs.c (modified) (1 diff)

trunk/Ohana/src/relphot/include/relphot.h

@@ -294 +294 @@
 int    PARALLEL_SERIAL;
 char  *MANUAL_UNIQUER;
+
+int    SKIP_PARALLEL_GROUPS;
 
 int    PARALLEL_REGIONS_MANUAL;

trunk/Ohana/src/relphot/src/args.c

@@ -134 +134 @@
     PARALLEL = TRUE; // -parallel-serial implies -parallel
     PARALLEL_SERIAL = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  SKIP_PARALLEL_GROUPS = 0;
+  if ((N = get_argument (argc, argv, "-skip-parallel-groups"))) {
+    remove_argument (N, &argc, argv);
+    SKIP_PARALLEL_GROUPS = atoi(argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -549 +555 @@
   PARALLEL_MANUAL = FALSE;
   PARALLEL_SERIAL = FALSE;
+  SKIP_PARALLEL_GROUPS = 0;
 
   HOST_ID = 0;

trunk/Ohana/src/relphot/src/reload_catalogs.c

@@ -180 +180 @@
   for (i = 0; i < Ngroups; i++) {
     // update only a group of unique machines at a time
+    if (i < SKIP_PARALLEL_GROUPS) continue;
     reload_catalog_parallel_group (&groups[i], sky, imageFile);
   }