LduMatrix: Added support for both component-coupled and component-independent forms of PCG and PBiCG

This commit is contained in:
Henry
2012-04-26 11:41:06 +01:00
parent 4305e7dd6b
commit 4ff7ac3efe
12 changed files with 87 additions and 62 deletions

View File

@ -365,7 +365,7 @@ scalar sumProd(const UList<Type>& f1, const UList<Type>& f2)
if (f1.size() && (f1.size() == f2.size()))
{
scalar SumProd = 0.0;
TFOR_ALL_S_OP_F_OP_F(scalar, SumProd, +=, Type, f1, *, Type, f2)
TFOR_ALL_S_OP_F_OP_F(scalar, SumProd, +=, Type, f1, &&, Type, f2)
return SumProd;
}
else
@ -498,7 +498,7 @@ template<class Type>
scalar gSumProd(const UList<Type>& f1, const UList<Type>& f2)
{
scalar SumProd = sumProd(f1, f2);
reduce(SumProd, sumOp<Type>());
reduce(SumProd, sumOp<scalar>());
return SumProd;
}