Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2011-11-25 12:19:01 +00:00
4 changed files with 11 additions and 8 deletions

View File

@ -130,7 +130,7 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
const volVectorField& U = db().lookupObject<volVectorField>("U"); const volVectorField& U = db().lookupObject<volVectorField>("U");
vectorField Uc = U.boundaryField()[patchI].patchInternalField(); vectorField Uc(U.boundaryField()[patchI].patchInternalField());
Uc -= n()*(Uc & n()); Uc -= n()*(Uc & n());
if (phi.dimensions() == dimVelocity*dimArea) if (phi.dimensions() == dimVelocity*dimArea)

View File

@ -187,7 +187,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
operator==(-g.value() & zetap); operator==(-g.value() & zetap);
} }
else if (phi.dimensions() = dimDensity*dimVelocity*dimArea) else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
{ {
const scalarField& rhop = const scalarField& rhop =
patch().lookupPatchField<volScalarField, scalar>(rhoName_); patch().lookupPatchField<volScalarField, scalar>(rhoName_);

View File

@ -28,11 +28,14 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTemplateTypeNameAndDebug defineTemplateTypeNameAndDebug
( (
Foam::IOPtrList<Foam::regionModels::pyrolysisModels::pyrolysisModel>, IOPtrList<regionModels::pyrolysisModels::pyrolysisModel>,
0 0
); );
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -199,7 +199,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
} }
scalarField q(size(), 0.0); scalarField q(size(), 0.0);
scalarField KDelta = K(*this)*patch().deltaCoeffs(); scalarField KDelta(K(*this)*patch().deltaCoeffs());
if (oldMode_ == fixedHeatFlux) if (oldMode_ == fixedHeatFlux)
{ {