← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to paso/src/PCG.c

  • Committer: jfenwick
  • Date: 2010-10-11 01:48:14 UTC
  • Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259
Merging dudley and scons updates from branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
paso/src/PCG.c
22
22
#include <omp.h>
23
23
#endif
24
24
 
25
 
#ifdef PASO_MPI
 
25
#ifdef ESYS_MPI
26
26
#include <mpi.h>
27
27
#endif
28
28
 
88
88
  dim_t n = Paso_SystemMatrix_getTotalNumRows(A);
89
89
  double *resid = tolerance, *rs=NULL, *p=NULL, *v=NULL, *x2=NULL ;
90
90
  double tau_old,tau,beta,delta,gamma_1,gamma_2,alpha,sum_1,sum_2,sum_3,sum_4,sum_5,tol;
91
 
#ifdef PASO_MPI
 
91
#ifdef ESYS_MPI
92
92
  double loc_sum[2], sum[2];
93
93
#endif
94
94
  double norm_of_residual=0,norm_of_residual_global;
211
211
                     sum_1+=ss;
212
212
                  }
213
213
           }
214
 
           #ifdef PASO_MPI
 
214
           #ifdef ESYS_MPI
215
215
                /* In case we have many MPI processes, each of which may have several OMP threads:
216
216
                   OMP master participates in an MPI reduction to get global sum_1 */
217
217
                loc_sum[0] = sum_1;
282
282
                             sum_2+=ss;
283
283
                  }
284
284
           }
285
 
           #ifdef PASO_MPI
 
285
           #ifdef ESYS_MPI
286
286
              loc_sum[0] = sum_2;
287
287
              MPI_Allreduce(loc_sum, &sum_2, 1, MPI_DOUBLE, MPI_SUM, A->mpi_info->comm);
288
288
           #endif
326
326
                     sum_4+=ss1;
327
327
                  }
328
328
               }
329
 
               #ifdef PASO_MPI
 
329
               #ifdef ESYS_MPI
330
330
                   loc_sum[0] = sum_3;
331
331
                   loc_sum[1] = sum_4;
332
332
                   MPI_Allreduce(loc_sum, sum, 2, MPI_DOUBLE, MPI_SUM, A->mpi_info->comm);
367
367
                      sum_5+=ss;
368
368
                  }
369
369
                }
370
 
                #ifdef PASO_MPI
 
370
                #ifdef ESYS_MPI
371
371
                   loc_sum[0] = sum_5;
372
372
                   MPI_Allreduce(loc_sum, &sum_5, 1, MPI_DOUBLE, MPI_SUM, A->mpi_info->comm);
373
373
                #endif