zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: avoid ambiguous construct from tmp - fvMatrices, fvMesh

Browse Source
This commit is contained in:
Mark Olesen
2010-12-17 17:00:21 +01:00
parent d4560178e2
commit c4bbc00dd3
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -735,7 +735,7 @@ Foam::fvMatrix<Type>::H() const
// Loop over field components
for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
{
scalarField psiCmpt = psi_.internalField().component(cmpt);
scalarField psiCmpt(psi_.internalField().component(cmpt));
scalarField boundaryDiagCmpt(psi_.size(), 0.0);
addBoundaryDiag(boundaryDiagCmpt, cmpt);
@ -802,7 +802,7 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
/*
for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
{
scalarField psiCmpt = psi_.internalField().component(cmpt);
scalarField psiCmpt(psi_.internalField().component(cmpt));
scalarField boundaryDiagCmpt(psi_.size(), 0.0);
addBoundaryDiag(boundaryDiagCmpt, cmpt);
@ -2259,7 +2259,7 @@ Foam::operator&
// Loop over field components
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{
scalarField psiCmpt = psi.field().component(cmpt);
scalarField psiCmpt(psi.field().component(cmpt));
scalarField boundaryDiagCmpt(M.diag());
M.addBoundaryDiag(boundaryDiagCmpt, cmpt);
Mphi.internalField().replace(cmpt, -boundaryDiagCmpt*psiCmpt);

2
src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
View File

@ -98,7 +98,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
scalarField psiCmpt(psi.internalField().component(cmpt));
addBoundaryDiag(diag(), cmpt);
scalarField sourceCmpt = source.component(cmpt);
scalarField sourceCmpt(source.component(cmpt));
FieldField<Field, scalar> bouCoeffsCmpt
(

8
src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
View File

@ -56,7 +56,7 @@ void Foam::MULES::explicitSolve
const fvMesh& mesh = psi.mesh();
psi.correctBoundaryConditions();
surfaceScalarField phiBD = upwind<scalar>(psi.mesh(), phi).flux(psi);
surfaceScalarField phiBD(upwind<scalar>(psi.mesh(), phi).flux(psi));
surfaceScalarField& phiCorr = phiPsi;
phiCorr -= phiBD;
@ -167,7 +167,7 @@ void Foam::MULES::implicitSolve
scalarField allCoLambda(mesh.nFaces());
{
surfaceScalarField Cof =
tmp<surfaceScalarField> Cof =
mesh.time().deltaT()*mesh.surfaceInterpolation::deltaCoeffs()
*mag(phi)/mesh.magSf();
@ -225,7 +225,7 @@ void Foam::MULES::implicitSolve
- Su
);
surfaceScalarField phiBD = psiConvectionDiffusion.flux();
surfaceScalarField phiBD(psiConvectionDiffusion.flux());
surfaceScalarField& phiCorr = phiPsi;
phiCorr -= phiBD;
@ -405,7 +405,7 @@ void Foam::MULES::limiter
if (psiPf.coupled())
{
scalarField psiPNf = psiPf.patchNeighbourField();
const scalarField psiPNf(psiPf.patchNeighbourField());
forAll(phiCorrPf, pFacei)
{

12
src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
View File

@ -47,8 +47,8 @@ void Foam::cyclicFvPatch::makeWeights(scalarField& w) const
const scalarField& magFa = magSf();
const scalarField& nbrMagFa = nbrPatch.magSf();
scalarField deltas = nf() & fvPatch::delta();
scalarField nbrDeltas = nbrPatch.nf() & nbrPatch.fvPatch::delta();
const scalarField deltas(nf() & fvPatch::delta());
const scalarField nbrDeltas(nbrPatch.nf() & nbrPatch.fvPatch::delta());
forAll(magFa, facei)
{
@ -77,8 +77,8 @@ void Foam::cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const
//const cyclicPolyPatch& nbrPatch = cyclicPolyPatch_.neighbPatch();
const cyclicFvPatch& nbrPatch = neighbFvPatch();
scalarField deltas = nf() & fvPatch::delta();
scalarField nbrDeltas = nbrPatch.nf() & nbrPatch.fvPatch::delta();
const scalarField deltas(nf() & fvPatch::delta());
const scalarField nbrDeltas(nbrPatch.nf() & nbrPatch.fvPatch::delta());
forAll(deltas, facei)
{
@ -93,8 +93,8 @@ void Foam::cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const
// Return delta (P to N) vectors across coupled patch
Foam::tmp<Foam::vectorField> Foam::cyclicFvPatch::delta() const
{
vectorField patchD = fvPatch::delta();
vectorField nbrPatchD = neighbFvPatch().fvPatch::delta();
const vectorField patchD(fvPatch::delta());
const vectorField nbrPatchD(neighbFvPatch().fvPatch::delta());
tmp<vectorField> tpdv(new vectorField(patchD.size()));
vectorField& pdv = tpdv();