/[escript]/trunk-mpi-branch/paso/src/SystemMatrix.c
ViewVC logotype

Diff of /trunk-mpi-branch/paso/src/SystemMatrix.c

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

revision 1086 by gross, Thu Mar 8 06:31:28 2007 UTC revision 1087 by gross, Thu Apr 12 10:01:47 2007 UTC
# Line 111  Paso_SystemMatrix* Paso_SystemMatrix_all Line 111  Paso_SystemMatrix* Paso_SystemMatrix_all
111       out->block_size=out->row_block_size*out->col_block_size;       out->block_size=out->row_block_size*out->col_block_size;
112       out->myLen=(size_t)(out->pattern->myLen)*(size_t)(out->block_size);       out->myLen=(size_t)(out->pattern->myLen)*(size_t)(out->block_size);
113    
114       out->numRows = out->row_distribution->myNumComponents;       out->numRows = out->row_distribution->numComponents;
115       out->myNumRows = out->row_distribution->numComponents;       out->myNumRows = out->row_distribution->myNumComponents;
116       out->numCols = out->col_distribution->myNumComponents;       out->myFirstRow = out->row_distribution->myFirstComponent;
117       out->myNumCols = out->col_distribution->numComponents;       out->maxNumRows = out->row_distribution->maxNumComponents;
118         out->numCols = out->col_distribution->numComponents;
119         out->myNumCols = out->col_distribution->myNumComponents;
120         out->myFirstCol = out->col_distribution->myFirstComponent;
121         out->maxNumCols = out->col_distribution->maxNumComponents;
122       out->mpi_info = Paso_MPIInfo_getReference(out->pattern->mpi_info);       out->mpi_info = Paso_MPIInfo_getReference(out->pattern->mpi_info);
123       /* allocate memory for matrix entries */       /* allocate memory for matrix entries */
124       if (type & MATRIX_FORMAT_TRILINOS_CRS) {       if (type & MATRIX_FORMAT_TRILINOS_CRS) {
125           Paso_TRILINOS_alloc(out->trilinos_data, out->pattern,out->row_block_size,out->col_block_size);           Paso_TRILINOS_alloc(out->trilinos_data, out->pattern,out->row_block_size,out->col_block_size);
126       } else {       } else {
127           if (type & MATRIX_FORMAT_CSC) {           if (type & MATRIX_FORMAT_CSC) {
128              n_norm = out->myNumCols * out->col_block_size;              n_norm = out->maxNumCols * out->col_block_size;
129           } else {           } else {
130              n_norm = out->myNumRows * out->row_block_size;              n_norm = out->maxNumRows * out->row_block_size;
131           }           }
132           out->val=MEMALLOC(out->myLen,double);           out->val=MEMALLOC(out->myLen,double);
133           out->normalizer=MEMALLOC(n_norm,double);           out->normalizer=MEMALLOC(n_norm,double);

Legend:
Removed from v.1086  
changed lines
  Added in v.1087

  ViewVC Help
Powered by ViewVC 1.1.26