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

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

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

revision 2651 by artak, Wed Sep 2 00:10:00 2009 UTC revision 2652 by artak, Mon Sep 7 05:04:45 2009 UTC
# Line 150  Paso_Solver_AMG* Paso_Solver_getAMG(Paso Line 150  Paso_Solver_AMG* Paso_Solver_getAMG(Paso
150           for (i=0;i<n;++i) mis_marker[i]=-1;           for (i=0;i<n;++i) mis_marker[i]=-1;
151    
152           if (options->coarsening_method == PASO_YAIR_SHAPIRA_COARSENING) {           if (options->coarsening_method == PASO_YAIR_SHAPIRA_COARSENING) {
153                Paso_Pattern_coup(A_p,mis_marker,options->coarsening_threshold);                Paso_Pattern_YS(A_p,mis_marker,options->coarsening_threshold);
154           }           }
155           else if (options->coarsening_method == PASO_RUGE_STUEBEN_COARSENING) {           else if (options->coarsening_method == PASO_RUGE_STUEBEN_COARSENING) {
156                Paso_Pattern_RS(A_p,mis_marker,options->coarsening_threshold);                Paso_Pattern_RS(A_p,mis_marker,options->coarsening_threshold);
# Line 160  Paso_Solver_AMG* Paso_Solver_getAMG(Paso Line 160  Paso_Solver_AMG* Paso_Solver_getAMG(Paso
160          }          }
161          else {          else {
162             /*Default coarseneing*/             /*Default coarseneing*/
163              Paso_Pattern_RS(A_p,mis_marker,options->coarsening_threshold);              /*Paso_Pattern_RS(A_p,mis_marker,options->coarsening_threshold);*/
164                Paso_Pattern_YS(A_p,mis_marker,options->coarsening_threshold);
165               /*Paso_Pattern_Aggregiation(A_p,mis_marker,options->coarsening_threshold);*/               /*Paso_Pattern_Aggregiation(A_p,mis_marker,options->coarsening_threshold);*/
166          }          }
167            
# Line 365  void Paso_Solver_solveAMG(Paso_Solver_AM Line 365  void Paso_Solver_solveAMG(Paso_Solver_AM
365         #else         #else
366            #ifdef UMFPACK            #ifdef UMFPACK
367               ptr=(Paso_UMFPACK_Handler *)(amg->solver);               ptr=(Paso_UMFPACK_Handler *)(amg->solver);
368               Paso_UMFPACK1(&ptr,amg->A,x,b,0);               Paso_UMFPACK1(&ptr,amg->A,x,b,verbose);
369               amg->solver=(void*) ptr;               amg->solver=(void*) ptr;
370            #else            #else
371               Paso_Solver_solveJacobi(amg->GS,x,b);               Paso_Solver_solveJacobi(amg->GS,x,b);
372            #endif            #endif
373         #endif         #endif
374         time0=Paso_timer()-time0;         time0=Paso_timer()-time0;
375         if (verbose) fprintf(stderr,"timing: DIRECT SOLVER: %e\n\n\n",time0);         if (verbose) fprintf(stderr,"timing: DIRECT SOLVER: %e\n",time0);
376                
377       } else {       } else {
378          /* presmoothing */          /* presmoothing */

Legend:
Removed from v.2651  
changed lines
  Added in v.2652

  ViewVC Help
Powered by ViewVC 1.1.26