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

COMP: avoid ambiguous construct from tmp - surfaceFilmModels

Browse Source
This commit is contained in:
Mark Olesen
2010-12-17 17:14:43 +01:00
parent 51798abad4
commit 329294b3cf
9 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/surfaceFilmModels/derivedFvPatchFields/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.C
View File

@ -131,7 +131,7 @@ void directMappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
);
// Retrieve the neighbour patch internal field
Field<Type> nbrIntFld = nbrField.patchInternalField();
Field<Type> nbrIntFld(nbrField.patchInternalField());
distMap.distribute(nbrIntFld);
// Assign (this) patch internal field to its neighbour values

2
src/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
View File

@ -122,7 +122,7 @@ void Foam::filmHeightInletVelocityFvPatchVectorField::updateCoeffs()
const fvPatchField<scalar>& deltafp =
patch().lookupPatchField<volScalarField, scalar>(deltafName_);
vectorField n = patch().nf();
const vectorField n(patch().nf());
const scalarField& magSf = patch().magSf();
operator==(deltafp*n*phip/(rhop*magSf*sqr(deltafp) + ROOTVSMALL));

8
src/surfaceFilmModels/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.C
View File

@ -108,16 +108,16 @@ void htcConvFvPatchScalarField::updateCoeffs()
const label patchI = patch().index();
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalarField alphaEffw = rasModel.alphaEff()().boundaryField()[patchI];
const scalarField alphaEffw(rasModel.alphaEff()().boundaryField()[patchI]);
const scalarField& muw = rasModel.mu().boundaryField()[patchI];
const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
const vectorField& Uc = rasModel.U();
const vectorField& Uw = rasModel.U().boundaryField()[patchI];
const scalarField& Tw = rasModel.thermo().T().boundaryField()[patchI];
const scalarField Cpw = rasModel.thermo().Cp(Tw, patchI);
const scalarField Cpw(rasModel.thermo().Cp(Tw, patchI));
const scalarField kappaw = Cpw*alphaEffw;
const scalarField Pr = muw*Cpw/kappaw;
const scalarField kappaw(Cpw*alphaEffw);
const scalarField Pr(muw*Cpw/kappaw);
scalarField& htc = *this;
forAll(htc, faceI)

6
src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
View File

@ -163,8 +163,10 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
}
}
scalarField mDotFilm =
filmModel.massPhaseChangeForPrimary().boundaryField()[filmPatchI];
scalarField mDotFilm
(
filmModel.massPhaseChangeForPrimary().boundaryField()[filmPatchI]
);
distMap.distribute(mDotFilm);
// Retrieve RAS turbulence model

8
src/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutFilmWallFunction/mutFilmWallFunctionFvPatchScalarField.C
View File

@ -80,8 +80,10 @@ tmp<scalarField> mutFilmWallFunctionFvPatchScalarField::calcUTau
}
}
scalarField mDotFilm =
filmModel.massPhaseChangeForPrimary().boundaryField()[filmPatchI];
scalarField mDotFilm
(
filmModel.massPhaseChangeForPrimary().boundaryField()[filmPatchI]
);
distMap.distribute(mDotFilm);
@ -131,7 +133,7 @@ tmp<scalarField> mutFilmWallFunctionFvPatchScalarField::calcMut() const
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
const scalarField magGradU = mag(Uw.snGrad());
const scalarField magGradU(mag(Uw.snGrad()));
const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
const scalarField& muw = rasModel.mu().boundaryField()[patchI];

2
src/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
View File

@ -50,7 +50,7 @@ void Foam::surfaceFilmModels::injectionModel::correctDetachedFilm
const kinematicSingleLayer& film =
refCast<const kinematicSingleLayer>(owner_);
const scalarField gNorm = film.gNorm();
const scalarField gNorm(film.gNorm());
const scalarField& delta = film.delta();
const scalarField& rho = film.rho();
const scalarField& magSf = film.magSf();

8
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
View File

