/[escript]/trunk/paso/src/SystemMatrix_mergeMainAndCouple.c
ViewVC logotype

Diff of /trunk/paso/src/SystemMatrix_mergeMainAndCouple.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3509 by lgao, Fri May 13 04:15:29 2011 UTC revision 3510 by gross, Fri May 13 06:09:49 2011 UTC
# Line 61  void Paso_SystemMatrix_mergeMainAndCoupl Line 61  void Paso_SystemMatrix_mergeMainAndCoupl
61  void Paso_SystemMatrix_mergeMainAndCouple_CSR_OFFSET0(Paso_SystemMatrix* A, index_t** p_ptr, index_t** p_idx, double** p_val) {  void Paso_SystemMatrix_mergeMainAndCouple_CSR_OFFSET0(Paso_SystemMatrix* A, index_t** p_ptr, index_t** p_idx, double** p_val) {
62    
63    index_t i, j, i_ub, j_lb, j_ub, row, num_vals, main_num_vals;    index_t i, j, i_ub, j_lb, j_ub, row, num_vals, main_num_vals;
64    index_t couple_num_vals, idx, idx2, rank, row_offset, ij_ptr;    index_t couple_num_vals, rank, row_offset, ij_ptr=0, idx=0, idx2=0;
65    index_t main_num_rows, couple_num_rows, col_offset;    index_t main_num_rows, couple_num_rows, col_offset;
66    index_t *main_ptr, *main_idx, *couple_ptr, *couple_idx;    index_t *main_ptr, *main_idx, *couple_ptr, *couple_idx;
67    double  *main_val, *couple_val, *rows;    double  *main_val, *couple_val, *rows;
# Line 172  void Paso_SystemMatrix_mergeMainAndCoupl Line 172  void Paso_SystemMatrix_mergeMainAndCoupl
172    
173    
174  void Paso_SystemMatrix_mergeMainAndCouple_CSC_OFFSET1(Paso_SystemMatrix* A, index_t** p_ptr, index_t** p_idx, double** p_val) {  void Paso_SystemMatrix_mergeMainAndCouple_CSC_OFFSET1(Paso_SystemMatrix* A, index_t** p_ptr, index_t** p_idx, double** p_val) {
175    /*
176    index_t i, j, i_ub, j_ub, col, num_vals, main_num_vals;    index_t i, j, i_ub, j_ub, col, num_vals, main_num_vals;
177    index_t couple_num_vals, idx, rank, main_offset;    index_t couple_num_vals, idx, rank, main_offset;
178    index_t main_num_cols=A->mainBlock->pattern->numOutput;    index_t main_num_cols=A->mainBlock->pattern->numOutput;
# Line 185  void Paso_SystemMatrix_mergeMainAndCoupl Line 185  void Paso_SystemMatrix_mergeMainAndCoupl
185    double  *couple_val=A->col_coupleBlock->val;    double  *couple_val=A->col_coupleBlock->val;
186    index_t *couple_global=NULL;    index_t *couple_global=NULL;
187    Paso_Coupler* coupler=A->col_coupler;    Paso_Coupler* coupler=A->col_coupler;
188    */
189    
190    return;    return;
191  }  }

Legend:
Removed from v.3509  
changed lines
  Added in v.3510

  ViewVC Help
Powered by ViewVC 1.1.26