CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed some unused variables

Browse Source
This commit is contained in:
lambda 2000-06-05 16:59:40 +00:00
parent 46f9edae8e
commit 48db90dcf4
12 changed files with 18 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
parcsr_linear_solvers/par_coarsen.c
View File

@ -167,10 +167,8 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix *A,
int break_var = 1;
int num_data, start_index;
int *recv_vec_starts;
double wall_time;
double wall_time_ip = 0;
double wall_time_bp = 0;
double wall_time_rs = 0;
double sum_time_ip = 0;
double sum_time_bp = 0;
@ -210,7 +208,6 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix *A,
num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
int_buf_data = hypre_CTAlloc(int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
num_sends));
@ -1022,8 +1019,8 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix *A,
hypre_LinkList LoL_tail;
int *lists, *where;
int points_left, new_C;
int new_meas, bumps, top_max;
int new_C;
int new_meas;
int num_left, elmt;
int nabor, nabor_two;
@ -2244,7 +2241,6 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
int col_0, iter;
int num_data, start_index;
int *recv_vec_starts;
#if 0 /* debugging */
char filename[256];
@ -2257,8 +2253,8 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
hypre_LinkList LoL_tail;
int *lists, *where;
int points_left, new_C;
int new_meas, bumps, top_max;
int new_C;
int new_meas;
int num_left;
int nabor, nabor_two, cnt;
@ -2266,7 +2262,6 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
int break_var = 0;
double wall_time;
double wall_time_ip = 0;
double wall_time_bp = 0;
double wall_time_rs = 0;
double sum_time_ip = 0;
double sum_time_bp = 0;
@ -2798,7 +2793,6 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
if (debug_flag == 3) wall_time = time_getWallclockSeconds();
num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
int_buf_data = hypre_CTAlloc(int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
num_sends));

6
parcsr_linear_solvers/par_rap.c
View File

