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

Fix sanity checks of hypre_SeqVectorElmdivpy (#704)

Browse Source 
This fixes the regression test failure reported in #703.
This commit is contained in:
Victor A. Paludetto Magri 2022-08-01 07:44:06 -07:00 committed by GitHub
parent fac5ba173f
commit 6845385dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/seq_mv/vector.c
View File

@ -621,7 +621,16 @@ hypre_SeqVectorAxpy( HYPRE_Complex alpha,
return hypre_error_flag; return hypre_error_flag;
} }
/* y = y + x ./ b */ /*--------------------------------------------------------------------------
* hypre_SeqVectorElmdivpy
*
* Computes: y = y + x ./ b
*
* Notes:
* 1) y and b must have the same sizes
* 2) x_size can be larger than y_size
*--------------------------------------------------------------------------*/
HYPRE_Int HYPRE_Int
hypre_SeqVectorElmdivpy( hypre_Vector *x, hypre_SeqVectorElmdivpy( hypre_Vector *x,
hypre_Vector *b, hypre_Vector *b,
@ -637,17 +646,22 @@ hypre_SeqVectorElmdivpy( hypre_Vector *x,
HYPRE_Int num_vectors_x = hypre_VectorNumVectors(x); HYPRE_Int num_vectors_x = hypre_VectorNumVectors(x);
HYPRE_Int num_vectors_y = hypre_VectorNumVectors(y); HYPRE_Int num_vectors_y = hypre_VectorNumVectors(y);
HYPRE_Int num_vectors_b = hypre_VectorNumVectors(b); HYPRE_Int num_vectors_b = hypre_VectorNumVectors(b);
HYPRE_Int size = hypre_VectorSize(x); HYPRE_Int size = hypre_VectorSize(y);
/* Sanity checks */ /* Sanity checks */
if (hypre_VectorSize(x) != hypre_VectorSize(y) || if (hypre_VectorSize(y) != hypre_VectorSize(b))
hypre_VectorSize(y) != hypre_VectorSize(b))
{ {
hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: size of x, y, and b do not match!\n"); hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: sizes of y and b do not match!\n");
return hypre_error_flag; return hypre_error_flag;
} }
/* row-wise multivec is not supportted */ if (hypre_VectorSize(x) < hypre_VectorSize(y))
{
hypre_error_w_msg(HYPRE_ERROR_GENERIC, "Error: x_size is smaller than y_size!\n");
return hypre_error_flag;
}
/* row-wise multivec is not supported */
hypre_assert(hypre_VectorMultiVecStorageMethod(x) == 0); hypre_assert(hypre_VectorMultiVecStorageMethod(x) == 0);
hypre_assert(hypre_VectorMultiVecStorageMethod(b) == 0); hypre_assert(hypre_VectorMultiVecStorageMethod(b) == 0);
hypre_assert(hypre_VectorMultiVecStorageMethod(y) == 0); hypre_assert(hypre_VectorMultiVecStorageMethod(y) == 0);