songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs 2013-04-08 17:34:37 +01:00
commit 134f9ff418
2 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
View File

@ -27,6 +27,7 @@ License
#include "volFields.H"
#include "surfaceFields.H"
#include "ListListOps.H"
#include "stringListOps.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -146,7 +147,6 @@ void Foam::sampledSurfaces::sampleAndWrite
}
template<class Type>
void Foam::sampledSurfaces::sampleAndWrite
(
@ -172,61 +172,54 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
{
IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
forAll(fieldSelection_, fieldI)
wordList names(fieldObjects.names());
labelList fieldNames(findStrings(fieldSelection_, names));
forAll(fieldNames, fieldI)
{
const wordRe fieldNameRe = fieldSelection_[fieldI];
IOobjectList fieldIO = fieldObjects.lookupRe(fieldNameRe);
const word& fieldName = names[fieldNames[fieldI]];
forAllConstIter(IOobjectList, fieldIO, iter)
{
const word& fieldName = iter()->name();
const GeoField fld
const GeoField fld
(
IOobject
(
IOobject
(
fieldName,
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ
),
mesh_
);
fieldName,
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ
),
mesh_
);
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite(fld);
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite(fld);
}
}
else
{
forAll(fieldSelection_, fieldI)
const wordList fieldNames
(
mesh_.thisDb().names<GeoField>(fieldSelection_)
);
forAll(fieldNames, i)
{
const wordRe& fieldNameRe = fieldSelection_[fieldI];
const word& fieldName = fieldNames[i];
const wordList dbFields
(
mesh_.thisDb().foundObjectRe<GeoField>(fieldNameRe)
);
forAll(dbFields, i)
if ((Pstream::master()) && verbose_)
{
const word& fieldName = dbFields[i];
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite
(
mesh_.thisDb().lookupObject<GeoField>(fieldName)
);
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite
(
mesh_.thisDb().lookupObject<GeoField>(fieldName)
);
}
}
}

5
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
View File

@ -229,7 +229,8 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
scalarField q(size(), 0.0);
const scalarField Tc(patchInternalField());
const scalarField KWall(kappa(*this));
const scalarField Tp(*this);
const scalarField KWall(kappa(Tp));
const scalarField KDelta(KWall*patch().deltaCoeffs());
switch (mode_)
@ -241,7 +242,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
}
case fixedHeatTransferCoeff:
{
q = (Ta_ - Tc)*h_;
q = (Ta_ - Tp)*h_;
break;
}
default: