← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to paso/src/SystemMatrix_MatrixVector.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/SystemMatrix_MatrixVector.c
38
38
                                     double* out) {
39
39
 
40
40
  /*double *snd_buffer=NULL, *rcv_buffer=NULL;*/
41
 
  Paso_MPIInfo *mpi_info=A->mpi_info;
 
41
  Esys_MPIInfo *mpi_info=A->mpi_info;
42
42
 
43
43
  if (A->type & MATRIX_FORMAT_CSC) {
44
44
     if ( mpi_info->size>1) {
45
 
           Paso_setError(SYSTEM_ERROR,"Paso_SystemMatrix_MatrixVector: CSC is not supported by MPI.");
 
45
           Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_MatrixVector: CSC is not supported by MPI.");
46
46
           return;
47
47
     } else {
48
48
       if (A->type & MATRIX_FORMAT_OFFSET1) {
52
52
       }
53
53
     }
54
54
  } else if (A->type & MATRIX_FORMAT_TRILINOS_CRS) {
55
 
           Paso_setError(SYSTEM_ERROR,"Paso_SystemMatrix_MatrixVector: TRILINOS is not supported with MPI.");
 
55
           Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_MatrixVector: TRILINOS is not supported with MPI.");
56
56
           return;
57
57
  } else {
58
58
     if (A->type & MATRIX_FORMAT_OFFSET1) {
59
59
           if ( mpi_info->size>1) {
60
 
              Paso_setError(SYSTEM_ERROR,"Paso_SystemMatrix_MatrixVector: CSR with index 1 is not supported by MPI.");
 
60
              Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_MatrixVector: CSR with index 1 is not supported by MPI.");
61
61
              return;
62
62
           } else {
63
63
              Paso_SparseMatrix_MatrixVector_CSR_OFFSET1(alpha,A->mainBlock,in,beta,out);
64
64
           }
65
65
     } else {
66
 
         if (Paso_noError()) {
 
66
         if (Esys_noError()) {
67
67
            Paso_SystemMatrix_MatrixVector_CSR_OFFSET0(alpha,A,in,beta,out);
68
68
         }
69
69
     }