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

This commit is contained in:
mattijs
2013-01-08 13:00:01 +00:00
4 changed files with 9 additions and 4 deletions

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -111,7 +111,7 @@ void Foam::ThermoParcel<ParcelType>::writeFields(const CloudType& c)
{ {
ParcelType::writeFields(c); ParcelType::writeFields(c);
label np = c.size(); label np = c.size();
IOField<scalar> T(c.fieldIOobject("T", IOobject::NO_READ), np); IOField<scalar> T(c.fieldIOobject("T", IOobject::NO_READ), np);
IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::NO_READ), np); IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::NO_READ), np);

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -133,7 +133,7 @@ void Foam::SurfaceFilmModel<CloudType>::inject(TrackData& td)
// Retrieve the film model from the owner database // Retrieve the film model from the owner database
const regionModels::surfaceFilmModels::surfaceFilmModel& filmModel = const regionModels::surfaceFilmModels::surfaceFilmModel& filmModel =
this->owner().db().objectRegistry::template lookupObject this->owner().mesh().time().objectRegistry::template lookupObject
<regionModels::surfaceFilmModels::surfaceFilmModel> <regionModels::surfaceFilmModels::surfaceFilmModel>
( (
"surfaceFilmProperties" "surfaceFilmProperties"

View File

@ -80,6 +80,9 @@ thermoSingleLayerCoeffs
variance 100; variance 100;
} }
} }
zeroForcePatches
();
} }
injectionModels injectionModels

View File

@ -55,6 +55,8 @@ kinematicSingleLayerCoeffs
variance 100; variance 100;
} }
} }
zeroForcePatches ();
} }
surfaceShearCoeffs surfaceShearCoeffs