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

Added virtual functions; removed looks in boundary FV data updates for IB patch

Browse source
This commit is contained in:
Hrvoje Jasak 2019-03-22 13:33:07 +00:00
parent 60fa49504f
commit 24043c0817
1 changed files with 43 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatch/immersedBoundaryFvPatch.C
View file

@ -60,28 +60,10 @@ void Foam::immersedBoundaryFvPatch::makeCf(slicedSurfaceVectorField& Cf) const
// Insert the patch data for the immersed boundary // Insert the patch data for the immersed boundary
// Note: use the face centres from the stand-alone patch within the IB // Note: use the face centres from the stand-alone patch within the IB
// HJ, 30/Nov/2017 // HJ, 30/Nov/2017
// NOTE: Loop though all ib boundaries in order to update the fields Cf.boundaryField()[index()].UList::operator=
// overwritten by reset. Needed for multiple IB patches (IG 2/Nov/2018) (
const fvMesh& mesh = boundaryMesh().mesh(); vectorField::subField(ibPolyPatch_.ibPatch().faceCentres(), size())
forAll(mesh.boundary(), patchI) );
{
if(isA<immersedBoundaryFvPatch>(mesh.boundary()[patchI]))
{
const immersedBoundaryFvPatch& curIbPatch = refCast
<
const immersedBoundaryFvPatch
>(mesh.boundary()[patchI]);
Cf.boundaryField()[patchI].UList::operator=
(
vectorField::subField
(
curIbPatch.ibPolyPatch().ibPatch().faceCentres(),
curIbPatch.size()
)
);
}
}
} }
@ -94,28 +76,10 @@ void Foam::immersedBoundaryFvPatch::makeSf(slicedSurfaceVectorField& Sf) const
// Note: use the corrected face areas from immersed boundary instead of // Note: use the corrected face areas from immersed boundary instead of
// the stand-alone patch areas within the IB // the stand-alone patch areas within the IB
// HJ, 30/Nov/2017 // HJ, 30/Nov/2017
// NOTE: Loop though all ib boundaries in order to update the fields Sf.boundaryField()[index()].UList::operator=
// overwritten by reset. Needed for multiple IB patches (IG 2/Nov/2018) (
const fvMesh& mesh = boundaryMesh().mesh(); vectorField::subField(ibPolyPatch_.correctedIbPatchFaceAreas(), size())
forAll(mesh.boundary(), patchI) );
{
if(isA<immersedBoundaryFvPatch>(mesh.boundary()[patchI]))
{
const immersedBoundaryFvPatch& curIbPatch = refCast
<
const immersedBoundaryFvPatch
>(mesh.boundary()[patchI]);
Sf.boundaryField()[patchI].UList::operator=
(
vectorField::subField
(
curIbPatch.ibPolyPatch().correctedIbPatchFaceAreas(),
curIbPatch.size()
)
);
}
}
} }
@ -131,28 +95,10 @@ void Foam::immersedBoundaryFvPatch::makeC(slicedVolVectorField& C) const
// Insert the patch data for the immersed boundary // Insert the patch data for the immersed boundary
// Note: use the face centres from the stand-alone patch within the IB // Note: use the face centres from the stand-alone patch within the IB
// HJ, 30/Nov/2017 // HJ, 30/Nov/2017
// NOTE: Loop though all ib boundaries in order to update the fields C.boundaryField()[index()].UList::operator=
// overwritten by reset. Needed for multiple IB patches (IG 2/Nov/2018) (
const fvMesh& mesh = boundaryMesh().mesh(); vectorField::subField(ibPolyPatch_.ibPatch().faceCentres(), size())
forAll(mesh.boundary(), patchI) );
{
if(isA<immersedBoundaryFvPatch>(mesh.boundary()[patchI]))
{
const immersedBoundaryFvPatch& curIbPatch = refCast
<
const immersedBoundaryFvPatch
>(mesh.boundary()[patchI]);
C.boundaryField()[patchI].UList::operator=
(
vectorField::subField
(
curIbPatch.ibPolyPatch().ibPatch().faceCentres(),
curIbPatch.size()
)
);
}
}
} }
@ -285,10 +231,10 @@ void Foam::immersedBoundaryFvPatch::updatePhi
scalar corrOldVol = newVols[cellI] - divPhi[cellI]*deltaT; scalar corrOldVol = newVols[cellI] - divPhi[cellI]*deltaT;
// Info<< "Flux maneouvre for cell " << cellI << ": " // Info<< "Flux maneouvre for cell " << cellI << ": "
// << " error: " << magDivPhi[cellI]
// << " V: " << newVols[cellI] // << " V: " << newVols[cellI]
// << " V0: " << oldVols[cellI] // << " V0: " << oldVols[cellI]
// << " divPhi: " << divPhi[cellI] // << " divPhi: " << divPhi[cellI];
// << " error: " << magDivPhi[cellI];
if (corrOldVol < SMALL) if (corrOldVol < SMALL)
{ {
@ -305,6 +251,17 @@ void Foam::immersedBoundaryFvPatch::updatePhi
} }
void Foam::immersedBoundaryFvPatch::makeDeltaCoeffs
(
fvsPatchScalarField& dc
) const
{
const vectorField d = delta();
dc = 1.0/max((nf() & d), 0.05*mag(d));
}
void Foam::immersedBoundaryFvPatch::makeCorrVecs(fvsPatchVectorField& cv) const void Foam::immersedBoundaryFvPatch::makeCorrVecs(fvsPatchVectorField& cv) const
{ {
// Set patch non-orthogonality correction to zero // Set patch non-orthogonality correction to zero
@ -383,4 +340,22 @@ Foam::immersedBoundaryFvPatch::faceCells() const
} }
Foam::tmp<Foam::vectorField> Foam::immersedBoundaryFvPatch::nf() const
{
// The algorithm has been changed because basic IB patch information
// (nf and delta) is used in assembly of derived information
// (eg. deltaCoeffs) and circular dependency needs to be avoided.
// nf and delta vectors shall be calculated directly from the intersected
// patch. HJ, 21/Mar/2019
return ibPolyPatch_.ibPatch().faceNormals();
}
Foam::tmp<Foam::vectorField> Foam::immersedBoundaryFvPatch::delta() const
{
return ibPolyPatch_.ibPatch().faceCentres() - Cn();
}
// ************************************************************************* // // ************************************************************************* //