IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37794


Ignore:
Timestamp:
Jan 11, 2015, 1:10:10 PM (12 years ago)
Author:
eugene
Message:

fix parallel version of loadICRF

Location:
branches/eam_branches/ipp-20140904/Ohana/src/addstar
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/include/loadICRF.h

    r37570 r37794  
    1212char *INPUT;
    1313
    14 AddstarClientOptions args_loadICRF (int argc, char **argv, AddstarClientOptions options);
    15 AddstarClientOptions args_loadICRF_client (int argc, char **argv, AddstarClientOptions options);
     14AddstarClientOptions args_loadICRF (int *argc, char **argv, AddstarClientOptions options);
     15AddstarClientOptions args_loadICRF_client (int *argc, char **argv, AddstarClientOptions options);
    1616
    1717int loadICRF_table (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions *options);

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/args_loadICRF.c

    r37570 r37794  
    55static void help_client (void);
    66
    7 AddstarClientOptions args_loadICRF (int argc, char **argv, AddstarClientOptions options) {
     7AddstarClientOptions args_loadICRF (int *argc, char **argv, AddstarClientOptions options) {
    88 
    99  int N;
    1010
    1111  /* check for help request */
    12   if (get_argument (argc, argv, "-help") ||
    13       get_argument (argc, argv, "-h")) {
     12  if (get_argument (*argc, argv, "-help") ||
     13      get_argument (*argc, argv, "-h")) {
    1414    help ();
    1515  }
    … …  
    2828  HOST_ID = 0;
    2929  PARALLEL = FALSE;
    30   if ((N = get_argument (argc, argv, "-parallel"))) {
     30  if ((N = get_argument (*argc, argv, "-parallel"))) {
    3131    PARALLEL = TRUE;
    32     remove_argument (N, &argc, argv);
     32    remove_argument (N, argc, argv);
    3333  }
    3434  // this is a test mode : rather than launching the remote jobs and waiting for completion,
    3535  // relphot will simply list the remote command and wait for the user to signal completion
    3636  PARALLEL_MANUAL = FALSE;
    37   if ((N = get_argument (argc, argv, "-parallel-manual"))) {
     37  if ((N = get_argument (*argc, argv, "-parallel-manual"))) {
    3838    PARALLEL = TRUE; // -parallel-manual implies -parallel
    3939    PARALLEL_MANUAL = TRUE;
    40     remove_argument (N, &argc, argv);
     40    remove_argument (N, argc, argv);
    4141  }
    4242  // this is a test mode : rather than launching the relphot_client jobs remotely, they are
    4343  // run in serial via 'system'
    4444  PARALLEL_SERIAL = FALSE;
    45   if ((N = get_argument (argc, argv, "-parallel-serial"))) {
     45  if ((N = get_argument (*argc, argv, "-parallel-serial"))) {
    4646    if (PARALLEL_MANUAL) {
    4747      fprintf (stderr, "ERROR: cannot mix -parallel-manual and -parallel-serial\n");
    … …  
    5050    PARALLEL = TRUE; // -parallel-serial implies -parallel
    5151    PARALLEL_SERIAL = TRUE;
    52     remove_argument (N, &argc, argv);
     52    remove_argument (N, argc, argv);
    5353  }
    5454
    5555  /* only add to existing regions */
    5656  options.existing_regions = FALSE;
    57   if ((N = get_argument (argc, argv, "-existing-regions"))) {
     57  if ((N = get_argument (*argc, argv, "-existing-regions"))) {
    5858    options.existing_regions = TRUE;
    59     remove_argument (N, &argc, argv);
     59    remove_argument (N, argc, argv);
    6060  }
    6161  /* replace measurement, don't duplicate (ref/cat only) */
    6262  options.replace = FALSE;
    63   if ((N = get_argument (argc, argv, "-replace"))) {
     63  if ((N = get_argument (*argc, argv, "-replace"))) {
    6464    options.replace = TRUE;
    65     remove_argument (N, &argc, argv);
     65    remove_argument (N, argc, argv);
    6666  }
    6767
    6868  /* extra error messages */
    6969  VERBOSE = FALSE;
    70   if ((N = get_argument (argc, argv, "-v"))) {
     70  if ((N = get_argument (*argc, argv, "-v"))) {
    7171    VERBOSE = TRUE;
    72     remove_argument (N, &argc, argv);
     72    remove_argument (N, argc, argv);
    7373  }
    7474
    … …  
    9090  DUMP = NULL;
    9191
    92   if (argc < 2) {
     92  if (*argc < 2) {
    9393    fprintf (stderr, "USAGE: loadICRF [options] (file) [..more files]\n");
    9494    exit (2);
    … …  
    9797}
    9898
    99 AddstarClientOptions args_loadICRF_client (int argc, char **argv, AddstarClientOptions options) {
     99AddstarClientOptions args_loadICRF_client (int *argc, char **argv, AddstarClientOptions options) {
    100100 
    101101  int N;
    102102
    103103  /* check for help request */
    104   if (get_argument (argc, argv, "-help") ||
    105       get_argument (argc, argv, "-h")) {
     104  if (get_argument (*argc, argv, "-help") ||
     105      get_argument (*argc, argv, "-h")) {
    106106    help ();
    107107  }
    … …  
    112112
    113113  HOST_ID = 0;
    114   if ((N = get_argument (argc, argv, "-hostID"))) {
    115     remove_argument (N, &argc, argv);
     114  if ((N = get_argument (*argc, argv, "-hostID"))) {
     115    remove_argument (N, argc, argv);
    116116    HOST_ID = atoi (argv[N]);
    117     remove_argument (N, &argc, argv);
     117    remove_argument (N, argc, argv);
    118118  }
    119119  if (!HOST_ID) help_client();
    120120
    121121  HOSTDIR = NULL;
    122   if ((N = get_argument (argc, argv, "-hostdir"))) {
    123     remove_argument (N, &argc, argv);
     122  if ((N = get_argument (*argc, argv, "-hostdir"))) {
     123    remove_argument (N, argc, argv);
    124124    HOSTDIR = strcreate (argv[N]);
    125     remove_argument (N, &argc, argv);
     125    remove_argument (N, argc, argv);
    126126  }
    127127  if (!HOSTDIR) help_client();
    128128
    129129  CPT_FILE = NULL;
    130   if ((N = get_argument (argc, argv, "-cpt"))) {
    131     remove_argument (N, &argc, argv);
     130  if ((N = get_argument (*argc, argv, "-cpt"))) {
     131    remove_argument (N, argc, argv);
    132132    CPT_FILE = strcreate (argv[N]);
    133     remove_argument (N, &argc, argv);
     133    remove_argument (N, argc, argv);
    134134  }
    135135  if (!CPT_FILE) help_client();
    136136 
    137137  INPUT = NULL;
    138   if ((N = get_argument (argc, argv, "-input"))) {
    139     remove_argument (N, &argc, argv);
     138  if ((N = get_argument (*argc, argv, "-input"))) {
     139    remove_argument (N, argc, argv);
    140140    INPUT = strcreate (argv[N]);
    141     remove_argument (N, &argc, argv);
     141    remove_argument (N, argc, argv);
    142142  }
    143143  if (!INPUT) help_client();
    … …  
    151151  /* only add to existing objects */
    152152  options.only_match = FALSE;
    153   if ((N = get_argument (argc, argv, "-only-match"))) {
     153  if ((N = get_argument (*argc, argv, "-only-match"))) {
    154154    options.only_match = TRUE;
    155     remove_argument (N, &argc, argv);
     155    remove_argument (N, argc, argv);
    156156  }
    157157  /* replace measurement, don't duplicate (ref/cat only) */
    158158  options.replace = FALSE;
    159   if ((N = get_argument (argc, argv, "-replace"))) {
     159  if ((N = get_argument (*argc, argv, "-replace"))) {
    160160    options.replace = TRUE;
    161     remove_argument (N, &argc, argv);
     161    remove_argument (N, argc, argv);
    162162  }
    163163
    164164  /* extra error messages */
    165165  VERBOSE = FALSE;
    166   if ((N = get_argument (argc, argv, "-v"))) {
     166  if ((N = get_argument (*argc, argv, "-v"))) {
    167167    VERBOSE = TRUE;
    168     remove_argument (N, &argc, argv);
     168    remove_argument (N, argc, argv);
    169169  }
    170170
    … …  
    186186  DUMP = NULL;
    187187
    188   if (argc != 1) {
     188  if (*argc != 1) {
    189189    fprintf (stderr, "USAGE: loadICRF_client -cpt (file) -input (file)\n");
    190190    exit (2);

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF.c

    r37570 r37794  
    1717
    1818  options = ConfigInit (&argc, argv);
    19   options = args_loadICRF (argc, argv, options); // XXX fix args after rest is done
     19  options = args_loadICRF (&argc, argv, options); // XXX fix args after rest is done
    2020
    2121  // load the full sky description table (dvodb must exist)

  • branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadICRF_client.c

    r37650 r37794  
    88  // need to construct these options with args_loadICRF...
    99  options = ConfigInit (&argc, argv);
    10   options = args_loadICRF_client (argc, argv, options);
     10  options = args_loadICRF_client (&argc, argv, options);
    1111
    1212  // client is called with a pointer to the file to be loaded
Note: See TracChangeset for help on using the changeset viewer.