CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented a few corrections

Browse Source
This commit is contained in:
ulrikey 1999-07-06 19:49:37 +00:00
parent 6a833f80d9
commit f80f05ae5f
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
IJ_matrix_vector/HYPRE_IJMatrix.c
View File

@ -176,7 +176,7 @@ HYPRE_SetIJMatrixLocalStorageType( HYPRE_IJMatrix IJmatrix, int type )
int ierr = 0; int ierr = 0;
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
hypre_IJMatrixLocalStorage(matrix) = local_storage; hypre_IJMatrixLocalStorageType(matrix) = type;
return(ierr); return(ierr);
} }
@ -209,11 +209,11 @@ HYPRE_SetIJMatrixDiagRowSizes( HYPRE_IJMatrix IJmatrix, int *sizes )
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX ) if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX )
ierr = hypre_SetIJMatrixDiagRowSizesPETSc( matrix ); ierr = hypre_SetIJMatrixDiagRowSizesPETSc( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX )
ierr = hypre_SetIJMatrixDiagRowSizesISIS( matrix ); ierr = hypre_SetIJMatrixDiagRowSizesISIS( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX )
ierr = hypre_SetIJMatrixDiagRowSizesParcsr( matrix ); ierr = hypre_SetIJMatrixDiagRowSizesParcsr( matrix , sizes );
else else
ierr = -1; ierr = -1;
@ -250,11 +250,11 @@ HYPRE_SetIJMatrixOffDiagRowSizes( HYPRE_IJMatrix IJmatrix, int *sizes )
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX ) if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX )
ierr = hypre_SetIJMatrixOffDiagRowSizesPETSc( matrix ); ierr = hypre_SetIJMatrixOffDiagRowSizesPETSc( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX )
ierr = hypre_SetIJMatrixOffDiagRowSizesISIS( matrix ); ierr = hypre_SetIJMatrixOffDiagRowSizesISIS( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX )
ierr = hypre_SetIJMatrixOffDiagRowSizesParcsr( matrix ); ierr = hypre_SetIJMatrixOffDiagRowSizesParcsr( matrix , sizes );
else else
ierr = -1; ierr = -1;
@ -288,11 +288,11 @@ HYPRE_SetIJMatrixTotalSize( HYPRE_IJMatrix IJmatrix, int size )
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX ) if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX )
ierr = hypre_SetIJMatrixTotalSizePETSc( matrix ); ierr = hypre_SetIJMatrixTotalSizePETSc( matrix , size );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX )
ierr = hypre_SetIJMatrixTotalSizeISIS( matrix ); ierr = hypre_SetIJMatrixTotalSizeISIS( matrix , size );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX )
ierr = hypre_SetIJMatrixTotalSizeParcsr( matrix ); ierr = hypre_SetIJMatrixTotalSizeParcsr( matrix , size );
else else
ierr = -1; ierr = -1;
@ -451,11 +451,10 @@ Not collective.
@return integer error code @return integer error code
@param HYPRE_IJMatrix &matrix [IN] @param HYPRE_IJMatrix &matrix [IN]
the matrix to be operated on. the matrix to be operated on.
@param int m, n [IN] @param int n [IN]
the size of the block of values to be added. the number of values in the row to be inserted.
@param int *rows [IN] @param int row [IN]
an integer vector of length m giving the indices in the global matrix index of row to be inserted.
corresponding to the rows in "values".
@param int *cols [IN] @param int *cols [IN]
an integer vector of length n giving the indices in the global matrix an integer vector of length n giving the indices in the global matrix
corresponding to the columns in "values". corresponding to the columns in "values".

29
IJ_mv/HYPRE_IJMatrix.c
View File

@ -176,7 +176,7 @@ HYPRE_SetIJMatrixLocalStorageType( HYPRE_IJMatrix IJmatrix, int type )
int ierr = 0; int ierr = 0;
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
hypre_IJMatrixLocalStorage(matrix) = local_storage; hypre_IJMatrixLocalStorageType(matrix) = type;
return(ierr); return(ierr);
} }
@ -209,11 +209,11 @@ HYPRE_SetIJMatrixDiagRowSizes( HYPRE_IJMatrix IJmatrix, int *sizes )
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX ) if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX )
ierr = hypre_SetIJMatrixDiagRowSizesPETSc( matrix ); ierr = hypre_SetIJMatrixDiagRowSizesPETSc( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX )
ierr = hypre_SetIJMatrixDiagRowSizesISIS( matrix ); ierr = hypre_SetIJMatrixDiagRowSizesISIS( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX )
ierr = hypre_SetIJMatrixDiagRowSizesParcsr( matrix ); ierr = hypre_SetIJMatrixDiagRowSizesParcsr( matrix , sizes );
else else
ierr = -1; ierr = -1;
@ -250,11 +250,11 @@ HYPRE_SetIJMatrixOffDiagRowSizes( HYPRE_IJMatrix IJmatrix, int *sizes )
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX ) if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX )
ierr = hypre_SetIJMatrixOffDiagRowSizesPETSc( matrix ); ierr = hypre_SetIJMatrixOffDiagRowSizesPETSc( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX )
ierr = hypre_SetIJMatrixOffDiagRowSizesISIS( matrix ); ierr = hypre_SetIJMatrixOffDiagRowSizesISIS( matrix , sizes );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX )
ierr = hypre_SetIJMatrixOffDiagRowSizesParcsr( matrix ); ierr = hypre_SetIJMatrixOffDiagRowSizesParcsr( matrix , sizes );
else else
ierr = -1; ierr = -1;
@ -288,11 +288,11 @@ HYPRE_SetIJMatrixTotalSize( HYPRE_IJMatrix IJmatrix, int size )
hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix; hypre_IJMatrix *matrix = (hypre_IJMatrix *) IJmatrix;
if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX ) if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PETSC_MATRIX )
ierr = hypre_SetIJMatrixTotalSizePETSc( matrix ); ierr = hypre_SetIJMatrixTotalSizePETSc( matrix , size );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_ISIS_MATRIX )
ierr = hypre_SetIJMatrixTotalSizeISIS( matrix ); ierr = hypre_SetIJMatrixTotalSizeISIS( matrix , size );
else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX ) else if ( hypre_IJMatrixLocalStorageType(matrix) == HYPRE_PARCSR_MATRIX )
ierr = hypre_SetIJMatrixTotalSizeParcsr( matrix ); ierr = hypre_SetIJMatrixTotalSizeParcsr( matrix , size );
else else
ierr = -1; ierr = -1;
@ -451,11 +451,10 @@ Not collective.
@return integer error code @return integer error code
@param HYPRE_IJMatrix &matrix [IN] @param HYPRE_IJMatrix &matrix [IN]
the matrix to be operated on. the matrix to be operated on.
@param int m, n [IN] @param int n [IN]
the size of the block of values to be added. the number of values in the row to be inserted.
@param int *rows [IN] @param int row [IN]
an integer vector of length m giving the indices in the global matrix index of row to be inserted.
corresponding to the rows in "values".
@param int *cols [IN] @param int *cols [IN]
an integer vector of length n giving the indices in the global matrix an integer vector of length n giving the indices in the global matrix
corresponding to the columns in "values". corresponding to the columns in "values".