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

Remove bug for object type HYPRE_STRUCT.

Browse Source
This commit is contained in:
barrylee 2008-02-01 23:07:59 +00:00
parent 0f31c7cd07
commit bc1223dba9
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sstruct_mv/sstruct_innerprod.c
View File

@ -89,7 +89,7 @@ hypre_SStructInnerProd( hypre_SStructVector *x,
result = 0.0;
if (x_object_type == HYPRE_SSTRUCT)
if ( (x_object_type == HYPRE_SSTRUCT) || (x_object_type == HYPRE_STRUCT) )
{
for (part = 0; part < nparts; part++)
{

32
sstruct_mv/sstruct_matvec.c
View File

@ -321,7 +321,7 @@ hypre_SStructMatvecCompute( void *matvec_vdata,
printf("possible error: A and x are different object types\n");
}
if (x_object_type == HYPRE_SSTRUCT)
if ( (x_object_type == HYPRE_SSTRUCT) || (x_object_type == HYPRE_STRUCT) )
{
/* do S-matrix computations */
for (part = 0; part < nparts; part++)
@ -333,25 +333,29 @@ hypre_SStructMatvecCompute( void *matvec_vdata,
hypre_SStructPMatvecCompute(pdata, alpha, pA, px, beta, py);
}
/* do U-matrix computations */
if ( (x_object_type == HYPRE_SSTRUCT) )
{
/* GEC1002 the data chunk pointed by the local-parvectors
* inside the semistruct vectors x and y is now identical to the
* data chunk of the structure vectors x and y. The role of the function
* convert is to pass the addresses of the data chunk
* to the parx and pary. */
/* do U-matrix computations */
hypre_SStructVectorConvert(x, &parx);
hypre_SStructVectorConvert(y, &pary);
/* GEC1002 the data chunk pointed by the local-parvectors
* inside the semistruct vectors x and y is now identical to the
* data chunk of the structure vectors x and y. The role of the function
* convert is to pass the addresses of the data chunk
* to the parx and pary. */
hypre_ParCSRMatrixMatvec(alpha, parcsrA, parx, 1.0, pary);
hypre_SStructVectorConvert(x, &parx);
hypre_SStructVectorConvert(y, &pary);
/* dummy functions since there is nothing to restore */
hypre_ParCSRMatrixMatvec(alpha, parcsrA, parx, 1.0, pary);
hypre_SStructVectorRestore(x, NULL);
hypre_SStructVectorRestore(y, pary);
/* dummy functions since there is nothing to restore */
parx = NULL;
hypre_SStructVectorRestore(x, NULL);
hypre_SStructVectorRestore(y, pary);
parx = NULL;
}
}