ENH: corrected ambiguous construct from temp

This commit is contained in:
andy
2011-03-08 10:23:19 +00:00
parent c5e7f98a9f
commit 4be6e5f3e6
8 changed files with 21 additions and 15 deletions

View File

@ -135,8 +135,8 @@ void PDRkEpsilon::correct()
volScalarField GR(drag.Gk()); volScalarField GR(drag.Gk());
volScalarField LI = volScalarField LI
C4_*(Lobs + dimensionedScalar("minLength", dimLength, VSMALL)); (C4_*(Lobs + dimensionedScalar("minLength", dimLength, VSMALL)));
// Dissipation equation // Dissipation equation
tmp<fvScalarMatrix> epsEqn tmp<fvScalarMatrix> epsEqn

View File

@ -142,11 +142,10 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::Gulder::XiEq() const
volScalarField tauEta(sqrt(mag(thermo_.muu()/(thermo_.rhou()*epsilon)))); volScalarField tauEta(sqrt(mag(thermo_.muu()/(thermo_.rhou()*epsilon))));
volScalarField Reta = volScalarField Reta
( (
up up
/ / (
(
sqrt(epsilon*tauEta) sqrt(epsilon*tauEta)
+ dimensionedScalar("1e-8", up.dimensions(), 1e-8) + dimensionedScalar("1e-8", up.dimensions(), 1e-8)
) )

View File

@ -64,7 +64,7 @@ Foam::XiEqModels::instability::~instability()
Foam::tmp<Foam::volScalarField> Foam::XiEqModels::instability::XiEq() const Foam::tmp<Foam::volScalarField> Foam::XiEqModels::instability::XiEq() const
{ {
volScalarField turbXiEq = XiEqModel_->XiEq(); volScalarField turbXiEq(XiEqModel_->XiEq());
return XiEqIn/turbXiEq + turbXiEq; return XiEqIn/turbXiEq + turbXiEq;
} }

View File

@ -73,9 +73,11 @@ class externalWallHeatFluxTemperatureFvPatchScalarField
public mixedFvPatchScalarField, public mixedFvPatchScalarField,
public temperatureCoupledBase public temperatureCoupledBase
{ {
// Private data public:
//- how to operate the BC // Public data
//- Operation mode enumeration
enum operationMode enum operationMode
{ {
fixedHeatFlux, fixedHeatFlux,
@ -84,6 +86,11 @@ class externalWallHeatFluxTemperatureFvPatchScalarField
}; };
static const NamedEnum<operationMode, 3> operationModeNames; static const NamedEnum<operationMode, 3> operationModeNames;
private:
// Private data
//- Operation mode //- Operation mode
operationMode oldMode_; operationMode oldMode_;

View File

@ -159,7 +159,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
const fvPatch& nbrPatch = const fvPatch& nbrPatch =
refCast<const fvMesh>(nbrMesh).boundary()[samplePatchI]; refCast<const fvMesh>(nbrMesh).boundary()[samplePatchI];
scalarField Tc = patchInternalField(); scalarField Tc(patchInternalField());
scalarField& Tp = *this; scalarField& Tp = *this;
const turbulentTemperatureRadCoupledMixedFvPatchScalarField& const turbulentTemperatureRadCoupledMixedFvPatchScalarField&
@ -170,16 +170,16 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
); );
// Swap to obtain full local values of neighbour internal field // Swap to obtain full local values of neighbour internal field
scalarField TcNbr = nbrField.patchInternalField(); scalarField TcNbr(nbrField.patchInternalField());
mpp.map().distribute(TcNbr); mpp.map().distribute(TcNbr);
// Swap to obtain full local values of neighbour K*delta // Swap to obtain full local values of neighbour K*delta
scalarField KDeltaNbr = nbrField.K(TcNbr)*nbrPatch.deltaCoeffs(); scalarField KDeltaNbr(nbrField.K(TcNbr)*nbrPatch.deltaCoeffs());
mpp.map().distribute(KDeltaNbr); mpp.map().distribute(KDeltaNbr);
scalarField KDelta = K(*this)*patch().deltaCoeffs(); scalarField KDelta(K(*this)*patch().deltaCoeffs());
scalarField Qr(Tp.size(), 0.0); scalarField Qr(Tp.size(), 0.0);
if (QrName_ != "none") if (QrName_ != "none")

View File

@ -319,7 +319,7 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
Info<< "Pressure difference = " << valueDiff << endl; Info<< "Pressure difference = " << valueDiff << endl;
vectorField::subField Sfw = patch().patch().faceAreas(); vectorField::subField Sfw = patch().patch().faceAreas();
vectorField newSfw = (1 - openFraction_)*initWallSf_; vectorField newSfw((1 - openFraction_)*initWallSf_);
forAll(Sfw, facei) forAll(Sfw, facei)
{ {
Sfw[facei] = newSfw[facei]; Sfw[facei] = newSfw[facei];

View File

@ -170,7 +170,7 @@ void Foam::MarshakRadiationFvPatchScalarField::updateCoeffs()
const scalarField& gamma = const scalarField& gamma =
patch().lookupPatchField<volScalarField, scalar>("gammaRad"); patch().lookupPatchField<volScalarField, scalar>("gammaRad");
const scalarField Ep = emissivity()/(2.0*(2.0 - emissivity())); const scalarField Ep(emissivity()/(2.0*(2.0 - emissivity())));
// Set value fraction // Set value fraction
valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep);

View File

@ -171,7 +171,7 @@ void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::updateCoeffs()
const scalarField& gamma = const scalarField& gamma =
patch().lookupPatchField<volScalarField, scalar>("gammaRad"); patch().lookupPatchField<volScalarField, scalar>("gammaRad");
const scalarField Ep = emissivity()/(2.0*(scalar(2.0) - emissivity())); const scalarField Ep(emissivity()/(2.0*(scalar(2.0) - emissivity())));
// Set value fraction // Set value fraction
valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep);