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

linearUpwind: Simplified the vector specialization

Browse Source
This commit is contained in:
Henry Weller
2016-09-21 11:09:59 +01:00
parent bd0b363292
commit 481f8e5b97
1 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
View File

@ -99,11 +99,8 @@ Foam::linearUpwind<Type>::correction
if (pSfCorr.coupled()) if (pSfCorr.coupled())
{ {
const labelUList& pOwner = const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi]; const vectorField& pCf = Cf.boundaryField()[patchi];
const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi]; const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
const vectorField pGradVfNei const vectorField pGradVfNei
@ -151,9 +148,9 @@ Foam::linearUpwind<Foam::vector>::correction
{ {
const fvMesh& mesh = this->mesh(); const fvMesh& mesh = this->mesh();
tmp<GeometricField<vector, fvsPatchField, surfaceMesh>> tsfCorr tmp<surfaceVectorField> tsfCorr
( (
new GeometricField<vector, fvsPatchField, surfaceMesh> new surfaceVectorField
( (
IOobject IOobject
( (
@ -169,7 +166,7 @@ Foam::linearUpwind<Foam::vector>::correction
) )
); );
GeometricField<vector, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr.ref(); surfaceVectorField& sfCorr = tsfCorr.ref();
const surfaceScalarField& faceFlux = this->faceFlux_; const surfaceScalarField& faceFlux = this->faceFlux_;
@ -188,47 +185,30 @@ Foam::linearUpwind<Foam::vector>::correction
) )
); );
tmp tmp<volTensorField> tgradVf = gradScheme_().grad(vf, gradSchemeName_);
< const volTensorField& gradVf = tgradVf();
GeometricField
<
typename outerProduct<vector, vector>::type,
fvPatchField,
volMesh
>
> tgradVf = gradScheme_().grad(vf, gradSchemeName_);
const GeometricField
<
typename outerProduct<vector, vector>::type,
fvPatchField,
volMesh
>& gradVf = tgradVf();
forAll(faceFlux, facei) forAll(faceFlux, facei)
{ {
label celli = (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei]; const label celli =
(faceFlux[facei] > 0) ? owner[facei] : neighbour[facei];
sfCorr[facei] = (Cf[facei] - C[celli]) & gradVf[celli]; sfCorr[facei] = (Cf[facei] - C[celli]) & gradVf[celli];
} }
typename GeometricField<vector, fvsPatchField, surfaceMesh>:: typename surfaceVectorField::Boundary& bSfCorr = sfCorr.boundaryFieldRef();
Boundary& bSfCorr = sfCorr.boundaryFieldRef();
forAll(bSfCorr, patchi) forAll(bSfCorr, patchi)
{ {
fvsPatchField<vector>& pSfCorr = bSfCorr[patchi]; fvsPatchVectorField& pSfCorr = bSfCorr[patchi];
if (pSfCorr.coupled()) if (pSfCorr.coupled())
{ {
const labelUList& pOwner = const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi]; const vectorField& pCf = Cf.boundaryField()[patchi];
const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi]; const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
const Field<typename outerProduct<vector, vector>::type> pGradVfNei const tensorField pGradVfNei
( (
gradVf.boundaryField()[patchi].patchNeighbourField() gradVf.boundaryField()[patchi].patchNeighbourField()
); );