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

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

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

revision 394 by gross, Tue Dec 20 07:20:32 2005 UTC revision 425 by gross, Tue Jan 10 04:10:39 2006 UTC
# Line 18  Line 18 
18  /**************************************************************/  /**************************************************************/
19    
20  index_t Paso_SystemMatrix_getSystemMatrixTypeId(index_t solver,index_t package, bool_t symmetry) {  index_t Paso_SystemMatrix_getSystemMatrixTypeId(index_t solver,index_t package, bool_t symmetry) {
21    index_t out=CSR;    index_t out=MATRIX_FORMAT_DEFAULT;
22    package=Paso_Options_getPackage(solver,package,symmetry);    package=Paso_Options_getPackage(solver,package,symmetry);
23    
24    switch(package)  {    switch(package)  {
25    
26       case PASO_PASO:       case PASO_PASO:
27         out=CSR;         out=MATRIX_FORMAT_DEFAULT;
28         break;         break;
29    
30       case PASO_SCSL:       case PASO_SCSL:
31         /* out= symmetry ? CSC_BLK1_SYM : CSC_BLK1; */         out=MATRIX_FORMAT_CSC + MATRIX_FORMAT_BLK1;
32         out=CSC_BLK1;         /* if (solver == PASO_CHOLEVSKY) out+=MATRIX_FORMAT_SYM */
33         break;         break;
34  /*  
35       case PASO_MKL:       case PASO_MKL:
36         out= CSR_BLK1;         out=MATRIX_FORMAT_BLK1 + MATRIX_FORMAT_OFFSET1;
37           /* if (solver == PASO_CHOLEVSKY) out+=MATRIX_FORMAT_SYM */
38         break;         break;
 */  
39    
 /*  
40       case PASO_UMFPACK:       case PASO_UMFPACK:
41         out= CSR_BLK1;         out=MATRIX_FORMAT_BLK1;
42        break;        break;
 */  
43    
44       default:       default:
45          Paso_setError(VALUE_ERROR,"unknown package code");          Paso_setError(VALUE_ERROR,"unknown package code");

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

  ViewVC Help
Powered by ViewVC 1.1.26