/[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 1859 by gross, Wed Oct 8 03:03:37 2008 UTC revision 2315 by gross, Wed Mar 18 00:38:48 2009 UTC
# Line 29  Line 29 
29    
30  /**************************************************************/  /**************************************************************/
31    
32  index_t Paso_SystemMatrix_getSystemMatrixTypeId(const index_t solver,const index_t preconditioner, const index_t package,const  bool_t symmetry) {  index_t Paso_SystemMatrix_getSystemMatrixTypeId(const index_t solver,const index_t preconditioner, const index_t package,const  bool_t symmetry, Paso_MPIInfo *mpi_info) {
33    index_t true_package;    index_t true_package;
34    index_t out=MATRIX_FORMAT_DEFAULT;    index_t out=MATRIX_FORMAT_DEFAULT;
35    true_package=Paso_Options_getPackage(solver,package,symmetry);    true_package=Paso_Options_getPackage(solver,package,symmetry, mpi_info);
36    
37    switch(true_package)  {    switch(true_package)  {
38    
# Line 45  index_t Paso_SystemMatrix_getSystemMatri Line 45  index_t Paso_SystemMatrix_getSystemMatri
45         break;         break;
46    
47       case PASO_SCSL:       case PASO_SCSL:
48           if (mpi_info->size > 1) {
49               Paso_setError(VALUE_ERROR,"The selected solver SCSL requires CSC format which is not supported with MPI.");
50               return -1;
51           }
52         out=MATRIX_FORMAT_CSC + MATRIX_FORMAT_BLK1;         out=MATRIX_FORMAT_CSC + MATRIX_FORMAT_BLK1;
53         /* if (solver == PASO_CHOLEVSKY) out+=MATRIX_FORMAT_SYM */         /* if (solver == PASO_CHOLEVSKY) out+=MATRIX_FORMAT_SYM */
54         break;         break;
# Line 55  index_t Paso_SystemMatrix_getSystemMatri Line 59  index_t Paso_SystemMatrix_getSystemMatri
59         break;         break;
60    
61       case PASO_UMFPACK:       case PASO_UMFPACK:
62           if (mpi_info->size > 1) {
63               Paso_setError(VALUE_ERROR,"The selected solver UMFPACK requires CSC format which is not supported with MPI.");
64               return -1;
65           }
66         out=MATRIX_FORMAT_CSC + MATRIX_FORMAT_BLK1;         out=MATRIX_FORMAT_CSC + MATRIX_FORMAT_BLK1;
67        break;        break;
68    

Legend:
Removed from v.1859  
changed lines
  Added in v.2315

  ViewVC Help
Powered by ViewVC 1.1.26