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

BUGFIX: Enable reference/delta detection in initInterfaceMatrixUpdate/updateInterfaceMatrix

Browse source
This commit is contained in:
Henrik Rusche 2013-02-19 23:26:14 +01:00
parent 43b9f45f20
commit debfe4a1a2
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/coupledMatrix/coupledFvMatrices/coupledFvMatrix/coupledFvMatrix.C
View file

@ -204,7 +204,7 @@ Foam::coupledFvMatrix<Type>::solve(const dictionary& solverControls)
}
}
// Correct boundart conditions
// Correct boundary conditions
forAll (matrices, rowI)
{
fvMatrix<Type>& curMatrix =

29
src/coupledMatrix/coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C
View file

@ -70,7 +70,10 @@ coupledSolverPerformance coupledFvMatrix<scalar>::solve
static_cast<fvScalarMatrix&>(matrices[rowI]);
saveDiag.set(rowI, new scalarField(curMatrix.diag()));
psi.set(rowI, new scalarField(curMatrix.psi()));
// HR 17/Feb/2013
// Need to be able to compare references to support hacks such as in jumpCyclic
// psi.set(rowI, new scalarField(curMatrix.psi()));
psi.set(rowI, &curMatrix.psi());
source.set(rowI, new scalarField(curMatrix.source()));
curMatrix.addBoundarySource(source[rowI], 0);
@ -111,16 +114,18 @@ coupledSolverPerformance coupledFvMatrix<scalar>::solve
solverPerf.print();
// HR 17/Feb/2013
// Not needed since reference is used
// Update solution
forAll (matrices, rowI)
{
fvScalarMatrix& curMatrix =
static_cast<fvScalarMatrix&>(matrices[rowI]);
//forAll (matrices, rowI)
//{
// fvScalarMatrix& curMatrix =
// static_cast<fvScalarMatrix&>(matrices[rowI]);
//
// curMatrix.psi().internalField() = psi[rowI];
//}
curMatrix.psi().internalField() = psi[rowI];
}
// Correct boundart conditions
// Correct boundary conditions
forAll (matrices, rowI)
{
fvScalarMatrix& curMatrix =
@ -129,6 +134,12 @@ coupledSolverPerformance coupledFvMatrix<scalar>::solve
curMatrix.psi().correctBoundaryConditions();
}
//HR 17.2.2013: Clear references to internal field without deleting the objects
forAll (matrices, rowI)
{
psi.set(rowI, NULL).ptr();
}
return solverPerf;
}