/[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 424 by gross, Wed Jan 4 05:37:33 2006 UTC revision 425 by gross, Tue Jan 10 04:10:39 2006 UTC
# Line 31  Paso_SystemMatrix* Paso_SystemMatrix_all Line 31  Paso_SystemMatrix* Paso_SystemMatrix_all
31    out=MEMALLOC(1,Paso_SystemMatrix);    out=MEMALLOC(1,Paso_SystemMatrix);
32    if (! Paso_checkPtr(out)) {      if (! Paso_checkPtr(out)) {  
33       out->pattern=NULL;         out->pattern=NULL;  
34       out->direct=NULL;         out->solver_package=PASO_PASO;  
35       out->iterative=NULL;       out->solver=NULL;  
36       out->val=NULL;         out->val=NULL;  
37       out->reference_counter=1;       out->reference_counter=1;
38       out->type=type;       out->type=type;
# Line 43  Paso_SystemMatrix* Paso_SystemMatrix_all Line 43  Paso_SystemMatrix* Paso_SystemMatrix_all
43             Paso_setError(TYPE_ERROR,"Generation of matrix pattern for symmetric CSC is not implemented yet.");             Paso_setError(TYPE_ERROR,"Generation of matrix pattern for symmetric CSC is not implemented yet.");
44             return NULL;             return NULL;
45          } else {          } else {
46             if ((type & MATRIX_FORMAT_BLK1) && (row_block_size!=col_block_size || col_block_size>3) ) {             if ((type & MATRIX_FORMAT_BLK1) || row_block_size!=col_block_size || col_block_size>3) {
47                if (type & MATRIX_FORMAT_OFFSET1) {                if (type & MATRIX_FORMAT_OFFSET1) {
48                    out->pattern=Paso_SystemMatrixPattern_unrollBlocks(pattern,PATTERN_FORMAT_OFFSET1,col_block_size,row_block_size);                    out->pattern=Paso_SystemMatrixPattern_unrollBlocks(pattern,PATTERN_FORMAT_OFFSET1,col_block_size,row_block_size);
49                } else {                } else {
# Line 69  Paso_SystemMatrix* Paso_SystemMatrix_all Line 69  Paso_SystemMatrix* Paso_SystemMatrix_all
69             Paso_setError(TYPE_ERROR,"Generation of matrix pattern for symmetric CSR is not implemented yet.");             Paso_setError(TYPE_ERROR,"Generation of matrix pattern for symmetric CSR is not implemented yet.");
70             return NULL;             return NULL;
71          } else {          } else {
72             if ((type & MATRIX_FORMAT_BLK1) && (row_block_size!=col_block_size || col_block_size>3) ) {             if ((type & MATRIX_FORMAT_BLK1) || row_block_size!=col_block_size || col_block_size>3)  {
73                if (type & MATRIX_FORMAT_OFFSET1) {                if (type & MATRIX_FORMAT_OFFSET1) {
74                    out->pattern=Paso_SystemMatrixPattern_unrollBlocks(pattern,PATTERN_FORMAT_OFFSET1,row_block_size,col_block_size);                    out->pattern=Paso_SystemMatrixPattern_unrollBlocks(pattern,PATTERN_FORMAT_OFFSET1,row_block_size,col_block_size);
75                } else {                } else {

Legend:
Removed from v.424  
changed lines
  Added in v.425

  ViewVC Help
Powered by ViewVC 1.1.26