/[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 2831 by artak, Thu Jan 7 05:08:19 2010 UTC revision 2839 by artak, Wed Jan 13 23:34:49 2010 UTC
# Line 188  Paso_Solver_AMG* Paso_Solver_getAMG(Paso Line 188  Paso_Solver_AMG* Paso_Solver_getAMG(Paso
188       if (verbose) fprintf(stdout,"Stats: Sparsity of the Coarse Matrix with %d non-zeros (%d,%d) in level %d is %.6f\n",A_p->len,A_p->numRows,A_p->numCols,level,sparsity);       if (verbose) fprintf(stdout,"Stats: Sparsity of the Coarse Matrix with %d non-zeros (%d,%d) in level %d is %.6f\n",A_p->len,A_p->numRows,A_p->numCols,level,sparsity);
189            
190            
191       /*if(sparsity>0.01) {       if(sparsity>0.5) {
192        level=0;        level=0;
193       }       }
194       */      
195                    
196       if (level==0 || n<=options->min_coarse_matrix_size) {       if (level==0 || n<=options->min_coarse_matrix_size) {
197           out->coarsest_level=TRUE;           out->coarsest_level=TRUE;
# Line 242  Paso_Solver_AMG* Paso_Solver_getAMG(Paso Line 242  Paso_Solver_AMG* Paso_Solver_getAMG(Paso
242          }          }
243          else {          else {
244             /*Default coarseneing*/             /*Default coarseneing*/
245              /*Paso_Pattern_Standard(A_p,mis_marker,options->coarsening_threshold);*/              Paso_Pattern_Standard(A_p,mis_marker,options->coarsening_threshold);
246              /*Paso_Pattern_Read("RS.spl",n,mis_marker);*/              /*Paso_Pattern_Read("RS.spl",n,mis_marker);*/
247              /*Paso_Pattern_YS(A_p,mis_marker,options->coarsening_threshold);*/              /*Paso_Pattern_YS(A_p,mis_marker,options->coarsening_threshold);*/
248              /*Paso_Pattern_greedy_Agg(A_p,mis_marker,options->coarsening_threshold);*/              /*Paso_Pattern_greedy_Agg(A_p,mis_marker,options->coarsening_threshold);*/
249              Paso_Pattern_greedy(A_p->pattern,mis_marker);              /*Paso_Pattern_greedy(A_p->pattern,mis_marker);*/
250              /*Paso_Pattern_Aggregiation(A_p,mis_marker,options->coarsening_threshold);*/              /*Paso_Pattern_Aggregiation(A_p,mis_marker,options->coarsening_threshold);*/
251                            
252          }          }
# Line 413  Paso_Solver_AMG* Paso_Solver_getAMG(Paso Line 413  Paso_Solver_AMG* Paso_Solver_getAMG(Paso
413                                                                                    
414                      /*Paso_Solver_getCoarseMatrix(A_c, A_p,out->R,out->P);*/                      /*Paso_Solver_getCoarseMatrix(A_c, A_p,out->R,out->P);*/
415                                            
416                      /*                      
417                      sprintf(filename,"A_C_%d",level);                      /*sprintf(filename,"A_C_%d",level);
418                      Paso_SparseMatrix_saveMM(A_c,filename);                      Paso_SparseMatrix_saveMM(A_c,filename);
419                      */                      */
420                                            
# Line 519  void Paso_Solver_solveAMG(Paso_Solver_AM Line 519  void Paso_Solver_solveAMG(Paso_Solver_AM
519        }        }
520         else {         else {
521         #ifdef MKL         #ifdef MKL
522            Paso_MKL1(amg->AOffset1,x,b,verbose);            Paso_MKL1(amg->AOffset1,x,b,timing);
523         #else         #else
524            #ifdef UMFPACK            #ifdef UMFPACK
525               ptr=(Paso_UMFPACK_Handler *)(amg->solver);               ptr=(Paso_UMFPACK_Handler *)(amg->solver);

Legend:
Removed from v.2831  
changed lines
  Added in v.2839

  ViewVC Help
Powered by ViewVC 1.1.26