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

Moved initial calculation of i_prod_0 and added logic to compute

Browse Source 
it in the correct norm (two norm or preconditioner norm).
Previous code incorrectly used two norm always.
This commit is contained in:
jjones 2002-03-21 23:50:00 +00:00
parent f1c249c36e
commit 8a554a9650
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
krylov/pcg.c
View File

@ -304,10 +304,21 @@ hypre_PCGSolve( void *pcg_vdata,
(*(pcg_functions->CopyVector))(b, r);
(*(pcg_functions->Matvec))(matvec_data, -1.0, A, x, 1.0, r);
/* p = C*r */
(*(pcg_functions->ClearVector))(p);
precond(precond_data, A, r, p);
/* gamma = <r,p> */
gamma = (*(pcg_functions->InnerProd))(r,p);
/* Set initial residual norm */
if (logging > 0 || cf_tol > 0.0)
{
i_prod_0 = (*(pcg_functions->InnerProd))(r,r);
if (two_norm)
i_prod_0 = (*(pcg_functions->InnerProd))(r,r);
else
i_prod_0 = gamma;
if (logging > 0) norms[0] = sqrt(i_prod_0);
}
if ( logging > 1 && my_id==0 ) /* formerly for par_csr only */
@ -331,14 +342,6 @@ hypre_PCGSolve( void *pcg_vdata,
}
}
/* p = C*r */
(*(pcg_functions->ClearVector))(p);
precond(precond_data, A, r, p);
/* gamma = <r,p> */
gamma = (*(pcg_functions->InnerProd))(r,p);
while ((i+1) <= max_iter)
{
i++;