Commit ee574dbb authored by Mark Olesen's avatar Mark Olesen

COMP: avoid ambiguous construct from tmp - surfaceInterpolation

parent c4bbc00d
......@@ -103,22 +103,33 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
const scalarField& pCDweights = CDweights.boundaryField()[patchi];
const scalarField& pFaceFlux =
this->faceFlux_.boundaryField()[patchi];
Field<typename Limiter::phiType> plPhiP =
lPhi.boundaryField()[patchi].patchInternalField();
Field<typename Limiter::phiType> plPhiN =
lPhi.boundaryField()[patchi].patchNeighbourField();
Field<typename Limiter::gradPhiType> pGradcP =
gradc.boundaryField()[patchi].patchInternalField();
Field<typename Limiter::gradPhiType> pGradcN =
gradc.boundaryField()[patchi].patchNeighbourField();
const Field<typename Limiter::phiType> plPhiP
(
lPhi.boundaryField()[patchi].patchInternalField()
);
const Field<typename Limiter::phiType> plPhiN
(
lPhi.boundaryField()[patchi].patchNeighbourField()
);
const Field<typename Limiter::gradPhiType> pGradcP
(
gradc.boundaryField()[patchi].patchInternalField()
);
const Field<typename Limiter::gradPhiType> pGradcN
(
gradc.boundaryField()[patchi].patchNeighbourField()
);
// Build the d-vectors
vectorField pd =
vectorField pd
(
mesh.Sf().boundaryField()[patchi]
/(
mesh.magSf().boundaryField()[patchi]
*mesh.deltaCoeffs().boundaryField()[patchi]
);
/ (
mesh.magSf().boundaryField()[patchi]
* mesh.deltaCoeffs().boundaryField()[patchi]
)
);
if (!mesh.orthogonal())
{
......
......@@ -115,10 +115,15 @@ Foam::PhiScheme<Type, PhiLimiter>::limiter
const vectorField& pSf = Sf.boundaryField()[patchI];
const scalarField& pmagSf = magSf.boundaryField()[patchI];
const scalarField& pFaceFlux = Uflux.boundaryField()[patchI];
Field<Type> pphiP =
phi.boundaryField()[patchI].patchInternalField();
Field<Type> pphiN =
phi.boundaryField()[patchI].patchNeighbourField();
const Field<Type> pphiP
(
phi.boundaryField()[patchI].patchInternalField()
);
const Field<Type> pphiN
(
phi.boundaryField()[patchI].patchNeighbourField()
);
forAll(pLimiter, face)
{
......
......@@ -114,16 +114,20 @@ Foam::linearUpwind<Type>::correction
const scalarField& pFaceFlux = faceFlux.boundaryField()[patchi];
Field<typename outerProduct<vector, Type>::type> pGradVfNei =
gradVf.boundaryField()[patchi].patchNeighbourField();
const Field<typename outerProduct<vector, Type>::type> pGradVfNei
(
gradVf.boundaryField()[patchi].patchNeighbourField()
);
// Build the d-vectors
vectorField pd =
vectorField pd
(
mesh.Sf().boundaryField()[patchi]
/(
mesh.magSf().boundaryField()[patchi]
*mesh.deltaCoeffs().boundaryField()[patchi]
);
/ (
mesh.magSf().boundaryField()[patchi]
* mesh.deltaCoeffs().boundaryField()[patchi]
)
);
if (!mesh.orthogonal())
{
......
......@@ -63,8 +63,10 @@ Foam::multivariateScheme<Type, Scheme>::multivariateScheme
typename multivariateSurfaceInterpolationScheme<Type>::
fieldTable::const_iterator iter = this->fields().begin();
surfaceScalarField limiter =
Scheme(mesh, faceFlux_, *this).limiter(*iter());
surfaceScalarField limiter
(
Scheme(mesh, faceFlux_, *this).limiter(*iter())
);
for (++iter; iter != this->fields().end(); ++iter)
{
......
......@@ -66,7 +66,7 @@ Foam::multivariateSelectionScheme<Type>::multivariateSelectionScheme
typename multivariateSurfaceInterpolationScheme<Type>::
fieldTable::const_iterator iter = this->fields().begin();
surfaceScalarField limiter =
surfaceScalarField limiter
(
limitedSurfaceInterpolationScheme<Type>::New
(
......
......@@ -118,11 +118,13 @@ public:
// calculate the appropriate interpolation factors
const surfaceScalarField& lambda = mesh.weights();
surfaceScalarField kSc =
lambda*(scalar(1) - lambda*(scalar(3) - scalar(2)*lambda));
const surfaceScalarField kSc
(
lambda*(scalar(1) - lambda*(scalar(3) - scalar(2)*lambda))
);
surfaceScalarField kVecP = sqr(scalar(1) - lambda)*lambda;
surfaceScalarField kVecN = sqr(lambda)*(lambda - scalar(1));
const surfaceScalarField kVecP(sqr(scalar(1) - lambda)*lambda);
const surfaceScalarField kVecN(sqr(lambda)*(lambda - scalar(1)));
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
(
......
......@@ -84,7 +84,7 @@ void Foam::skewCorrectionVectors::makeSkewCorrectionVectors() const
const labelUList& owner = mesh_.owner();
// Build the d-vectors
surfaceVectorField d = Sf/(mesh_.magSf()*mesh_.deltaCoeffs());
surfaceVectorField d(Sf/(mesh_.magSf()*mesh_.deltaCoeffs()));
if (!mesh_.orthogonal())
{
......
......@@ -321,7 +321,7 @@ void surfaceInterpolation::makeCorrectionVectors() const
const fvPatch& p = patchcorrVecs.patch();
vectorField patchDeltas = mesh_.boundary()[patchi].delta();
const vectorField patchDeltas(mesh_.boundary()[patchi].delta());
forAll(p, patchFacei)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment