/[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 3451 by gross, Sun Jan 23 23:11:01 2011 UTC revision 3458 by gross, Mon Jan 31 07:06:42 2011 UTC
# Line 30  Line 30 
30  #include "PasoUtil.h"  #include "PasoUtil.h"
31  #include "UMFPACK.h"  #include "UMFPACK.h"
32  #include "MKL.h"  #include "MKL.h"
33    #include<stdio.h>
34    
35    
36  /**************************************************************/  /**************************************************************/
37    
# Line 148  Paso_Preconditioner_AMG* Paso_Preconditi Line 150  Paso_Preconditioner_AMG* Paso_Preconditi
150       counter=TMPMEMALLOC(n,index_t);       counter=TMPMEMALLOC(n,index_t);
151    
152       if ( !( Esys_checkPtr(F_marker) || Esys_checkPtr(counter) || Esys_checkPtr(degree_S) || Esys_checkPtr(offset_S) || Esys_checkPtr(S) ) ) {       if ( !( Esys_checkPtr(F_marker) || Esys_checkPtr(counter) || Esys_checkPtr(degree_S) || Esys_checkPtr(offset_S) || Esys_checkPtr(S) ) ) {
153       /*      /*
154               make sure that corresponding values in the row_coupleBlock and col_coupleBlock are identical
155        */
156        Paso_SystemMatrix_copyColCoupleBlock(A_p);
157    
158        /*
159            set splitting of unknows:            set splitting of unknows:
160                  
161           */           */
162       time0=Esys_timer();       time0=Esys_timer();
163       if (n_block>1) {       if (n_block>1) {
# Line 158  Paso_Preconditioner_AMG* Paso_Preconditi Line 165  Paso_Preconditioner_AMG* Paso_Preconditi
165       } else {       } else {
166             Paso_Preconditioner_AMG_setStrongConnections(A_p, degree_S, offset_S, S, theta,tau);             Paso_Preconditioner_AMG_setStrongConnections(A_p, degree_S, offset_S, S, theta,tau);
167       }       }
168        Esys_setError(SYSTEM_ERROR, "AMG:DONE.");
169        return NULL;
170  {  {
171     dim_t p;     dim_t p;
172     for (i=0; i< my_n; ++i) {     for (i=0; i< my_n; ++i) {

Legend:
Removed from v.3451  
changed lines
  Added in v.3458

  ViewVC Help
Powered by ViewVC 1.1.26