From db4d736170a61fd1626769767a5f0077b84dad7f Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 25 Nov 2011 11:42:38 +0000 Subject: [PATCH 1/3] ENH: Corrected ambiguous field construction from tmp --- .../pressureInletOutletParSlipVelocityFvPatchVectorField.C | 2 +- .../externalWallHeatFluxTemperatureFvPatchScalarField.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C index f8002accff..2d0c3d4735 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C @@ -130,7 +130,7 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs() const volVectorField& U = db().lookupObject("U"); - vectorField Uc = U.boundaryField()[patchI].patchInternalField(); + vectorField Uc(U.boundaryField()[patchI].patchInternalField()); Uc -= n()*(Uc & n()); if (phi.dimensions() == dimVelocity*dimArea) diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index 2a396388c8..3671592e11 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C @@ -199,7 +199,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() } scalarField q(size(), 0.0); - scalarField KDelta = K(*this)*patch().deltaCoeffs(); + scalarField KDelta(K(*this)*patch().deltaCoeffs()); if (oldMode_ == fixedHeatFlux) { From d509c581b2449ac1fd153b1cd94411a2123c2fe3 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 25 Nov 2011 11:56:12 +0000 Subject: [PATCH 2/3] BUG: Corrected if condition in wavSurfacePressure BC --- .../waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index cd395a5bc6..c9d50b8930 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -187,7 +187,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() operator==(-g.value() & zetap); } - else if (phi.dimensions() = dimDensity*dimVelocity*dimArea) + else if (phi.dimensions() == dimDensity*dimVelocity*dimArea) { const scalarField& rhop = patch().lookupPatchField(rhoName_); From ae130cf60f3874c0465fd3d68098966dfdd45209 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 25 Nov 2011 11:56:55 +0000 Subject: [PATCH 3/3] BUG: Moved template type name definition to within Foam namespace --- .../pyrolysisModel/pyrolysisModelCollection.C | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C index 4bc3ca977e..c9c097fc94 100644 --- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C +++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C @@ -28,11 +28,14 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -defineTemplateTypeNameAndDebug -( - Foam::IOPtrList, - 0 -); +namespace Foam +{ + defineTemplateTypeNameAndDebug + ( + IOPtrList, + 0 + ); +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //