Index: /issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 14643) +++ /issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 14644) @@ -22,40 +22,40 @@ #ifdef _HAVE_CHACO_ //only works if Chaco library has been compiled in. - extern int Using_Main; /* is main routine being called? */ - extern char *PARAMS_FILENAME; /* name of file with parameter updates */ - extern double EIGEN_TOLERANCE; /* tolerance for eigen calculations */ - extern int OUTPUT_ASSIGN; /* whether to write assignment to file */ - extern int DEBUG_MEMORY; /* debug memory allocation and freeing? */ - extern int DEBUG_TRACE; /* trace main execution path */ - extern int DEBUG_PARAMS; /* debug flag for reading parameters */ - extern long RANDOM_SEED; /* seed for random number generators */ - extern int ECHO; /* controls amount of output */ - extern int PROMPT; /* prompt for input or not? */ - extern int PRINT_HEADERS; /* print lines for output sections? */ - extern int MATCH_TYPE; /* matching routine to call */ - extern double input_time; /* times data file input */ - extern double start_time; /* time partitioning starts */ - FILE *params_file; /* file with parameter value updates */ - int global_method; /* global partitioning method */ - int local_method; /* local partitioning method */ - double eigtol; /* tolerance in eigenvector calculation */ - int ndims; /* dimension of recursive partitioning */ - int architecture; /* 0 => hypercube, d => d-dimensional mesh */ - int ndims_tot; /* total number of cube dimensions to divide */ - int mesh_dims[3]; /* dimensions of mesh of processors */ - long seed; /* for random graph mutations */ - int rqi_flag; /* use RQI/Symmlq eigensolver? */ - int vmax; /* if so, how many vertices to coarsen down to? */ - char outassignname[NAME_LENGTH]; /* assignment output file name */ - char outfilename[NAME_LENGTH]; /* name of output file */ - char *outassignptr; /* name or null pointer for output assignment */ - char *outfileptr; /* name or null pointer for output file */ - int nprocs; /* number of processors being divided into */ - double time; /* timing marker */ - int flag; /* return code from input routines */ - double *smalloc(); /* safe version of malloc */ - //double seconds(); /* returns elapsed time in seconds */ - /*int sfree(), interface(), affirm(); - void input_queries(), smalloc_stats(), read_params(), clear_timing();*/ + extern int Using_Main; /* is main routine being called? */ + extern char *PARAMS_FILENAME; /* name of file with parameter updates */ + extern double EIGEN_TOLERANCE; /* tolerance for eigen calculations */ + extern int OUTPUT_ASSIGN; /* whether to write assignment to file */ + extern int DEBUG_MEMORY; /* debug memory allocation and freeing? */ + extern int DEBUG_TRACE; /* trace main execution path */ + extern int DEBUG_PARAMS; /* debug flag for reading parameters */ + extern long RANDOM_SEED; /* seed for random number generators */ + extern int ECHO; /* controls amount of output */ + extern int PROMPT; /* prompt for input or not? */ + extern int PRINT_HEADERS; /* print lines for output sections? */ + extern int MATCH_TYPE; /* matching routine to call */ + extern double input_time; /* times data file input */ + extern double start_time; /* time partitioning starts */ + FILE *params_file; /* file with parameter value updates */ + int global_method; /* global partitioning method */ + int local_method; /* local partitioning method */ + double eigtol; /* tolerance in eigenvector calculation */ + int ndims; /* dimension of recursive partitioning */ + int architecture; /* 0 => hypercube, d => d-dimensional mesh */ + int ndims_tot; /* total number of cube dimensions to divide */ + int mesh_dims[3]; /* dimensions of mesh of processors */ + long seed; /* for random graph mutations */ + int rqi_flag; /* use RQI/Symmlq eigensolver? */ + int vmax; /* if so, how many vertices to coarsen down to? */ + char outassignname[NAME_LENGTH]; /* assignment output file name */ + char outfilename[NAME_LENGTH]; /* name of output file */ + char *outassignptr; /* name or null pointer for output assignment */ + char *outfileptr; /* name or null pointer for output file */ + int nprocs; /* number of processors being divided into */ + double time; /* timing marker */ + int flag; /* return code from input routines */ + double *smalloc(); /* safe version of malloc */ + //double seconds(); /* returns elapsed time in seconds */ + /*int sfree(), interface(), affirm(); + void input_queries() , smalloc_stats(), read_params(), clear_timing(); */ int i,tvwgt; @@ -74,6 +74,5 @@ params_file = fopen(PARAMS_FILENAME, "r"); if (params_file == NULL && DEBUG_PARAMS > 1) { - printf("Parameter file `%s' not found; using default parameters.\n", - PARAMS_FILENAME); + printf("Parameter file `%s' not found; using default parameters.\n",PARAMS_FILENAME); } @@ -100,6 +99,5 @@ if ((int)options[OPT_VWGTS] && vwgts) { - printf("%s -- Applying weights for %d vertices.\n", - __FUNCT__,nvtxs); + printf("%s -- Applying weights for %d vertices.\n",__FUNCT__,nvtxs); tvwgt = 0; for (i=0; i