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

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

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

revision 3351 by gross, Tue Nov 16 02:39:40 2010 UTC revision 3396 by gross, Fri Dec 3 08:24:16 2010 UTC
# Line 97  Paso_Preconditioner_LocalAMG* Paso_Preco Line 97  Paso_Preconditioner_LocalAMG* Paso_Preco
97       } else {       } else {
98             Paso_Preconditioner_AMG_setStrongConnections(A_p, degree, S, theta,tau);             Paso_Preconditioner_AMG_setStrongConnections(A_p, degree, S, theta,tau);
99       }       }
100       Paso_Preconditioner_AMG_RungeStuebenSearch(n, A_p->pattern->ptr, degree, S, split_marker);       Paso_Preconditioner_AMG_RungeStuebenSearch(n, A_p->pattern->ptr, degree, S, split_marker, options->usePanel);
101       options->coarsening_selection_time=Esys_timer()-time0 + MAX(0, options->coarsening_selection_time);       options->coarsening_selection_time=Esys_timer()-time0 + MAX(0, options->coarsening_selection_time);
102            
103       if (Esys_noError() ) {       if (Esys_noError() ) {
# Line 284  void Paso_Preconditioner_LocalAMG_solve( Line 284  void Paso_Preconditioner_LocalAMG_solve(
284            Paso_UMFPACK(amg->A_C, amg->x_C,amg->b_C, amg->refinements, SHOW_TIMING);            Paso_UMFPACK(amg->A_C, amg->x_C,amg->b_C, amg->refinements, SHOW_TIMING);
285            break;            break;
286             case (PASO_SMOOTHER):             case (PASO_SMOOTHER):
287            Paso_Preconditioner_LocalSmoother_solve(amg->A_C, amg->Smoother,amg->x_C,amg->b_C,pre_sweeps, FALSE);                    Paso_Preconditioner_LocalSmoother_solve(amg->A_C, amg->A_C->solver_p,amg->x_C,amg->b_C,pre_sweeps+post_sweeps, FALSE);
288            break;            break;
289          }          }
290          if (SHOW_TIMING) printf("timing: level %d: DIRECT SOLVER: %e\n",amg->level,Esys_timer()-time0);          if (SHOW_TIMING) printf("timing: level %d: DIRECT SOLVER: %e\n",amg->level,Esys_timer()-time0);
# Line 429  void Paso_Preconditioner_AMG_setStrongCo Line 429  void Paso_Preconditioner_AMG_setStrongCo
429    
430  /* the runge stueben coarsening algorithm: */  /* the runge stueben coarsening algorithm: */
431  void Paso_Preconditioner_AMG_RungeStuebenSearch(const dim_t n, const index_t* offset,  void Paso_Preconditioner_AMG_RungeStuebenSearch(const dim_t n, const index_t* offset,
432                           const dim_t* degree, const index_t* S,                          const dim_t* degree, const index_t* S,
433                           index_t*split_marker)                          index_t*split_marker, const bool_t usePanel)
434  {  {
    const bool_t usePanel=FALSE;  
435        
436     index_t *lambda=NULL, *ST=NULL, *notInPanel=NULL, *panel=NULL, lambda_max, lambda_k;     index_t *lambda=NULL, *ST=NULL, *notInPanel=NULL, *panel=NULL, lambda_max, lambda_k;
437     dim_t i,k, p, q, *degreeT=NULL, len_panel, len_panel_new;     dim_t i,k, p, q, *degreeT=NULL, len_panel, len_panel_new;

Legend:
Removed from v.3351  
changed lines
  Added in v.3396

  ViewVC Help
Powered by ViewVC 1.1.26