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

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

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

revision 2550 by jfenwick, Mon Jul 20 06:20:06 2009 UTC revision 2551 by gross, Thu Jul 23 09:19:15 2009 UTC
# Line 231  Paso_SystemMatrix* Paso_SystemMatrix_loa Line 231  Paso_SystemMatrix* Paso_SystemMatrix_loa
231          output_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);          output_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);
232          dist[1]=N;          dist[1]=N;
233          input_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);          input_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);
234          mainPattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,1,1,M,N,row_ptr,col_ind);          mainPattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,M,N,row_ptr,col_ind);
235          couplePattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,1,1,M,N,NULL,NULL);          couplePattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,M,N,NULL,NULL);
236      dist[0]=M;      dist[0]=M;
237          send=Paso_SharedComponents_alloc(M,0,NULL,NULL,dist,1,0,mpi_info);          send=Paso_SharedComponents_alloc(M,0,NULL,NULL,dist,1,0,mpi_info);
238      dist[0]=0;      dist[0]=0;
# Line 240  Paso_SystemMatrix* Paso_SystemMatrix_loa Line 240  Paso_SystemMatrix* Paso_SystemMatrix_loa
240          pattern=Paso_SystemMatrixPattern_alloc(PATTERN_FORMAT_DEFAULT,output_dist,input_dist,          pattern=Paso_SystemMatrixPattern_alloc(PATTERN_FORMAT_DEFAULT,output_dist,input_dist,
241                                                 mainPattern,couplePattern,couplePattern,connector,connector);                                                 mainPattern,couplePattern,couplePattern,connector,connector);
242    
243      out = Paso_SystemMatrix_alloc(MATRIX_FORMAT_DEFAULT, pattern, 1, 1);      out = Paso_SystemMatrix_alloc(MATRIX_FORMAT_DEFAULT, pattern, 1, 1, TRUE);
244      /* copy values and cleanup temps */      /* copy values and cleanup temps */
245      for( i=0; i<nz; i++ ) out->mainBlock->val[i] = val[i];      for( i=0; i<nz; i++ ) out->mainBlock->val[i] = val[i];
246    
# Line 360  Paso_SystemMatrix* Paso_SystemMatrix_loa Line 360  Paso_SystemMatrix* Paso_SystemMatrix_loa
360          output_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);          output_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);
361          dist[1]=M;          dist[1]=M;
362          input_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);          input_dist=Paso_Distribution_alloc(mpi_info, dist,1,0);
363          mainPattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,1,1,N,M,col_ptr,col_ind);          mainPattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,N,M,col_ptr,col_ind);
364          couplePattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,1,1,N,M,NULL,NULL);          couplePattern=Paso_Pattern_alloc(PATTERN_FORMAT_DEFAULT,N,M,NULL,NULL);
365          send=Paso_SharedComponents_alloc(N,0,NULL,NULL,NULL,1,0,mpi_info);          send=Paso_SharedComponents_alloc(N,0,NULL,NULL,NULL,1,0,mpi_info);
366          connector=Paso_Connector_alloc(send,send);          connector=Paso_Connector_alloc(send,send);
367          pattern=Paso_SystemMatrixPattern_alloc(PATTERN_FORMAT_DEFAULT,output_dist,input_dist,          pattern=Paso_SystemMatrixPattern_alloc(PATTERN_FORMAT_DEFAULT,output_dist,input_dist,
368                                                 mainPattern,couplePattern,couplePattern,connector,connector);                                                 mainPattern,couplePattern,couplePattern,connector,connector);
369      out = Paso_SystemMatrix_alloc(MATRIX_FORMAT_CSC, pattern, 1, 1);      out = Paso_SystemMatrix_alloc(MATRIX_FORMAT_CSC, pattern, 1, 1, TRUE);
370      /* copy values and cleanup temps */      /* copy values and cleanup temps */
371      for( i=0; i<nz; i++ )      for( i=0; i<nz; i++ )
372          out->mainBlock->val[i] = val[i];          out->mainBlock->val[i] = val[i];

Legend:
Removed from v.2550  
changed lines
  Added in v.2551

  ViewVC Help
Powered by ViewVC 1.1.26