Commit 134f9ff4 authored by mattijs's avatar mattijs
Browse files

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

parents d40c7855 2ba1b4d4
......@@ -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)
{
const wordRe fieldNameRe = fieldSelection_[fieldI];
IOobjectList fieldIO = fieldObjects.lookupRe(fieldNameRe);
wordList names(fieldObjects.names());
forAllConstIter(IOobjectList, fieldIO, iter)
{
const word& fieldName = iter()->name();
labelList fieldNames(findStrings(fieldSelection_, names));
const GeoField fld
(
IOobject
(
fieldName,
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ
),
mesh_
);
forAll(fieldNames, fieldI)
{
const word& fieldName = names[fieldNames[fieldI]];
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
const GeoField fld
(
IOobject
(
fieldName,
mesh_.time().timeName(),
mesh_,
IOobject::MUST_READ
),
mesh_
);
sampleAndWrite(fld);
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite(fld);
}
}
else
{
forAll(fieldSelection_, fieldI)
{
const wordRe& fieldNameRe = fieldSelection_[fieldI];
const wordList fieldNames
(
mesh_.thisDb().names<GeoField>(fieldSelection_)
);
const wordList dbFields
(
mesh_.thisDb().foundObjectRe<GeoField>(fieldNameRe)
);
forAll(fieldNames, i)
{
const word& fieldName = fieldNames[i];
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)
);
}
}
}
......
......@@ -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:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment