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

removed unused variables

Browse Source
This commit is contained in:
Ulrike Yang 2016-03-08 09:01:42 -08:00
parent 3c3d7f874b
commit c4c6ba532a
5 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/IJ_mv/IJMatrix_parcsr.c
View File

@ -1868,7 +1868,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix *matrix,
HYPRE_Int num_recvs; HYPRE_Int num_recvs;
HYPRE_Int counter, upper_bound; HYPRE_Int counter, upper_bound;
HYPRE_Int num_real_procs; HYPRE_Int num_real_procs;
HYPRE_Int current_proc, original_proc_indx; HYPRE_Int /*current_proc,*/ original_proc_indx;
HYPRE_Int *row_list=NULL, *row_list_num_elements=NULL; HYPRE_Int *row_list=NULL, *row_list_num_elements=NULL;
HYPRE_Int *a_proc_id=NULL, *orig_order=NULL; HYPRE_Int *a_proc_id=NULL, *orig_order=NULL;
@ -2281,7 +2281,7 @@ hypre_IJMatrixAssembleOffProcValsParCSR( hypre_IJMatrix *matrix,
/* Find the current processor in order, and reset recv_data_ptr to that processor's message */ /* Find the current processor in order, and reset recv_data_ptr to that processor's message */
original_proc_indx = argsort_contact_procs[i]; original_proc_indx = argsort_contact_procs[i];
current_proc = send_proc_obj.id[i]; /*current_proc = send_proc_obj.id[i];*/
indx = recv_starts[original_proc_indx]; indx = recv_starts[original_proc_indx];
recv_data_ptr = (void *) ((char *) send_proc_obj.v_elements + indx*obj_size_bytes); recv_data_ptr = (void *) ((char *) send_proc_obj.v_elements + indx*obj_size_bytes);
@ -2902,7 +2902,7 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix *matrix,
HYPRE_Int *offd_j; HYPRE_Int *offd_j;
HYPRE_Complex *offd_data; HYPRE_Complex *offd_data;
HYPRE_Int first, pstart; HYPRE_Int first, pstart;
HYPRE_Int current_num_elmts; /*HYPRE_Int current_num_elmts;*/
/*HYPRE_Int max_off_proc_elmts;*/ /*HYPRE_Int max_off_proc_elmts;*/
HYPRE_Int off_proc_i_indx; HYPRE_Int off_proc_i_indx;
HYPRE_Int *off_proc_i; HYPRE_Int *off_proc_i;
@ -2965,8 +2965,8 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix *matrix,
aux_matrix = hypre_IJMatrixTranslator(matrix); aux_matrix = hypre_IJMatrixTranslator(matrix);
if (aux_matrix) if (aux_matrix)
{ {
current_num_elmts /*current_num_elmts
= hypre_AuxParCSRMatrixCurrentNumElmts(aux_matrix); = hypre_AuxParCSRMatrixCurrentNumElmts(aux_matrix);*/
off_proc_i_indx = hypre_AuxParCSRMatrixOffProcIIndx(aux_matrix); off_proc_i_indx = hypre_AuxParCSRMatrixOffProcIIndx(aux_matrix);
off_proc_i = hypre_AuxParCSRMatrixOffProcI(aux_matrix); off_proc_i = hypre_AuxParCSRMatrixOffProcI(aux_matrix);
off_proc_j = hypre_AuxParCSRMatrixOffProcJ(aux_matrix); off_proc_j = hypre_AuxParCSRMatrixOffProcJ(aux_matrix);
@ -3196,8 +3196,8 @@ hypre_IJMatrixSetValuesOMPParCSR( hypre_IJMatrix *matrix,
aux_matrix = hypre_IJMatrixTranslator(matrix); aux_matrix = hypre_IJMatrixTranslator(matrix);
if (aux_matrix) if (aux_matrix)
{ {
current_num_elmts /*current_num_elmts
= hypre_AuxParCSRMatrixCurrentNumElmts(aux_matrix); = hypre_AuxParCSRMatrixCurrentNumElmts(aux_matrix);*/
off_proc_i_indx = hypre_AuxParCSRMatrixOffProcIIndx(aux_matrix); off_proc_i_indx = hypre_AuxParCSRMatrixOffProcIIndx(aux_matrix);
off_proc_i = hypre_AuxParCSRMatrixOffProcI(aux_matrix); off_proc_i = hypre_AuxParCSRMatrixOffProcI(aux_matrix);
off_proc_j = hypre_AuxParCSRMatrixOffProcJ(aux_matrix); off_proc_j = hypre_AuxParCSRMatrixOffProcJ(aux_matrix);

4
src/parcsr_block_mv/par_csr_block_matrix.c
View File

@ -700,7 +700,7 @@ hypre_BlockMatvecCommPkgCreate(hypre_ParCSRBlockMatrix *A)
#ifdef HYPRE_NO_GLOBAL_PARTITION #ifdef HYPRE_NO_GLOBAL_PARTITION
HYPRE_Int row_start=0, row_end=0, col_start = 0, col_end = 0; HYPRE_Int col_start = 0, col_end = 0;
HYPRE_Int num_recvs, *recv_procs, *recv_vec_starts; HYPRE_Int num_recvs, *recv_procs, *recv_vec_starts;
HYPRE_Int num_sends, *send_procs, *send_map_starts; HYPRE_Int num_sends, *send_procs, *send_map_starts;
@ -722,8 +722,6 @@ hypre_BlockMatvecCommPkgCreate(hypre_ParCSRBlockMatrix *A)
* get parcsr_A information * get parcsr_A information
*----------------------------------------------------------*/ *----------------------------------------------------------*/
row_start = hypre_ParCSRBlockMatrixFirstRowIndex(A);
row_end = hypre_ParCSRBlockMatrixLastRowIndex(A);
col_start = hypre_ParCSRBlockMatrixFirstColDiag(A); col_start = hypre_ParCSRBlockMatrixFirstColDiag(A);
col_end = hypre_ParCSRBlockMatrixLastColDiag(A); col_end = hypre_ParCSRBlockMatrixLastColDiag(A);

3
src/parcsr_ls/par_amg_solveT.c
View File

@ -348,7 +348,6 @@ hypre_BoomerAMGCycleT( void *amg_vdata,
HYPRE_Int relax_points; HYPRE_Int relax_points;
HYPRE_Real *relax_weight; HYPRE_Real *relax_weight;
HYPRE_Int relax_order;
HYPRE_Int old_version = 0; HYPRE_Int old_version = 0;
@ -379,8 +378,6 @@ hypre_BoomerAMGCycleT( void *amg_vdata,
grid_relax_points = hypre_ParAMGDataGridRelaxPoints(amg_data); grid_relax_points = hypre_ParAMGDataGridRelaxPoints(amg_data);
relax_weight = hypre_ParAMGDataRelaxWeight(amg_data); relax_weight = hypre_ParAMGDataRelaxWeight(amg_data);
relax_order = hypre_ParAMGDataRelaxOrder(amg_data);
cycle_op_count = hypre_ParAMGDataCycleOpCount(amg_data); cycle_op_count = hypre_ParAMGDataCycleOpCount(amg_data);
lev_counter = hypre_CTAlloc(HYPRE_Int, num_levels); lev_counter = hypre_CTAlloc(HYPRE_Int, num_levels);

17
src/parcsr_ls/par_cgc_coarsen.c
View File

@ -81,7 +81,6 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix *S,
HYPRE_Int num_procs, my_id; HYPRE_Int num_procs, my_id;
HYPRE_Int num_sends = 0; HYPRE_Int num_sends = 0;
HYPRE_Int first_col, start; HYPRE_Int first_col, start;
HYPRE_Int col_0, col_n;
hypre_LinkList LoL_head; hypre_LinkList LoL_head;
hypre_LinkList LoL_tail; hypre_LinkList LoL_tail;
@ -213,8 +212,6 @@ hypre_BoomerAMGCoarsenCGCb( hypre_ParCSRMatrix *S,
S_ext_j = hypre_CSRMatrixJ(S_ext); S_ext_j = hypre_CSRMatrixJ(S_ext);
num_nonzeros = S_ext_i[num_cols_offd]; num_nonzeros = S_ext_i[num_cols_offd];
first_col = hypre_ParCSRMatrixFirstColDiag(S); first_col = hypre_ParCSRMatrixFirstColDiag(S);
col_0 = first_col-1;
col_n = col_0+num_variables;
if (measure_type) if (measure_type)
{ {
for (i=0; i < num_nonzeros; i++) for (i=0; i < num_nonzeros; i++)
@ -887,7 +884,7 @@ HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrang
HYPRE_Int num_variables = hypre_CSRMatrixNumRows (S_diag); HYPRE_Int num_variables = hypre_CSRMatrixNumRows (S_diag);
HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols (S_offd); HYPRE_Int num_cols_offd = hypre_CSRMatrixNumCols (S_offd);
HYPRE_Int *col_map_offd = hypre_ParCSRMatrixColMapOffd (S); HYPRE_Int *col_map_offd = hypre_ParCSRMatrixColMapOffd (S);
HYPRE_Int /*pointrange_start,*/ pointrange_end; /*HYPRE_Int pointrange_start, pointrange_end;*/
HYPRE_Int *pointrange,*pointrange_nonlocal,*pointrange_strong=NULL; HYPRE_Int *pointrange,*pointrange_nonlocal,*pointrange_strong=NULL;
HYPRE_Int vertexrange_start,vertexrange_end; HYPRE_Int vertexrange_start,vertexrange_end;
HYPRE_Int *vertexrange_strong= NULL; HYPRE_Int *vertexrange_strong= NULL;
@ -920,8 +917,8 @@ HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrang
hypre_MPI_Request *sendrequest,*recvrequest; hypre_MPI_Request *sendrequest,*recvrequest;
nlocal = vertexrange[1] - vertexrange[0]; nlocal = vertexrange[1] - vertexrange[0];
/*pointrange_start = pointrange[0];*/ /*pointrange_start = pointrange[0];
pointrange_end = pointrange[1]; pointrange_end = pointrange[1]; */
vertexrange_start = vertexrange[0]; vertexrange_start = vertexrange[0];
vertexrange_end = vertexrange[1]; vertexrange_end = vertexrange[1];
sendrequest = hypre_CTAlloc (hypre_MPI_Request,2*(num_sends+num_recvs)); sendrequest = hypre_CTAlloc (hypre_MPI_Request,2*(num_sends+num_recvs));
@ -932,8 +929,8 @@ HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrang
hypre_MPI_Irecv (vertexrange_nonlocal+2*i,2,HYPRE_MPI_INT,recv_procs[i],tag_vertexrange,comm,&recvrequest[2*i+1]); hypre_MPI_Irecv (vertexrange_nonlocal+2*i,2,HYPRE_MPI_INT,recv_procs[i],tag_vertexrange,comm,&recvrequest[2*i+1]);
} }
for (i=0;i<num_sends;i++) { for (i=0;i<num_sends;i++) {
/*int_buf_data[2*i] = pointrange_start;*/ /*int_buf_data[2*i] = pointrange_start;
int_buf_data[2*i+1] = pointrange_end; int_buf_data[2*i+1] = pointrange_end; */
int_buf_data2[2*i] = vertexrange_start; int_buf_data2[2*i] = vertexrange_start;
int_buf_data2[2*i+1] = vertexrange_end; int_buf_data2[2*i+1] = vertexrange_end;
hypre_MPI_Isend (int_buf_data+2*i,2,HYPRE_MPI_INT,send_procs[i],tag_pointrange,comm,&sendrequest[2*i]); hypre_MPI_Isend (int_buf_data+2*i,2,HYPRE_MPI_INT,send_procs[i],tag_pointrange,comm,&sendrequest[2*i]);
@ -945,8 +942,8 @@ HYPRE_Int hypre_AmgCGCGraphAssemble (hypre_ParCSRMatrix *S,HYPRE_Int *vertexrang
} }
#else #else
nlocal = vertexrange[mpirank+1] - vertexrange[mpirank]; nlocal = vertexrange[mpirank+1] - vertexrange[mpirank];
/*pointrange_start = pointrange[mpirank];*/ /*pointrange_start = pointrange[mpirank];
pointrange_end = pointrange[mpirank+1]; pointrange_end = pointrange[mpirank+1]; */
vertexrange_start = vertexrange[mpirank]; vertexrange_start = vertexrange[mpirank];
vertexrange_end = vertexrange[mpirank+1]; vertexrange_end = vertexrange[mpirank+1];
for (i=0;i<num_recvs;i++) { for (i=0;i<num_recvs;i++) {

2
src/parcsr_ls/par_jacobi_interp.c
View File

@ -93,7 +93,7 @@ void hypre_BoomerAMGJacobiInterp_1( hypre_ParCSRMatrix * A,
hypre_CSRMatrix *Pnew_offd;*/ hypre_CSRMatrix *Pnew_offd;*/
HYPRE_Int num_rows_diag_P = hypre_CSRMatrixNumRows(P_diag); HYPRE_Int num_rows_diag_P = hypre_CSRMatrixNumRows(P_diag);
HYPRE_Int i; HYPRE_Int i;
HYPRE_Int Jnochanges=0/*, Jchanges, Pnew_num_nonzeros*/; /*HYPRE_Int Jnochanges=0, Jchanges, Pnew_num_nonzeros*/;
HYPRE_Int CF_coarse=0; HYPRE_Int CF_coarse=0;
HYPRE_Int * J_marker = hypre_CTAlloc( HYPRE_Int, num_rows_diag_P ); HYPRE_Int * J_marker = hypre_CTAlloc( HYPRE_Int, num_rows_diag_P );
HYPRE_Int nc, ncmax, ncmin, nc1; HYPRE_Int nc, ncmax, ncmin, nc1;