From 0fcfc474d5987cfd70b3f22c8b20ae93de8d8c71 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 17 Dec 2010 17:27:39 +0100
Subject: [PATCH] COMP: avoid ambiguous construct from tmp -
turbulenceModels/compressible bcs
---
.../temperatureCoupledBase/temperatureCoupledBase.C | 6 +++---
.../turbulentTemperatureCoupledBaffleFvPatchScalarField.C | 4 ++--
...rbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index f6543597bf4..954fa1de931 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -117,7 +117,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
case DIRECTIONALSOLIDTHERMO:
{
- vectorField n = patch_.nf();
+ const vectorField n(patch_.nf());
const basicSolidThermo& thermo =
mesh.lookupObject<basicSolidThermo>
@@ -142,7 +142,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
const symmTensorField& KWall =
patch_.lookupPatchField<volSymmTensorField, scalar>(KName_);
- vectorField n = patch_.nf();
+ const vectorField n(patch_.nf());
return n & KWall & n;
}
@@ -168,7 +168,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
<< "Please set 'K' to one of " << KMethodTypeNames_.toc()
<< " and 'KName' to the name of the volScalar"
<< " or volSymmTensor field (if K=lookup)"
- << exit(FatalError);
+ << exit(FatalError);
}
break;
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
index 5c7f204a109..89ca4c2cc7c 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
@@ -221,11 +221,11 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
);
// Swap to obtain full local values of neighbour internal field
- scalarField nbrIntFld = nbrField.patchInternalField();
+ scalarField nbrIntFld(nbrField.patchInternalField());
distMap.distribute(nbrIntFld);
// Swap to obtain full local values of neighbour K*delta
- scalarField nbrKDelta = nbrField.K(nbrField)*nbrPatch.deltaCoeffs();
+ scalarField nbrKDelta(nbrField.K(nbrField)*nbrPatch.deltaCoeffs());
distMap.distribute(nbrKDelta);
tmp<scalarField> myKDelta = K(*this)*patch().deltaCoeffs();
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 6397feddf8c..99991e69382 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -178,11 +178,11 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
);
// Swap to obtain full local values of neighbour internal field
- scalarField nbrIntFld = nbrField.patchInternalField();
+ scalarField nbrIntFld(nbrField.patchInternalField());
distMap.distribute(nbrIntFld);
// Swap to obtain full local values of neighbour K*delta
- scalarField nbrKDelta = nbrField.K(nbrField)*nbrPatch.deltaCoeffs();
+ scalarField nbrKDelta(nbrField.K(nbrField)*nbrPatch.deltaCoeffs());
distMap.distribute(nbrKDelta);
tmp<scalarField> myKDelta = K(*this)*patch().deltaCoeffs();
--
GitLab