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

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

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

revision 2548 by jfenwick, Mon Jul 20 06:20:06 2009 UTC revision 2555 by artak, Mon Jul 27 01:50:16 2009 UTC
# Line 197  void Paso_Pattern_RS(Paso_SparseMatrix* Line 197  void Paso_Pattern_RS(Paso_SparseMatrix*
197    
198      /*Paso_Pattern_mis(out,mis_marker);*/      /*Paso_Pattern_mis(out,mis_marker);*/
199      Paso_Pattern_greedy(out,mis_marker);      Paso_Pattern_greedy(out,mis_marker);
200        Paso_Pattern_free(out);
201  }  }
202    
203  void Paso_Pattern_Aggregiation(Paso_SparseMatrix* A, index_t* mis_marker, double theta)  void Paso_Pattern_Aggregiation(Paso_SparseMatrix* A, index_t* mis_marker, double theta)
# Line 228  void Paso_Pattern_Aggregiation(Paso_Spar Line 229  void Paso_Pattern_Aggregiation(Paso_Spar
229    }    }
230    
231    
232      #pragma omp parallel for private(i,iptr) reduction(+:diag) schedule(static)      #pragma omp parallel for private(i,iptr,diag) schedule(static)
233        for (i=0;i<n;++i) {        for (i=0;i<n;++i) {
234          diag = 0;          diag = 0;
235          for (iptr=A->pattern->ptr[i];iptr<A->pattern->ptr[i+1]; ++iptr) {          for (iptr=A->pattern->ptr[i];iptr<A->pattern->ptr[i+1]; ++iptr) {
# Line 271  void Paso_Pattern_Aggregiation(Paso_Spar Line 272  void Paso_Pattern_Aggregiation(Paso_Spar
272            
273      /*Paso_Pattern_mis(out,mis_marker);*/      /*Paso_Pattern_mis(out,mis_marker);*/
274      Paso_Pattern_greedy(out,mis_marker);      Paso_Pattern_greedy(out,mis_marker);
275        Paso_Pattern_free(out);
276    
277  }  }
278    

Legend:
Removed from v.2548  
changed lines
  Added in v.2555

  ViewVC Help
Powered by ViewVC 1.1.26