exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BUGFIX: For the diagonal the size of the upper Matrix coefficients was used which led to an 'out of range'-error

Browse source 
--HG--
branch : bgschaid/minorAdditionsBranch
This commit is contained in:
Bernhard F.W. Gschaider 2013-07-18 23:59:38 +02:00
parent b07fe1c69f
commit c7121e7df2
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrixATmul.C
View file

@ -42,7 +42,7 @@ void Foam::BlockLduMatrix<Type>::Amul
// Initialise the update of coupled interfaces // Initialise the update of coupled interfaces
initInterfaces(coupleUpper_, Ax, x); initInterfaces(coupleUpper_, Ax, x);
AmulCore(Ax, x); AmulCore(Ax, x);
// Update coupled interfaces // Update coupled interfaces
@ -64,13 +64,13 @@ void Foam::BlockLduMatrix<Type>::AmulCore
const unallocLabelList& u = lduAddr().upperAddr(); const unallocLabelList& u = lduAddr().upperAddr();
const unallocLabelList& l = lduAddr().lowerAddr(); const unallocLabelList& l = lduAddr().lowerAddr();
const TypeCoeffField& Diag = this->diag(); const TypeCoeffField& Diag = this->diag();
const TypeCoeffField& Upper = this->upper(); const TypeCoeffField& Upper = this->upper();
// Create multiplication function object // Create multiplication function object
typename BlockCoeff<Type>::multiply mult; typename BlockCoeff<Type>::multiply mult;
// AmulCore must be additive to account for initialisation step // AmulCore must be additive to account for initialisation step
// in ldu interfaces. HJ, 6/Nov/2007 // in ldu interfaces. HJ, 6/Nov/2007
// Fixed by IC 19/Oct/2011 // Fixed by IC 19/Oct/2011
@ -78,7 +78,7 @@ void Foam::BlockLduMatrix<Type>::AmulCore
{ {
const scalarTypeField& activeDiag = Diag.asScalar(); const scalarTypeField& activeDiag = Diag.asScalar();
for (register label cellI = 0; cellI < u.size(); cellI++) for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{ {
Ax[cellI] += mult(activeDiag[cellI], x[cellI]); Ax[cellI] += mult(activeDiag[cellI], x[cellI]);
} }
@ -87,7 +87,7 @@ void Foam::BlockLduMatrix<Type>::AmulCore
{ {
const linearTypeField& activeDiag = Diag.asLinear(); const linearTypeField& activeDiag = Diag.asLinear();
for (register label cellI = 0; cellI < u.size(); cellI++) for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{ {
Ax[cellI] += mult(activeDiag[cellI], x[cellI]); Ax[cellI] += mult(activeDiag[cellI], x[cellI]);
} }
@ -96,7 +96,7 @@ void Foam::BlockLduMatrix<Type>::AmulCore
{ {
const squareTypeField& activeDiag = Diag.asSquare(); const squareTypeField& activeDiag = Diag.asSquare();
for (register label cellI = 0; cellI < u.size(); cellI++) for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{ {
Ax[cellI] += mult(activeDiag[cellI], x[cellI]); Ax[cellI] += mult(activeDiag[cellI], x[cellI]);
} }
@ -248,7 +248,7 @@ void Foam::BlockLduMatrix<Type>::TmulCore
{ {
const scalarTypeField& activeDiag = Diag.asScalar(); const scalarTypeField& activeDiag = Diag.asScalar();
for (register label cellI = 0; cellI < u.size(); cellI++) for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{ {
Tx[cellI] += mult(activeDiag[cellI], x[cellI]); Tx[cellI] += mult(activeDiag[cellI], x[cellI]);
} }
@ -257,7 +257,7 @@ void Foam::BlockLduMatrix<Type>::TmulCore
{ {
const linearTypeField& activeDiag = Diag.asLinear(); const linearTypeField& activeDiag = Diag.asLinear();
for (register label cellI = 0; cellI < u.size(); cellI++) for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{ {
Tx[cellI] += mult(activeDiag[cellI], x[cellI]); Tx[cellI] += mult(activeDiag[cellI], x[cellI]);
} }
@ -266,12 +266,12 @@ void Foam::BlockLduMatrix<Type>::TmulCore
{ {
const squareTypeField& activeDiag = Diag.asSquare(); const squareTypeField& activeDiag = Diag.asSquare();
for (register label cellI = 0; cellI < u.size(); cellI++) for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{ {
Tx[cellI] += mult(activeDiag[cellI].T(), x[cellI]); Tx[cellI] += mult(activeDiag[cellI].T(), x[cellI]);
} }
} }
// Upper multiplication // Upper multiplication
if (Upper.activeType() == blockCoeffBase::SCALAR) if (Upper.activeType() == blockCoeffBase::SCALAR)