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

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

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

revision 4802 by caltinay, Wed Mar 26 03:26:58 2014 UTC revision 4803 by caltinay, Wed Mar 26 06:52:28 2014 UTC
# Line 785  void Paso_Preconditioner_AMG_CIJPCoarsen Line 785  void Paso_Preconditioner_AMG_CIJPCoarsen
785          for( iptr =0 ; iptr < degree_S[i]; ++iptr) {          for( iptr =0 ; iptr < degree_S[i]; ++iptr) {
786             const index_t k=S[offset_S[i]+iptr];             const index_t k=S[offset_S[i]+iptr];
787             const index_t* start_p = &ST[offset_ST[k]];             const index_t* start_p = &ST[offset_ST[k]];
788             const index_t* where_p=(index_t*)bsearch(&i, start_p, degree_ST[k], sizeof(index_t), Paso_comparIndex);             const index_t* where_p=(index_t*)bsearch(&i, start_p, degree_ST[k], sizeof(index_t), paso::comparIndex);
789    
790             if (ST_flag[offset_ST[k] + (index_t)(where_p-start_p)]>0) {             if (ST_flag[offset_ST[k] + (index_t)(where_p-start_p)]>0) {
791            if (wi <= w[k] ) {            if (wi <= w[k] ) {
# Line 864  void Paso_Preconditioner_AMG_CIJPCoarsen Line 864  void Paso_Preconditioner_AMG_CIJPCoarsen
864              ST_flag[offset_ST[i]+jptr]=-1;              ST_flag[offset_ST[i]+jptr]=-1;
865              for (kptr=0; kptr<degree_ST[j]; ++kptr) {              for (kptr=0; kptr<degree_ST[j]; ++kptr) {
866                 const index_t k=ST[offset_ST[j]+kptr];                 const index_t k=ST[offset_ST[j]+kptr];
867                 if (NULL != bsearch(&k, start_p, degree_ST[i], sizeof(index_t), Paso_comparIndex) ) { /* k in ST[i] ? */                 if (NULL != bsearch(&k, start_p, degree_ST[i], sizeof(index_t), paso::comparIndex) ) { /* k in ST[i] ? */
868                    if (ST_flag[offset_ST[j]+kptr] >0) {                    if (ST_flag[offset_ST[j]+kptr] >0) {
869                   if (j< my_n ) {                   if (j< my_n ) {
870                      w[j]--;                      w[j]--;

Legend:
Removed from v.4802  
changed lines
  Added in v.4803

  ViewVC Help
Powered by ViewVC 1.1.26