@ -140,12 +140,11 @@ int hypre_BoomerAMGBuildCoarseOperator( hypre_ParCSRMatrix *RT,
int *temp;
int n_coarse;
int n_fine;
int num_cols_offd_Pext = 0;
int ic, i, j, k;
int i1, i2, i3, ii, ns, ne, size, rest;
int index, index2, cnt, cnt_offd, cnt_diag, value;
int cnt, cnt_offd, cnt_diag, value;
int jj1, jj2, jj3, jcol;
int *jj_count, *jj_cnt_diag, *jj_cnt_offd;
@ -153,7 +152,6 @@ int hypre_BoomerAMGBuildCoarseOperator( hypre_ParCSRMatrix *RT,
int jj_row_begining, jj_row_begin_diag, jj_row_begin_offd;
int start_indexing = 0; /* start indexing for RAP_data at 0 */
int num_nz_cols_A;
int count;
int num_procs;
double r_entry;
@ -195,7 +193,6 @@ int hypre_BoomerAMGBuildCoarseOperator( hypre_ParCSRMatrix *RT,
R_diag_i = hypre_CSRMatrixI(R_diag);
R_diag_j = hypre_CSRMatrixJ(R_diag);
n_fine = hypre_ParCSRMatrixGlobalNumRows(A);
n_coarse = hypre_ParCSRMatrixGlobalNumCols(P);
num_nz_cols_A = num_cols_diag_A + num_cols_offd_A;
@ -1637,7 +1634,6 @@ hypre_ExchangeRAPData( hypre_CSRMatrix *RAP_int,
int num_rows;
int num_nonzeros;
int start_index;
int i, j;
int num_procs, my_id;

2
parcsr_linear_solvers/par_relax.c
View File

@ -76,8 +76,6 @@ int hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
int index, start;
int num_procs, my_id, ip, p;
int vec_start, vec_len;
int send_flag = 1;
int recv_flag = 0;
MPI_Status *status;
MPI_Request *requests;

2
parcsr_linear_solvers/par_scaled_matnorm.c
View File

@ -33,10 +33,8 @@ hypre_ParCSRMatrixScaledNorm( hypre_ParCSRMatrix *A, double *scnorm)
int *offd_j = hypre_CSRMatrixJ(offd);
double *offd_data = hypre_CSRMatrixData(offd);
int global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
int global_num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
int *row_starts = hypre_ParCSRMatrixRowStarts(A);
int num_rows = hypre_CSRMatrixNumRows(diag);
int num_cols = hypre_CSRMatrixNumCols(diag);
hypre_ParVector *dinvsqrt;
double *dis_data;

14
parcsr_ls/par_coarsen.c
View File

@ -167,10 +167,8 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix *A,
int break_var = 1;
int num_data, start_index;
int *recv_vec_starts;
double wall_time;
double wall_time_ip = 0;
double wall_time_bp = 0;
double wall_time_rs = 0;
double sum_time_ip = 0;
double sum_time_bp = 0;
@ -210,7 +208,6 @@ hypre_BoomerAMGCoarsen( hypre_ParCSRMatrix *A,
num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
int_buf_data = hypre_CTAlloc(int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
num_sends));
@ -1022,8 +1019,8 @@ hypre_BoomerAMGCoarsenRuge( hypre_ParCSRMatrix *A,
hypre_LinkList LoL_tail;
int *lists, *where;
int points_left, new_C;
int new_meas, bumps, top_max;
int new_C;
int new_meas;
int num_left, elmt;
int nabor, nabor_two;
@ -2244,7 +2241,6 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
int col_0, iter;
int num_data, start_index;
int *recv_vec_starts;
#if 0 /* debugging */
char filename[256];
@ -2257,8 +2253,8 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
hypre_LinkList LoL_tail;
int *lists, *where;
int points_left, new_C;
int new_meas, bumps, top_max;
int new_C;
int new_meas;
int num_left;
int nabor, nabor_two, cnt;
@ -2266,7 +2262,6 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
int break_var = 0;
double wall_time;
double wall_time_ip = 0;
double wall_time_bp = 0;
double wall_time_rs = 0;
double sum_time_ip = 0;
double sum_time_bp = 0;
@ -2798,7 +2793,6 @@ hypre_BoomerAMGCoarsenFalgout( hypre_ParCSRMatrix *A,
if (debug_flag == 3) wall_time = time_getWallclockSeconds();
num_sends = hypre_ParCSRCommPkgNumSends(comm_pkg);
num_recvs = hypre_ParCSRCommPkgNumRecvs(comm_pkg);
recv_vec_starts = hypre_ParCSRCommPkgRecvVecStarts(comm_pkg);
int_buf_data = hypre_CTAlloc(int, hypre_ParCSRCommPkgSendMapStart(comm_pkg,
num_sends));

6
parcsr_ls/par_rap.c
View File

@ -140,12 +140,11 @@ int hypre_BoomerAMGBuildCoarseOperator( hypre_ParCSRMatrix *RT,
int *temp;
int n_coarse;
int n_fine;
int num_cols_offd_Pext = 0;
int ic, i, j, k;
int i1, i2, i3, ii, ns, ne, size, rest;
int index, index2, cnt, cnt_offd, cnt_diag, value;
int cnt, cnt_offd, cnt_diag, value;
int jj1, jj2, jj3, jcol;
int *jj_count, *jj_cnt_diag, *jj_cnt_offd;
@ -153,7 +152,6 @@ int hypre_BoomerAMGBuildCoarseOperator( hypre_ParCSRMatrix *RT,
int jj_row_begining, jj_row_begin_diag, jj_row_begin_offd;
int start_indexing = 0; /* start indexing for RAP_data at 0 */
int num_nz_cols_A;
int count;
int num_procs;
double r_entry;
@ -195,7 +193,6 @@ int hypre_BoomerAMGBuildCoarseOperator( hypre_ParCSRMatrix *RT,
R_diag_i = hypre_CSRMatrixI(R_diag);
R_diag_j = hypre_CSRMatrixJ(R_diag);
n_fine = hypre_ParCSRMatrixGlobalNumRows(A);
n_coarse = hypre_ParCSRMatrixGlobalNumCols(P);
num_nz_cols_A = num_cols_diag_A + num_cols_offd_A;
@ -1637,7 +1634,6 @@ hypre_ExchangeRAPData( hypre_CSRMatrix *RAP_int,
int num_rows;
int num_nonzeros;
int start_index;
int i, j;
int num_procs, my_id;

2
parcsr_ls/par_relax.c
View File

@ -76,8 +76,6 @@ int hypre_BoomerAMGRelax( hypre_ParCSRMatrix *A,
int index, start;
int num_procs, my_id, ip, p;
int vec_start, vec_len;
int send_flag = 1;
int recv_flag = 0;
MPI_Status *status;
MPI_Request *requests;

2
parcsr_ls/par_scaled_matnorm.c
View File

@ -33,10 +33,8 @@ hypre_ParCSRMatrixScaledNorm( hypre_ParCSRMatrix *A, double *scnorm)
int *offd_j = hypre_CSRMatrixJ(offd);
double *offd_data = hypre_CSRMatrixData(offd);
int global_num_rows = hypre_ParCSRMatrixGlobalNumRows(A);
int global_num_cols = hypre_ParCSRMatrixGlobalNumCols(A);
int *row_starts = hypre_ParCSRMatrixRowStarts(A);
int num_rows = hypre_CSRMatrixNumRows(diag);
int num_cols = hypre_CSRMatrixNumCols(diag);
hypre_ParVector *dinvsqrt;
double *dis_data;

7
parcsr_matrix_vector/par_csr_matop.c
View File

@ -87,7 +87,7 @@ hypre_ParCSRMatrix *hypre_ParMatmul( hypre_ParCSRMatrix *A,
int i1, i2, i3;
int jj2, jj3;
int jj_counter, jj_count_diag, jj_count_offd;
int jj_count_diag, jj_count_offd;
int jj_row_begin_diag, jj_row_begin_offd;
int start_indexing = 0; /* start indexing for C_data at 0 */
int count;
@ -140,7 +140,6 @@ hypre_ParCSRMatrix *hypre_ParMatmul( hypre_ParCSRMatrix *A,
* Initialize some stuff.
*-----------------------------------------------------------------------*/
jj_counter = start_indexing;
for (i1 = 0; i1 < n_cols_B; i1++)
{
B_marker[i1] = -1;
@ -553,16 +552,12 @@ hypre_ParCSRMatrixExtractBExt( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A, int
int *diag_j = hypre_CSRMatrixJ(diag);
double *diag_data = hypre_CSRMatrixData(diag);
int num_cols_diag = hypre_CSRMatrixNumCols(diag);
hypre_CSRMatrix *offd = hypre_ParCSRMatrixOffd(B);
int *offd_i = hypre_CSRMatrixI(offd);
int *offd_j = hypre_CSRMatrixJ(offd);
double *offd_data = hypre_CSRMatrixData(offd);
int num_cols_offd = hypre_CSRMatrixNumCols(offd);
int *B_int_i;
int *B_int_j;
double *B_int_data;

15
parcsr_matrix_vector/par_csr_matrix.c
View File

@ -228,8 +228,8 @@ hypre_ParCSRMatrixRead( MPI_Comm comm, char *file_name )
int my_id, i, num_procs;
char new_file_d[80], new_file_o[80], new_file_info[80];
int global_num_rows, global_num_cols, num_cols_offd;
int num_nonzeros_diag, num_nonzeros_offd;
int local_num_rows, local_num_cols;
int num_nonzeros_diag;
int local_num_rows;
int *row_starts;
int *col_starts;
int *col_map_offd;
@ -272,13 +272,11 @@ hypre_ParCSRMatrixRead( MPI_Comm comm, char *file_name )
diag = hypre_CSRMatrixRead(new_file_d);
local_num_rows = hypre_CSRMatrixNumRows(diag);
local_num_cols = hypre_CSRMatrixNumCols(diag);
num_nonzeros_diag = hypre_CSRMatrixNumNonzeros(diag);
if (num_cols_offd)
{
offd = hypre_CSRMatrixRead(new_file_o);
num_nonzeros_offd = hypre_CSRMatrixNumNonzeros(offd);
}
else
offd = hypre_CSRMatrixCreate(local_num_rows,0,0);
@ -454,7 +452,7 @@ hypre_ParCSRMatrixGetRow( hypre_ParCSRMatrix *mat,
/* Copy from dual sequential matrices into buffer */
{
double *vworkA, *vworkB, *v_p;
int i, ierr, *cworkA, *cworkB,
int i, ierr=0, *cworkA, *cworkB,
cstart = hypre_ParCSRMatrixFirstColDiag(mat);
int nztot, nzA, nzB, lrow=row-row_start;
int *cmap, *idx_p;
@ -567,9 +565,6 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm comm, hypre_CSRMatrix *A,
MPI_Status *status, status0;
MPI_Datatype *csr_matrix_datatypes;
hypre_CSRMatrix *diag;
hypre_CSRMatrix *offd;
hypre_ParCSRMatrix *par_matrix;
int first_col_diag;
@ -662,12 +657,8 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm comm, hypre_CSRMatrix *A,
first_col_diag = col_starts[my_id];
last_col_diag = col_starts[my_id+1]-1;
diag = hypre_ParCSRMatrixDiag(par_matrix);
offd = hypre_ParCSRMatrixOffd(par_matrix);
GenerateDiagAndOffd(local_A, par_matrix, first_col_diag, last_col_diag);
hypre_CSRMatrixDestroy(local_A);
hypre_TFree(local_num_rows);
hypre_TFree(csr_matrix_datatypes);

7
parcsr_mv/par_csr_matop.c
View File

@ -87,7 +87,7 @@ hypre_ParCSRMatrix *hypre_ParMatmul( hypre_ParCSRMatrix *A,
int i1, i2, i3;
int jj2, jj3;
int jj_counter, jj_count_diag, jj_count_offd;
int jj_count_diag, jj_count_offd;
int jj_row_begin_diag, jj_row_begin_offd;
int start_indexing = 0; /* start indexing for C_data at 0 */
int count;
@ -140,7 +140,6 @@ hypre_ParCSRMatrix *hypre_ParMatmul( hypre_ParCSRMatrix *A,
* Initialize some stuff.
*-----------------------------------------------------------------------*/
jj_counter = start_indexing;
for (i1 = 0; i1 < n_cols_B; i1++)
{
B_marker[i1] = -1;
@ -553,16 +552,12 @@ hypre_ParCSRMatrixExtractBExt( hypre_ParCSRMatrix *B, hypre_ParCSRMatrix *A, int
int *diag_j = hypre_CSRMatrixJ(diag);
double *diag_data = hypre_CSRMatrixData(diag);
int num_cols_diag = hypre_CSRMatrixNumCols(diag);
hypre_CSRMatrix *offd = hypre_ParCSRMatrixOffd(B);
int *offd_i = hypre_CSRMatrixI(offd);
int *offd_j = hypre_CSRMatrixJ(offd);
double *offd_data = hypre_CSRMatrixData(offd);
int num_cols_offd = hypre_CSRMatrixNumCols(offd);
int *B_int_i;
int *B_int_j;
double *B_int_data;

15
parcsr_mv/par_csr_matrix.c
View File

@ -228,8 +228,8 @@ hypre_ParCSRMatrixRead( MPI_Comm comm, char *file_name )
int my_id, i, num_procs;
char new_file_d[80], new_file_o[80], new_file_info[80];
int global_num_rows, global_num_cols, num_cols_offd;
int num_nonzeros_diag, num_nonzeros_offd;
int local_num_rows, local_num_cols;
int num_nonzeros_diag;
int local_num_rows;
int *row_starts;
int *col_starts;
int *col_map_offd;
@ -272,13 +272,11 @@ hypre_ParCSRMatrixRead( MPI_Comm comm, char *file_name )
diag = hypre_CSRMatrixRead(new_file_d);
local_num_rows = hypre_CSRMatrixNumRows(diag);
local_num_cols = hypre_CSRMatrixNumCols(diag);
num_nonzeros_diag = hypre_CSRMatrixNumNonzeros(diag);
if (num_cols_offd)
{
offd = hypre_CSRMatrixRead(new_file_o);
num_nonzeros_offd = hypre_CSRMatrixNumNonzeros(offd);
}
else
offd = hypre_CSRMatrixCreate(local_num_rows,0,0);
@ -454,7 +452,7 @@ hypre_ParCSRMatrixGetRow( hypre_ParCSRMatrix *mat,
/* Copy from dual sequential matrices into buffer */
{
double *vworkA, *vworkB, *v_p;
int i, ierr, *cworkA, *cworkB,
int i, ierr=0, *cworkA, *cworkB,
cstart = hypre_ParCSRMatrixFirstColDiag(mat);
int nztot, nzA, nzB, lrow=row-row_start;
int *cmap, *idx_p;
@ -567,9 +565,6 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm comm, hypre_CSRMatrix *A,
MPI_Status *status, status0;
MPI_Datatype *csr_matrix_datatypes;
hypre_CSRMatrix *diag;
hypre_CSRMatrix *offd;
hypre_ParCSRMatrix *par_matrix;
int first_col_diag;
@ -662,12 +657,8 @@ hypre_CSRMatrixToParCSRMatrix( MPI_Comm comm, hypre_CSRMatrix *A,
first_col_diag = col_starts[my_id];
last_col_diag = col_starts[my_id+1]-1;
diag = hypre_ParCSRMatrixDiag(par_matrix);
offd = hypre_ParCSRMatrixOffd(par_matrix);
GenerateDiagAndOffd(local_A, par_matrix, first_col_diag, last_col_diag);
hypre_CSRMatrixDestroy(local_A);
hypre_TFree(local_num_rows);
hypre_TFree(csr_matrix_datatypes);