← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to paso/src/SystemMatrix_nullifyRows.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_nullifyRows.c
36
36
void Paso_SystemMatrix_nullifyRows(Paso_SystemMatrix* A, double* mask_row, double main_diagonal_value) {
37
37
 
38
38
  double* remote_values;
39
 
  /*Paso_MPIInfo *mpi_info=A->mpi_info;*/
 
39
  /*Esys_MPIInfo *mpi_info=A->mpi_info;*/
40
40
  if (A ->col_block_size==1 && A ->row_block_size ==1) {
41
41
       if (A->type & MATRIX_FORMAT_CSC) {
42
 
           Paso_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: CSC is not supported by MPI.");
 
42
           Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: CSC is not supported by MPI.");
43
43
           return;
44
44
       } else if (A->type & MATRIX_FORMAT_TRILINOS_CRS) {
45
 
           Paso_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: TRILINOS is not supported with MPI.");
 
45
           Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: TRILINOS is not supported with MPI.");
46
46
           return;
47
47
       } else {
48
 
         if (Paso_noError()) {
 
48
         if (Esys_noError()) {
49
49
            Paso_SystemMatrix_startRowCollect(A,mask_row);
50
50
            Paso_SparseMatrix_nullifyRows_CSR_BLK1(A->mainBlock,mask_row,main_diagonal_value);
51
51
            Paso_SparseMatrix_nullifyRows_CSR_BLK1(A->col_coupleBlock,mask_row,0.); 
55
55
       }
56
56
  } else {
57
57
       if (A->type & MATRIX_FORMAT_CSC) {
58
 
           Paso_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: CSC is not supported by MPI.");
 
58
           Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: CSC is not supported by MPI.");
59
59
           return;
60
60
       } else if (A->type & MATRIX_FORMAT_TRILINOS_CRS) {
61
 
           Paso_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: TRILINOS is not supported with MPI.");
 
61
           Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_nullifyRows: TRILINOS is not supported with MPI.");
62
62
           return;
63
63
       } else {
64
 
         if (Paso_noError()) {
 
64
         if (Esys_noError()) {
65
65
            Paso_SystemMatrix_startRowCollect(A,mask_row);
66
66
            Paso_SparseMatrix_nullifyRows_CSR(A->mainBlock,mask_row,main_diagonal_value);
67
67
            Paso_SparseMatrix_nullifyRows_CSR(A->col_coupleBlock,mask_row,0.);