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

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

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

revision 2551 by gross, Thu Jul 23 09:19:15 2009 UTC revision 2554 by gross, Fri Jul 24 05:38:54 2009 UTC
# Line 47  Paso_SystemMatrix* Paso_SystemMatrix_all Line 47  Paso_SystemMatrix* Paso_SystemMatrix_all
47        return NULL;        return NULL;
48    }    }
49    if (patternIsUnrolled) {    if (patternIsUnrolled) {
50       if ( (type & MATRIX_FORMAT_OFFSET1) != ( pattern->type & PATTERN_FORMAT_OFFSET1) ) {       if ( ! XNOR(type & MATRIX_FORMAT_OFFSET1, pattern->type & PATTERN_FORMAT_OFFSET1) ) {
51           Paso_setError(TYPE_ERROR,"Paso_SystemMatrix_alloc: requested offset and pattern offset does not match.");           Paso_setError(TYPE_ERROR,"Paso_SystemMatrix_alloc: requested offset and pattern offset does not match.");
52           return NULL;           return NULL;
53       }       }
# Line 59  Paso_SystemMatrix* Paso_SystemMatrix_all Line 59  Paso_SystemMatrix* Paso_SystemMatrix_all
59          /* or any block size bigger than 3 */          /* or any block size bigger than 3 */
60      ||  (col_block_size>3)      ||  (col_block_size>3)
61          /* 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 */
62      ||  ((type & MATRIX_FORMAT_BLK1) &&  (col_block_size>1) ) ;      ||  ((type & MATRIX_FORMAT_BLK1) &&  (col_block_size>1) )
63            /* or the offsets are wrong */
64        ||  ((type & MATRIX_FORMAT_OFFSET1) != ( pattern->type & PATTERN_FORMAT_OFFSET1));
65        
66    out=MEMALLOC(1,Paso_SystemMatrix);    out=MEMALLOC(1,Paso_SystemMatrix);
67    if (! Paso_checkPtr(out)) {      if (! Paso_checkPtr(out)) {  

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

  ViewVC Help
Powered by ViewVC 1.1.26