@ -120,10 +120,10 @@ void Foam::surfaceFilmModels::standardPhaseChange::correct
const scalarField& rhoInf = film.rhoPrimary();
const scalarField& muInf = film.muPrimary();
const scalarField& magSf = film.magSf();
const scalarField hInf = film.htcs().h();
const scalarField hFilm = film.htcw().h();
const vectorField dU = film.UPrimary() - film.Us();
const scalarField availableMass = (delta - deltaMin_)*rho*magSf;
const scalarField hInf(film.htcs().h());
const scalarField hFilm(film.htcw().h());
const vectorField dU(film.UPrimary() - film.Us());
const scalarField availableMass((delta - deltaMin_)*rho*magSf);
forAll(dMass, cellI)

22
src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
View File

@ -289,12 +289,14 @@ Foam::surfaceFilmModels::kinematicSingleLayer::CourantNumber() const
{
const scalar deltaT = time_.deltaTValue();
surfaceScalarField SfUfbyDelta =
surfaceScalarField SfUfbyDelta
(
filmRegion_.surfaceInterpolation::deltaCoeffs()*mag(phi_)
/fvc::interpolate
(
rho_*(delta_ + dimensionedScalar("SMALL", dimLength, SMALL))
);
)
);
CoNum = max(SfUfbyDelta/filmRegion_.magSf()).value()*deltaT;
@ -310,13 +312,13 @@ Foam::surfaceFilmModels::kinematicSingleLayer::CourantNumber() const
void Foam::surfaceFilmModels::kinematicSingleLayer::continuityCheck()
{
const volScalarField deltaRho0 = deltaRho_;
const volScalarField deltaRho0(deltaRho_);
solveContinuity();
if (debug)
{
volScalarField mass = deltaRho_*magSf_;
volScalarField mass(deltaRho_*magSf_);
dimensionedScalar totalMass =
fvc::domainIntegrate(mass)
+ dimensionedScalar("SMALL", dimMass*dimVolume, ROOTVSMALL);
@ -478,11 +480,11 @@ void Foam::surfaceFilmModels::kinematicSingleLayer::solveThickness
Info<< "kinematicSingleLayer::solveThickness()" << endl;
}
volScalarField rAU = 1.0/UEqn.A();
volScalarField rAU(1.0/UEqn.A());
U_ = rAU*UEqn.H();
surfaceScalarField deltarAUf = fvc::interpolate(delta_*rAU);
surfaceScalarField rhof = fvc::interpolate(rho_);
surfaceScalarField deltarAUf(fvc::interpolate(delta_*rAU));
surfaceScalarField rhof(fvc::interpolate(rho_));
surfaceScalarField phiAdd
(
@ -504,8 +506,10 @@ void Foam::surfaceFilmModels::kinematicSingleLayer::solveThickness
);
constrainFilmField(phid, 0.0);
surfaceScalarField ddrhorAUppf =
fvc::interpolate(delta_)*deltarAUf*rhof*fvc::interpolate(pp);
surfaceScalarField ddrhorAUppf
(
fvc::interpolate(delta_)*deltarAUf*rhof*fvc::interpolate(pp)
);
// constrainFilmField(ddrhorAUppf, 0.0);
for (int nonOrth=0; nonOrth<=nNonOrthCorr_; nonOrth++)

18
src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
View File

@ -618,8 +618,10 @@ Foam::surfaceFilmModels::thermoSingleLayer::Srho() const
const label filmPatchI = filmBottomPatchIDs_[i];
scalarField patchMass =
massPhaseChangeForPrimary_.boundaryField()[filmPatchI];
scalarField patchMass
(
massPhaseChangeForPrimary_.boundaryField()[filmPatchI]
);
distMap.distribute(patchMass);
@ -678,8 +680,10 @@ Foam::surfaceFilmModels::thermoSingleLayer::Srho(const label i) const
const label filmPatchI = filmBottomPatchIDs_[i];
scalarField patchMass =
massPhaseChangeForPrimary_.boundaryField()[filmPatchI];
scalarField patchMass
(
massPhaseChangeForPrimary_.boundaryField()[filmPatchI]
);
distMap.distribute(patchMass);
@ -737,8 +741,10 @@ Foam::surfaceFilmModels::thermoSingleLayer::Sh() const
const label filmPatchI = filmBottomPatchIDs_[i];
scalarField patchEnergy =
energyPhaseChangeForPrimary_.boundaryField()[filmPatchI];
scalarField patchEnergy
(
energyPhaseChangeForPrimary_.boundaryField()[filmPatchI]
);
distMap.distribute(patchEnergy);
const labelUList& cells = wpp.faceCells();