/[escript]/trunk/paso/src/MergedSolver.cpp
ViewVC logotype

Diff of /trunk/paso/src/MergedSolver.cpp

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

revision 4802 by caltinay, Mon Mar 24 05:42:42 2014 UTC revision 4803 by caltinay, Wed Mar 26 06:52:28 2014 UTC
# Line 121  paso::SparseMatrix* Paso_MergedSolver_me Line 121  paso::SparseMatrix* Paso_MergedSolver_me
121    index_t *ptr=NULL, *idx=NULL, *ptr_global=NULL, *idx_global=NULL;    index_t *ptr=NULL, *idx=NULL, *ptr_global=NULL, *idx_global=NULL;
122    index_t *temp_n=NULL, *temp_len=NULL;    index_t *temp_n=NULL, *temp_len=NULL;
123    double  *val=NULL;    double  *val=NULL;
124    Paso_Pattern *pattern=NULL;    paso::Pattern *pattern=NULL;
125    paso::SparseMatrix *out=NULL;    paso::SparseMatrix *out=NULL;
126    #ifdef ESYS_MPI    #ifdef ESYS_MPI
127      MPI_Request* mpi_requests=NULL;      MPI_Request* mpi_requests=NULL;
# Line 229  paso::SparseMatrix* Paso_MergedSolver_me Line 229  paso::SparseMatrix* Paso_MergedSolver_me
229      delete[] temp_n;      delete[] temp_n;
230    
231      /* Then generate the sparse matrix */      /* Then generate the sparse matrix */
232      pattern = Paso_Pattern_alloc(A->mainBlock->pattern->type, global_n,      pattern = paso::Pattern_alloc(A->mainBlock->pattern->type, global_n,
233              global_n, ptr_global, idx_global);              global_n, ptr_global, idx_global);
234      out = paso::SparseMatrix_alloc(A->mainBlock->type, pattern,      out = paso::SparseMatrix_alloc(A->mainBlock->type, pattern,
235              row_block_size, col_block_size, FALSE);              row_block_size, col_block_size, FALSE);
236      Paso_Pattern_free(pattern);      paso::Pattern_free(pattern);
237    
238      /* Finally, receive and copy the value */      /* Finally, receive and copy the value */
239      iptr = temp_len[0] * block_size;      iptr = temp_len[0] * block_size;

Legend:
Removed from v.4802  
changed lines
  Added in v.4803

  ViewVC Help
Powered by ViewVC 1.1.26