Made changes to reflect PETSc 2.0.21: an MPIAIJ matrix on a single processor
is now stored as an SEQAIJ matrix and this broke some tests. The tests were unnecessary, though, since we now no longer break PETSc's encapsulation and instead use only the user interface.
This commit is contained in:
parent
ad0d5ed633
commit
753c2bed08
@ -69,13 +69,9 @@ hypre_GetDistributedMatrixLocalRangePETSc( hypre_DistributedMatrix *matrix,
|
||||
int ierr=0;
|
||||
#ifdef PETSC_AVAILABLE
|
||||
Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(matrix);
|
||||
MatType PETScType;
|
||||
|
||||
if (!PETSc_matrix) return(-1);
|
||||
|
||||
ierr = MatGetType( PETSc_matrix, &PETScType, NULL ); CHKERRA(ierr);
|
||||
|
||||
if (PETScType != MATMPIAIJ) return(-1);
|
||||
|
||||
ierr = MatGetOwnershipRange( PETSc_matrix, start, end ); CHKERRA(ierr);
|
||||
#endif
|
||||
@ -97,14 +93,9 @@ hypre_GetDistributedMatrixRowPETSc( hypre_DistributedMatrix *matrix,
|
||||
int ierr;
|
||||
#ifdef PETSC_AVAILABLE
|
||||
Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(matrix);
|
||||
MatType PETScType;
|
||||
|
||||
if (!PETSc_matrix) return(-1);
|
||||
|
||||
ierr = MatGetType( PETSc_matrix, &PETScType, NULL ); CHKERRA(ierr);
|
||||
|
||||
if (PETScType != MATMPIAIJ) return(-1);
|
||||
|
||||
ierr = MatGetRow( PETSc_matrix, row, size, col_ind, values); CHKERRA(ierr);
|
||||
#endif
|
||||
|
||||
@ -125,14 +116,9 @@ hypre_RestoreDistributedMatrixRowPETSc( hypre_DistributedMatrix *matrix,
|
||||
int ierr;
|
||||
#ifdef PETSC_AVAILABLE
|
||||
Mat PETSc_matrix = (Mat) hypre_DistributedMatrixLocalStorage(matrix);
|
||||
MatType PETScType;
|
||||
|
||||
if (PETSc_matrix == NULL) return(-1);
|
||||
|
||||
ierr = MatGetType( PETSc_matrix, &PETScType, NULL ); CHKERRA(ierr);
|
||||
|
||||
if (PETScType != MATMPIAIJ) return(-1);
|
||||
|
||||
ierr = MatRestoreRow( PETSc_matrix, row, size, col_ind, values); CHKERRA(ierr);
|
||||
#endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user