Removed unused variables in test directory

This commit is contained in:
Rob Falgout 2016-03-08 08:39:57 -08:00
parent c0c288e1f4
commit 3c3d7f874b
5 changed files with 5 additions and 38 deletions

View File

@ -108,7 +108,7 @@ hypre_int main (hypre_int argc, char *argv[])
HYPRE_Int solver_id;
HYPRE_Int maxit, cycle_type, rlx_type, rlx_sweeps, dim;
HYPRE_Real rlx_weight, rlx_omega;
HYPRE_Int amg_coarsen_type, amg_rlx_type, amg_agg_levels, amg_agg_npaths, amg_interp_type, amg_Pmax;
HYPRE_Int amg_coarsen_type, amg_rlx_type, amg_agg_levels, amg_interp_type, amg_Pmax;
HYPRE_Int h1_method, singular_problem, coordinates;
HYPRE_Real tol, theta;
HYPRE_Real rtol;
@ -144,8 +144,8 @@ hypre_int main (hypre_int argc, char *argv[])
/* cycle_type = 1; amg_coarsen_type = 8; amg_agg_levels = 1; amg_rlx_type = 3; */ /* PMIS-1 */
/* cycle_type = 1; amg_coarsen_type = 8; amg_agg_levels = 0; amg_rlx_type = 3; */ /* PMIS-0 */
/* cycle_type = 7; amg_coarsen_type = 6; amg_agg_levels = 0; amg_rlx_type = 6; */ /* Falgout-0 */
amg_interp_type = 6; amg_Pmax = 4; amg_agg_npaths = 1; /* long-range interpolation */
/* amg_interp_type = 0; amg_Pmax = 0; amg_agg_npaths = 1; */ /* standard interpolation */
amg_interp_type = 6; amg_Pmax = 4; /* long-range interpolation */
/* amg_interp_type = 0; amg_Pmax = 0; */ /* standard interpolation */
theta = 0.25;
blockSize = 5;
rtol = 0;
@ -214,11 +214,6 @@ hypre_int main (hypre_int argc, char *argv[])
arg_index++;
amg_agg_levels = atoi(argv[arg_index++]);
}
else if ( strcmp(argv[arg_index], "-aggnp") == 0 )
{
arg_index++;
amg_agg_npaths = atoi(argv[arg_index++]);
}
else if ( strcmp(argv[arg_index], "-itype") == 0 )
{
arg_index++;
@ -310,7 +305,6 @@ hypre_int main (hypre_int argc, char *argv[])
hypre_printf(" -theta <num> : BoomerAMG threshold (0.25) \n");
hypre_printf(" -ctype <num> : BoomerAMG coarsening type \n");
hypre_printf(" -agg <num> : Levels of BoomerAMG agg. coarsening \n");
hypre_printf(" -aggnp <num> : Number of paths in agg. coarsening \n");
hypre_printf(" -amgrlx <num> : BoomerAMG relaxation type \n");
hypre_printf(" -itype <num> : BoomerAMG interpolation type \n");
hypre_printf(" -pmax <num> : BoomerAMG interpolation truncation \n");

View File

@ -1270,7 +1270,6 @@ PrintUsage( char *progname,
hypre_printf(" -b <bx> <by> <bz> : refine and block part(s)\n");
hypre_printf(" -solver <ID> : solver ID (default = 39)\n");
hypre_printf(" -print : print out the system\n");
hypre_printf(" -v <n_pre> <n_post>: SysPFMG and Struct- # of pre and post relax\n");
hypre_printf(" -sym <s> : Struct- symmetric storage (1) or not (0)\n");
hypre_printf("\n");
@ -1325,8 +1324,6 @@ main( hypre_int argc,
HYPRE_Int num_procs, myid;
HYPRE_Int time_index;
HYPRE_Int n_pre, n_post;
HYPRE_Int arg_index, part, box, var, entry, s, i, j, k;
/*-----------------------------------------------------------
@ -1383,9 +1380,6 @@ main( hypre_int argc,
print_system = 0;
n_pre = 1;
n_post = 1;
/*-----------------------------------------------------------
* Parse command line
*-----------------------------------------------------------*/
@ -1453,12 +1447,6 @@ main( hypre_int argc,
arg_index++;
print_system = 1;
}
else if ( strcmp(argv[arg_index], "-v") == 0 )
{
arg_index++;
n_pre = atoi(argv[arg_index++]);
n_post = atoi(argv[arg_index++]);
}
else if ( strcmp(argv[arg_index], "-help") == 0 )
{
PrintUsage(argv[0], myid);

View File

@ -116,7 +116,6 @@ main( hypre_int argc,
HYPRE_Solver pcg_precond=NULL, pcg_precond_gotten;
HYPRE_Int num_procs, myid;
HYPRE_Int num_threads;
HYPRE_Int local_row;
HYPRE_Int *row_sizes;
HYPRE_Int *diag_sizes;
@ -267,7 +266,6 @@ main( hypre_int argc,
hypre_MPI_Comm_size(hypre_MPI_COMM_WORLD, &num_procs );
hypre_MPI_Comm_rank(hypre_MPI_COMM_WORLD, &myid );
num_threads = hypre_NumThreads();
/*
hypre_InitMemoryDebug(myid);
*/

View File

@ -716,13 +716,9 @@ DistributeData( ProblemData global_data,
HYPRE_Int np, pid;
HYPRE_Int pool, part, box, entry, p, q, r, i, d, dmap, sign, size;
HYPRE_Int mod_lower, mod_upper;
Index m, mmap, n, ones, mod_graph;
Index m, mmap, n, mod_graph;
ProblemIndex ilower, iupper, int_ilower, int_iupper;
ones[0]= 1;
ones[1]= 1;
ones[2]= 1;
/* determine first process number in each pool */
pool_procs = hypre_CTAlloc(HYPRE_Int, (data.npools+1));
for (part = 0; part < data.nparts; part++)
@ -1292,7 +1288,6 @@ main( hypre_int argc,
HYPRE_Int time_index;
HYPRE_Int n_pre, n_post;
HYPRE_Int skip;
HYPRE_Int arg_index, part, box, var, entry, s, i, j, k;
@ -1353,8 +1348,6 @@ main( hypre_int argc,
solver_id = 39;
print_system = 0;
skip = 0;
/*-----------------------------------------------------------
* Parse command line
*-----------------------------------------------------------*/
@ -1422,11 +1415,6 @@ main( hypre_int argc,
arg_index++;
print_system = 1;
}
else if ( strcmp(argv[arg_index], "-skip") == 0 )
{
arg_index++;
skip = atoi(argv[arg_index++]);
}
else if ( strcmp(argv[arg_index], "-v") == 0 )
{
arg_index++;

View File

@ -418,10 +418,9 @@ AddValuesVector( hypre_StructGrid *grid,
hypre_IndexRef iupper;
hypre_Box *box;
HYPRE_Real *values;
HYPRE_Int volume,dim;
HYPRE_Int volume;
gridboxes = hypre_StructGridBoxes(grid);
dim = hypre_StructGridNDim(grid);
ib=0;
hypre_ForBoxI(ib, gridboxes)