/[escript]/trunk-mpi-branch/paso/src/solve.c
ViewVC logotype

Diff of /trunk-mpi-branch/paso/src/solve.c

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

revision 1095 by gross, Thu Apr 12 10:01:47 2007 UTC revision 1096 by ksteube, Mon Apr 16 22:59:33 2007 UTC
# Line 39  Line 39 
39  #include "UMFPACK.h"  #include "UMFPACK.h"
40  #endif  #endif
41    
 #ifdef TRILINOS  
 #include "TRILINOS.h"  
 #endif  
   
42  /**************************************************************/  /**************************************************************/
43    
44  void Paso_solve(Paso_SystemMatrix* A,  void Paso_solve(Paso_SystemMatrix* A,
# Line 56  void Paso_solve(Paso_SystemMatrix* A, Line 52  void Paso_solve(Paso_SystemMatrix* A,
52         return;         return;
53    }    }
54    Performance_open(&pp,options->verbose);    Performance_open(&pp,options->verbose);
   printf("ksteube in paso/src/solve.c : Paso_solve\n");  
55    index_t package=Paso_Options_getPackage(options->method,options->package,options->symmetric);    index_t package=Paso_Options_getPackage(options->method,options->package,options->symmetric);
56    if (Paso_noError()) {    if (Paso_noError()) {
57       switch(package) {       switch(package) {
# Line 100  void Paso_solve(Paso_SystemMatrix* A, Line 95  void Paso_solve(Paso_SystemMatrix* A,
95            break;            break;
96          #endif          #endif
97    
         #ifdef TRILINOS  
         case PASO_TRILINOS:  
           printf("ksteube in paso/src/solve.c : Paso_solve PASO_TRILINOS\n");  
           Paso_TRILINOS(A,out,in,options,&pp);  
           A->solver_package=PASO_TRILINOS;  
           break;  
         #endif  
   
98          default:          default:
99             Paso_setError(VALUE_ERROR,"Paso_solve: unknown package code");             Paso_setError(VALUE_ERROR,"Paso_solve: unknown package code");
100             break;             break;
# Line 146  void Paso_solve_free(Paso_SystemMatrix* Line 133  void Paso_solve_free(Paso_SystemMatrix*
133            break;            break;
134          #endif          #endif
135    
         #ifdef TRILINOS  
         case PASO_TRILINOS:  
           Paso_TRILINOS_free(in);  
           break;  
         #endif  
136     }     }
137  }  }
138  /*  /*

Legend:
Removed from v.1095  
changed lines
  Added in v.1096

  ViewVC Help
Powered by ViewVC 1.1.26