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

removed warnings caused by strict checking

Browse Source
This commit is contained in:
ulrikey 2001-06-22 16:19:38 +00:00
parent e63138512b
commit 3c89cbe32e
5 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
IJ_mv/HYPRE_IJMatrix.c
View File

@ -172,27 +172,28 @@ int
HYPRE_IJMatrixInitialize( HYPRE_IJMatrix matrix )
{
hypre_IJMatrix *ijmatrix = (hypre_IJMatrix *) matrix;
int ierr = 0;
if (!ijmatrix)
{
printf("Variable ijmatrix is NULL -- HYPRE_IJMatrixInitialize\n");
exit(1);
return 1;
}
/* if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PETSC )
return( hypre_IJMatrixInitializePETSc( ijmatrix ) );
ierr = hypre_IJMatrixInitializePETSc( ijmatrix ) ;
else if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_ISIS )
return( hypre_IJMatrixInitializeISIS( ijmatrix ) );
ierr = hypre_IJMatrixInitializeISIS( ijmatrix ) ;
else */
if ( hypre_IJMatrixObjectType(ijmatrix) == HYPRE_PARCSR )
return( hypre_IJMatrixInitializeParCSR( ijmatrix ) );
ierr = hypre_IJMatrixInitializeParCSR( ijmatrix ) ;
else
{
printf("Unrecognized object type -- HYPRE_IJMatrixInitialize\n");
exit(1);
return 1;
}
return ierr;
}
/*--------------------------------------------------------------------------

2
IJ_mv/aux_parcsr_matrix.c
View File

@ -27,8 +27,6 @@ hypre_AuxParCSRMatrixCreate( hypre_AuxParCSRMatrix **aux_matrix,
int *sizes)
{
hypre_AuxParCSRMatrix *matrix;
int *row_space;
int i;
matrix = hypre_CTAlloc(hypre_AuxParCSRMatrix, 1);

33
IJ_mv/hypre_IJMatrix_parcsr.c
View File

@ -170,7 +170,6 @@ int
hypre_IJMatrixInitializeParCSR(hypre_IJMatrix *matrix)
{
int ierr = 0;
MPI_Comm comm = hypre_IJMatrixComm(matrix);
hypre_ParCSRMatrix *par_matrix = hypre_IJMatrixObject(matrix);
hypre_AuxParCSRMatrix *aux_matrix = hypre_IJMatrixTranslator(matrix);
int local_num_rows;
@ -538,8 +537,8 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix *matrix,
num_cols_offd);
if (j_offd == -1)
{
printf (" Error, element %d %d does not exist in ",
"structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
for (j=pos_offd; j < len_offd; j++)
@ -553,8 +552,8 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix *matrix,
}
if (not_found)
{
printf (" Error, element %d %d does not exist ",
"in structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
not_found = 1;
@ -564,8 +563,8 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix *matrix,
{
if (diag_j[pos_diag] != row_local)
{
printf (" Error, element %d %d does not exist in ",
"structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
diag_data[pos_diag] = values[indx];
@ -583,8 +582,8 @@ hypre_IJMatrixSetValuesParCSR( hypre_IJMatrix *matrix,
}
if (not_found)
{
printf (" Error, element %d %d does not exist in ",
"structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
}
@ -882,8 +881,8 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix *matrix,
num_cols_offd);
if (j_offd == -1)
{
printf (" Error, element %d %d does not exist in ",
"structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
for (j=pos_offd; j < len_offd; j++)
@ -897,8 +896,8 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix *matrix,
}
if (not_found)
{
printf (" Error, element %d %d does not exist in ",
"structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
not_found = 1;
@ -908,8 +907,8 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix *matrix,
{
if (diag_j[pos_diag] != row_local)
{
printf (" Error, element %d %d does not exist in ",
"structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
diag_data[pos_diag] += values[indx];
@ -927,8 +926,8 @@ hypre_IJMatrixAddToValuesParCSR( hypre_IJMatrix *matrix,
}
if (not_found)
{
printf (" Error, element %d %d does not exist in ",
"structure!\n", row, cols[indx]);
printf (" Error, element %d %d does not exist\n",
row, cols[indx]);
return -1;
}
}

1
IJ_mv/hypre_IJVector.c
View File

@ -51,7 +51,6 @@ hypre_IJVectorDistribute( HYPRE_IJVector vector, const int *vec_starts )
int
hypre_IJVectorZeroValues( HYPRE_IJVector vector )
{
int ierr = 0;
hypre_IJVector *vec = (hypre_IJVector *) vector;
if (vec == NULL)

3
IJ_mv/hypre_IJVector_parcsr.c
View File

@ -27,7 +27,6 @@ int
hypre_IJVectorCreatePar(hypre_IJVector *vector, int *IJpartitioning)
{
MPI_Comm comm = hypre_IJVectorComm(vector);
hypre_ParVector *par_vector = hypre_IJVectorObject(vector);
#if 0
if (par_vector)
@ -232,7 +231,6 @@ hypre_IJVectorSetValuesPar(hypre_IJVector *vector,
int *IJpartitioning = hypre_IJVectorPartitioning(vector);
hypre_ParVector *par_vector = hypre_IJVectorObject(vector);
MPI_Comm comm = hypre_IJVectorComm(vector);
int *partitioning = hypre_ParVectorPartitioning(par_vector);
hypre_Vector *local_vector = hypre_ParVectorLocalVector(par_vector);
/* If no components are to be set, perform no checking and return */
@ -434,7 +432,6 @@ hypre_IJVectorAssemblePar(hypre_IJVector *vector)
{
int *IJpartitioning = hypre_IJVectorPartitioning(vector);
hypre_ParVector *par_vector = hypre_IJVectorObject(vector);
MPI_Comm comm = hypre_IJVectorComm(vector);
int *partitioning = hypre_ParVectorPartitioning(par_vector);
if (!par_vector)