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

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

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

revision 2553 by gross, Thu Jul 23 09:19:15 2009 UTC revision 2554 by gross, Fri Jul 24 05:38:54 2009 UTC
# Line 112  Paso_SparseMatrix* Paso_SparseMatrix_all Line 112  Paso_SparseMatrix* Paso_SparseMatrix_all
112       Paso_setError(TYPE_ERROR,"Paso_SparseMatrix_alloc: symmetric matrix pattern are not supported.");       Paso_setError(TYPE_ERROR,"Paso_SparseMatrix_alloc: symmetric matrix pattern are not supported.");
113       return NULL;       return NULL;
114    }    }
115    
116    if (patternIsUnrolled) {    if (patternIsUnrolled) {
117       if ( (type & MATRIX_FORMAT_OFFSET1) != ( pattern->type & PATTERN_FORMAT_OFFSET1) ) {       if (! XNOR(type & MATRIX_FORMAT_OFFSET1, pattern->type & PATTERN_FORMAT_OFFSET1) ) {
118           Paso_setError(TYPE_ERROR,"Paso_SystemMatrix_alloc: requested offset and pattern offset does not match.");           Paso_setError(TYPE_ERROR,"Paso_SparseMatrix_alloc: requested offset and pattern offset does not match.");
119           return NULL;           return NULL;
120       }       }
121    }    }
# Line 125  Paso_SparseMatrix* Paso_SparseMatrix_all Line 126  Paso_SparseMatrix* Paso_SparseMatrix_all
126          /* or any block size bigger than 3 */          /* or any block size bigger than 3 */
127      ||  (col_block_size>3)      ||  (col_block_size>3)
128          /* or if lock size one requested and the block size is not 1 */          /* or if lock size one requested and the block size is not 1 */
129      ||  ((type & MATRIX_FORMAT_BLK1) &&  (col_block_size>1) ) ;      ||  ((type & MATRIX_FORMAT_BLK1) &&  (col_block_size>1) )
130            /* offsets don't match */
131        || ( (type & MATRIX_FORMAT_OFFSET1) != ( pattern->type & PATTERN_FORMAT_OFFSET1) ) ;
132    
133    pattern_format_out= (type & MATRIX_FORMAT_OFFSET1)? PATTERN_FORMAT_OFFSET1:  PATTERN_FORMAT_DEFAULT;    pattern_format_out= (type & MATRIX_FORMAT_OFFSET1)? PATTERN_FORMAT_OFFSET1:  PATTERN_FORMAT_DEFAULT;
134    

Legend:
Removed from v.2553  
changed lines
  Added in v.2554

  ViewVC Help
Powered by ViewVC 1.1.26