zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: Consistent addition of coefficients on mappedPAtch. Fixes #2294

Browse Source
This commit is contained in:
sergio
2021-12-13 13:57:49 -08:00
parent 7438aa6c01
commit 692734bc69
3 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/finiteVolume/lduPrimitiveMeshAssembly/lduPrimitiveMeshAssemblyTemplates.C
View File

@ -420,6 +420,7 @@ void Foam::lduPrimitiveMeshAssembly::update
faceBoundMap_[meshNrbId][nbrPatchId][subFaceI] =
nFaces;
++subFaceI;
++nFaces;
}

78
src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2012 OpenFOAM Foundation
Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -141,9 +142,17 @@ void Foam::mixedEnergyFvPatchScalarField::manipulateMatrix
label index = this->patch().index();
const label nbrPatchId = this->patch().patch().neighbPolyPatchID();
const label globalPatchID =
matrix.lduMeshAssembly().patchLocalToGlobalMap()[mat][index];
const label meshNrbId = matrix.lduMeshAssembly().findNbrMeshId
(
this->patch().patch(),
mat
);
const mixedFvPatchField<scalar>& fPatch =
refCast<const mixedFvPatchField>(thermo.T().boundaryField()[index]);
@ -154,37 +163,82 @@ void Foam::mixedEnergyFvPatchScalarField::manipulateMatrix
const scalarField sourceCorr(fPatch.source());
const labelUList& u = matrix.lduAddr().upperAddr();
const labelUList& l = matrix.lduAddr().lowerAddr();
const labelList& faceMap =
matrix.lduMeshAssembly().faceBoundMap()[mat][index];
const labelList& myCells =
matrix.lduMeshAssembly().cellBoundMap()[meshNrbId][nbrPatchId];
const labelList& nbrCells =
matrix.lduMeshAssembly().cellBoundMap()[mat][index];
forAll(faceMap, j)
{
label globalFaceI = faceMap[j];
if (globalFaceI != -1)
{
const scalar intCorr = -intCoeffsCmpt[j];
const scalar srcCorr = -sourceCorr[j];
label myCellI = myCells[j];
label nbrCellI = nbrCells[j];
if (this->patch().patch().masterImplicit())
const scalar intCorr = -intCoeffsCmpt[j];
const scalar srcCorr = -sourceCorr[j];
if (this->patch().patch().masterImplicit())
{
if (myCellI > nbrCellI)
{
matrix.diag()[u[globalFaceI]] -= intCorr;
if (matrix.asymmetric())
{
matrix.lower()[globalFaceI] += intCorr;
}
matrix.source()[u[globalFaceI]] += srcCorr;
}
else
{
matrix.diag()[l[globalFaceI]] -= intCorr;
matrix.upper()[globalFaceI] += intCorr;
matrix.source()[l[globalFaceI]] += srcCorr;
}
matrix.diag()[myCellI] -= intCorr;
matrix.source()[myCellI] += srcCorr;
}
else
{
if (myCellI < nbrCellI)
{
matrix.upper()[globalFaceI] += intCorr;
}
else
{
if (matrix.asymmetric())
{
matrix.lower()[globalFaceI] += intCorr;
}
}
matrix.diag()[myCellI] -= intCorr;
matrix.source()[myCellI] += srcCorr;
}
// if (globalFaceI != -1)
// {
// const scalar intCorr = -intCoeffsCmpt[j];
// const scalar srcCorr = -sourceCorr[j];
//
// if (this->patch().patch().masterImplicit())
// {
// matrix.diag()[u[globalFaceI]] -= intCorr;
// if (matrix.asymmetric())
// {
// matrix.lower()[globalFaceI] += intCorr;
// }
// matrix.source()[u[globalFaceI]] += srcCorr;
// }
// else
// {
// matrix.diag()[l[globalFaceI]] -= intCorr;
// matrix.upper()[globalFaceI] += intCorr;
// matrix.source()[l[globalFaceI]] += srcCorr;
// }
// }
}
}

1
src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.