zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into particleInteractions

Browse Source
This commit is contained in:
graham
2010-04-15 10:22:42 +01:00
parent 1e36428a4e 2de3c0d2cf
commit 014fbd603d
15 changed files with 283 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
View File

@ -72,7 +72,8 @@ GeometricBoundaryField
(
const BoundaryMesh& bmesh,
const DimensionedField<Type, GeoMesh>& field,
const wordList& patchFieldTypes
const wordList& patchFieldTypes,
const wordList& constraintTypes
)
:
FieldField<PatchField, Type>(bmesh.size()),
@ -83,18 +84,22 @@ GeometricBoundaryField
Info<< "GeometricField<Type, PatchField, GeoMesh>::"
"GeometricBoundaryField::"
"GeometricBoundaryField(const BoundaryMesh&, "
"const Field<Type>&, const wordList&)"
"const Field<Type>&, const wordList&, const wordList&)"
<< endl;
}
if (patchFieldTypes.size() != this->size())
if
(
patchFieldTypes.size() != this->size()
|| (constraintTypes.size() && (constraintTypes.size() != this->size()))
)
{
FatalErrorIn
(
"GeometricField<Type, PatchField, GeoMesh>::"
"GeometricBoundaryField::"
"GeometricBoundaryField(const BoundaryMesh&, "
"const Field<Type>&, const wordList&)"
"const Field<Type>&, const wordList&, const wordList&)"
) << "Incorrect number of patch type specifications given" << nl
<< " Number of patches in mesh = " << bmesh.size()
<< " number of patch type specifications = "
@ -102,6 +107,25 @@ GeometricBoundaryField
<< abort(FatalError);
}
if (constraintTypes.size())
{
forAll(bmesh_, patchi)
{
set
(
patchi,
PatchField<Type>::New
(
patchFieldTypes[patchi],
constraintTypes[patchi],
bmesh_[patchi],
field
)
);
}
}
else
{
forAll(bmesh_, patchi)
{
set
@ -115,6 +139,7 @@ GeometricBoundaryField
)
);
}
}
}

22
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -231,14 +231,15 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
const IOobject& io,
const Mesh& mesh,
const dimensionSet& ds,
const wordList& patchFieldTypes
const wordList& patchFieldTypes,
const wordList& actualPatchTypes
)
:
DimensionedField<Type, GeoMesh>(io, mesh, ds),
timeIndex_(this->time().timeIndex()),
field0Ptr_(NULL),
fieldPrevIterPtr_(NULL),
boundaryField_(mesh.boundary(), *this, patchFieldTypes)
boundaryField_(mesh.boundary(), *this, patchFieldTypes, actualPatchTypes)
{
if (debug)
{
@ -287,14 +288,15 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
const IOobject& io,
const Mesh& mesh,
const dimensioned<Type>& dt,
const wordList& patchFieldTypes
const wordList& patchFieldTypes,
const wordList& actualPatchTypes
)
:
DimensionedField<Type, GeoMesh>(io, mesh, dt),
timeIndex_(this->time().timeIndex()),
field0Ptr_(NULL),
fieldPrevIterPtr_(NULL),
boundaryField_(mesh.boundary(), *this, patchFieldTypes)
boundaryField_(mesh.boundary(), *this, patchFieldTypes, actualPatchTypes)
{
if (debug)
{
@ -653,14 +655,22 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
(
const IOobject& io,
const GeometricField<Type, PatchField, GeoMesh>& gf,
const wordList& patchFieldTypes
const wordList& patchFieldTypes,
const wordList& actualPatchTypes
)
:
DimensionedField<Type, GeoMesh>(io, gf),
timeIndex_(gf.timeIndex()),
field0Ptr_(NULL),
fieldPrevIterPtr_(NULL),
boundaryField_(this->mesh().boundary(), *this, patchFieldTypes)
boundaryField_
(
this->mesh().boundary(),
*this,
patchFieldTypes,
actualPatchTypes
)
{
if (debug)
{

15
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
View File

@ -128,12 +128,14 @@ public:
//- Construct from a BoundaryMesh,
// reference to the internal field
// and a wordList of patch types
// and a wordList of patch types and optional the actual patch
// types (to override constraint patches)
GeometricBoundaryField
(
const BoundaryMesh&,
const DimensionedInternalField&,
const wordList&
const wordList& wantedPatchTypes,
const wordList& actualPatchTypes = wordList()
);
//- Construct from a BoundaryMesh,
@ -283,7 +285,8 @@ public:
const IOobject&,
const Mesh&,
const dimensionSet&,
const wordList& patchFieldTypes
const wordList& wantedPatchTypes,
const wordList& actualPatchTypes = wordList()
);
//- Constructor given IOobject, mesh, dimensioned<Type> and patch type.
@ -301,7 +304,8 @@ public:
const IOobject&,
const Mesh&,
const dimensioned<Type>&,
const wordList& patchFieldTypes
const wordList& wantedPatchTypes,
const wordList& actualPatchTypes = wordList()
);
//- Constructor from components
@ -387,7 +391,8 @@ public:
(
const IOobject&,
const GeometricField<Type, PatchField, GeoMesh>&,
const wordList& patchFieldTypes
const wordList& patchFieldTypes,
const wordList& actualPatchTypes = wordList()
);

35
src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
View File

@ -29,6 +29,7 @@ template<class Type>
Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
(
const word& patchFieldType,
const word& actualPatchType,
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
)
@ -36,7 +37,8 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
if (debug)
{
Info<< "PointPatchField<Type>::"
"New(const word&, const pointPatch&, const Field<Type>&) : "
"New(const word&, const word&"
", const pointPatch&, const Field<Type>&) : "
"constructing pointPatchField<Type>"
<< endl;
}
@ -49,7 +51,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
FatalErrorIn
(
"PointPatchField<Type>::New"
"(const word&, const pointPatch&, const Field<Type>&)"
"(const word&, const word&, const pointPatch&, const Field<Type>&)"
) << "Unknown patchFieldType type "
<< patchFieldType
<< endl << endl
@ -60,12 +62,13 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
autoPtr<pointPatchField<Type> > pfPtr(cstrIter()(p, iF));
if (pfPtr().constraintType() == p.constraintType())
if
(
actualPatchType == word::null
|| actualPatchType != p.type()
)
{
// Compatible (constraint-wise) with the patch type
return pfPtr;
}
else
if (pfPtr().constraintType() != p.constraintType())
{
// Use default constraint type
typename pointPatchConstructorTable::iterator patchTypeCstrIter =
@ -76,7 +79,8 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
FatalErrorIn
(
"PointPatchField<Type>::New"
"(const word&, const pointPatch&, const Field<Type>&)"
"(const word&, const word&"
", const pointPatch&, const Field<Type>&)"
) << "inconsistent patch and patchField types for \n"
<< " patch type " << p.type()
<< " and patchField type " << patchFieldType
@ -85,6 +89,21 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
return patchTypeCstrIter()(p, iF);
}
}
return pfPtr;
}
template<class Type>
Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
(
const word& patchFieldType,
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
)
{
return New(patchFieldType, word::null, p, iF);
}

14
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
View File

@ -35,7 +35,7 @@ Description
SourceFiles
pointPatchField.C
newpointPatchField.C
newPointPatchField.C
\*---------------------------------------------------------------------------*/
@ -199,6 +199,18 @@ public:
const DimensionedField<Type, pointMesh>&
);
//- Return a pointer to a new patchField created on freestore given
// patch and internal field
// (does not set the patch field values).
// Allows override of constraint type
static autoPtr<pointPatchField<Type> > New
(
const word&,
const word& actualPatchType,
const pointPatch&,
const DimensionedField<Type, pointMesh>&
);
//- Return a pointer to a new patchField created on freestore from
// a given pointPatchField mapped onto a new patch
static autoPtr<pointPatchField<Type> > New

12
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
View File

@ -226,6 +226,18 @@ public:
const DimensionedField<Type, volMesh>&
);
//- Return a pointer to a new patchField created on freestore given
// patch and internal field
// (does not set the patch field values).
// Allows override of constraint type
static tmp<fvPatchField<Type> > New
(
const word&,
const word& actualPatchType,
const fvPatch&,
const DimensionedField<Type, volMesh>&
);
//- Return a pointer to a new patchField created on freestore from
// a given fvPatchField mapped onto a new patch
static tmp<fvPatchField<Type> > New

31
src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
View File

@ -29,14 +29,16 @@ template<class Type>
Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
(
const word& patchFieldType,
const word& actualPatchType,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
)
{
if (debug)
{
Info<< "fvPatchField<Type>::New(const word&, const fvPatch&, "
"const DimensionedField<Type, volMesh>&) : patchFieldType="
Info<< "fvPatchField<Type>::New(const word&, const word&, "
"const fvPatch&, const DimensionedField<Type, volMesh>&) :"
" patchFieldType="
<< patchFieldType
<< endl;
}
@ -48,7 +50,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
{
FatalErrorIn
(
"fvPatchField<Type>::New(const word&, const fvPatch&, "
"fvPatchField<Type>::New(const word&, const word&, const fvPatch&, "
"const DimensionedField<Type, volMesh>&)"
) << "Unknown patchTypefield type " << patchFieldType
<< endl << endl
@ -57,6 +59,12 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
<< exit(FatalError);
}
if
(
actualPatchType == word::null
|| actualPatchType != p.type()
)
{
typename patchConstructorTable::iterator patchTypeCstrIter =
patchConstructorTablePtr_->find(p.type());
@ -68,6 +76,23 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
{
return cstrIter()(p, iF);
}
}
else
{
return cstrIter()(p, iF);
}
}
template<class Type>
Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
(
const word& patchFieldType,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
)
{
return New(patchFieldType, word::null, p, iF);
}

12
src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
View File

@ -216,6 +216,18 @@ public:
const DimensionedField<Type, surfaceMesh>&
);
//- Return a pointer to a new patchField created on freestore given
// patch and internal field
// (does not set the patch field values)
// Allows override of constraint type
static tmp<fvsPatchField<Type> > New
(
const word&,
const word& actualPatchType,
const fvPatch&,
const DimensionedField<Type, surfaceMesh>&
);
//- Return a pointer to a new patchField created on freestore from
// a given fvsPatchField mapped onto a new patch
static tmp<fvsPatchField<Type> > New

32
src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
View File

@ -34,14 +34,15 @@ template<class Type>
tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
(
const word& patchFieldType,
const word& actualPatchType,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
)
{
if (debug)
{
Info<< "fvsPatchField<Type>::New(const word&, const fvPatch&, "
"const Field<Type>&) : "
Info<< "fvsPatchField<Type>::New(const word&, const word&"
", const fvPatch&, const Field<Type>&) : "
"constructing fvsPatchField<Type>"
<< endl;
}
@ -53,8 +54,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
{
FatalErrorIn
(
"fvsPatchField<Type>::New(const word&, const fvPatch&, "
"const Field<Type>&)"
"fvsPatchField<Type>::New(const word&, const word&, const fvPatch&"
", const Field<Type>&)"
) << "Unknown patchTypefield type " << patchFieldType
<< endl << endl
<< "Valid patchField types are :" << endl
@ -62,6 +63,12 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
<< exit(FatalError);
}
if
(
actualPatchType == word::null
|| actualPatchType != p.type()
)
{
typename patchConstructorTable::iterator patchTypeCstrIter =
patchConstructorTablePtr_->find(p.type());
@ -73,6 +80,23 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
{
return cstrIter()(p, iF);
}
}
else
{
return cstrIter()(p, iF);
}
}
template<class Type>
tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
(
const word& patchFieldType,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
)
{
return New(patchFieldType, word::null, p, iF);
}

10
src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
View File

@ -80,10 +80,11 @@ void Foam::fieldValues::cellSource::setCellZoneCells()
}
cellId_.setSize(count);
nCells_ = returnReduce(cellId_.size(), sumOp<label>());
if (debug)
{
Info<< "Original cell zone size = " << cZone.size()
Pout<< "Original cell zone size = " << cZone.size()
<< ", new size = " << count << endl;
}
}
@ -109,8 +110,8 @@ void Foam::fieldValues::cellSource::initialise(const dictionary& dict)
}
Info<< type() << " " << name_ << ":" << nl
<< " total cells = " << cellId_.size() << nl
<< " total volume = " << sum(filterField(mesh().V()))
<< " total cells = " << nCells_ << nl
<< " total volume = " << gSum(filterField(mesh().V()))
<< nl << endl;
if (operation_ == opWeightedAverage)
@ -144,7 +145,7 @@ void Foam::fieldValues::cellSource::writeFileHeader()
{
outputFilePtr_()
<< "# Source : " << sourceTypeNames_[source_] << " "
<< sourceName_ << nl << "# Cells : " << cellId_.size() << nl
<< sourceName_ << nl << "# Cells : " << nCells_ << nl
<< "# Time" << tab << "sum(V)";
forAll(fields_, i)
@ -172,6 +173,7 @@ Foam::fieldValues::cellSource::cellSource
fieldValue(name, obr, dict, loadFromFiles),
source_(sourceTypeNames_.read(dict.lookup("source"))),
operation_(operationTypeNames_.read(dict.lookup("operation"))),
nCells_(0),
cellId_()
{
read(dict);

3
src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
View File

@ -133,6 +133,9 @@ protected:
//- Operation to apply to values
operationType operation_;
//- Global number of cells
label nCells_;
//- Local list of cell IDs
labelList cellId_;

31
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
View File

@ -78,7 +78,7 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
faceId_.setSize(fZone.size());
facePatchId_.setSize(fZone.size());
flipMap_.setSize(fZone.size());
faceSign_.setSize(fZone.size());
label count = 0;
forAll(fZone, i)
@ -134,11 +134,11 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
{
if (fZone.flipMap()[i])
{
flipMap_[count] = -1;
faceSign_[count] = -1;
}
else
{
flipMap_[count] = 1;
faceSign_[count] = 1;
}
faceId_[count] = faceId;
facePatchId_[count] = facePatchId;
@ -148,11 +148,12 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
faceId_.setSize(count);
facePatchId_.setSize(count);
flipMap_.setSize(count);
faceSign_.setSize(count);
nFaces_ = returnReduce(faceId_.size(), sumOp<label>());
if (debug)
{
Info<< "Original face zone size = " << fZone.size()
Pout<< "Original face zone size = " << fZone.size()
<< ", new size = " << count << endl;
}
}
@ -187,13 +188,14 @@ void Foam::fieldValues::faceSource::setPatchFaces()
faceId_.setSize(nFaces);
facePatchId_.setSize(nFaces);
flipMap_.setSize(nFaces);
faceSign_.setSize(nFaces);
nFaces_ = returnReduce(faceId_.size(), sumOp<label>());
forAll(faceId_, faceI)
{
faceId_[faceI] = faceI;
facePatchId_[faceI] = patchId;
flipMap_[faceI] = 1;
faceSign_[faceI] = 1;
}
}
@ -216,7 +218,7 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
}
default:
{
FatalErrorIn("faceSource::initiliase()")
FatalErrorIn("faceSource::initialise()")
<< type() << " " << name_ << ": "
<< sourceTypeNames_[source_] << "(" << sourceName_ << "):"
<< nl << " Unknown source type. Valid source types are:"
@ -225,8 +227,10 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
}
Info<< type() << " " << name_ << ":" << nl
<< " total faces = " << faceId_.size() << nl
<< " total area = " << sum(filterField(mesh().magSf())) << nl;
<< " total faces = " << nFaces_
<< nl
<< " total area = " << gSum(filterField(mesh().magSf(), false))
<< nl;
if (operation_ == opWeightedAverage)
{
@ -260,7 +264,7 @@ void Foam::fieldValues::faceSource::writeFileHeader()
{
outputFilePtr_()
<< "# Source : " << sourceTypeNames_[source_] << " "
<< sourceName_ << nl << "# Faces : " << faceId_.size() << nl
<< sourceName_ << nl << "# Faces : " << nFaces_ << nl
<< "# Time" << tab << "sum(magSf)";
forAll(fields_, i)
@ -288,9 +292,10 @@ Foam::fieldValues::faceSource::faceSource
fieldValue(name, obr, dict, loadFromFiles),
source_(sourceTypeNames_.read(dict.lookup("source"))),
operation_(operationTypeNames_.read(dict.lookup("operation"))),
nFaces_(0),
faceId_(),
facePatchId_(),
flipMap_(),
faceSign_(),
weightFieldName_("undefinedWeightedFieldName")
{
read(dict);
@ -326,7 +331,7 @@ void Foam::fieldValues::faceSource::write()
{
outputFilePtr_()
<< obr_.time().value() << tab
<< sum(filterField(mesh().magSf()));
<< sum(filterField(mesh().magSf(), false));
}
forAll(fields_, i)

25
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
View File

@ -53,6 +53,15 @@ Description
- areaAverage
- areaIntegrate
- weightedAverage
- min
- max
Notes:
- faces on empty patches get ignored
- if the field is a volField the faceZone can only consist of boundary
faces.
- all fields get oriented according to the faceZone (so you might e.g. see
negative pressure)
SourceFiles
faceSource.C
@ -64,7 +73,6 @@ SourceFiles
#include "NamedEnum.H"
#include "fieldValue.H"
#include "labelList.H"
#include "surfaceFieldsFwd.H"
#include "volFieldsFwd.H"
@ -136,14 +144,17 @@ protected:
//- Operation to apply to values
operationType operation_;
//- Global number of faces
label nFaces_;
//- Local list of face IDs
labelList faceId_;
//- Local list of patch ID per face
labelList facePatchId_;
//- List of +1/-1 representing face flip map
labelList flipMap_;
//- List of +1/-1 representing face flip map (1 use as is, -1 negate)
labelList faceSign_;
//- Weight field name - only used for opWeightedAverage mode
word weightFieldName_;
@ -209,7 +220,7 @@ public:
inline const labelList& facePatch() const;
//- Return the list of +1/-1 representing face flip map
inline const labelList& flipMap() const;
inline const labelList& faceSign() const;
// Function object functions
@ -228,14 +239,16 @@ public:
template<class Type>
tmp<Field<Type> > filterField
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& field
const GeometricField<Type, fvsPatchField, surfaceMesh>& field,
const bool applyOrientation
) const;
//- Filter a volume field according to faceIds
template<class Type>
tmp<Field<Type> > filterField
(
const GeometricField<Type, fvPatchField, volMesh>& field
const GeometricField<Type, fvPatchField, volMesh>& field,
const bool applyOrientation
) const;
};

4
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceI.H
View File

@ -49,9 +49,9 @@ Foam::fieldValues::faceSource::facePatch() const
inline const Foam::labelList&
Foam::fieldValues::faceSource::flipMap() const
Foam::fieldValues::faceSource::faceSign() const
{
return flipMap_;
return faceSign_;
}

33
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
View File

@ -60,14 +60,14 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::setFieldValues
if (obr_.foundObject<sf>(fieldName))
{
return filterField(obr_.lookupObject<sf>(fieldName));
return filterField(obr_.lookupObject<sf>(fieldName), true);
}
else if (obr_.foundObject<vf>(fieldName))
{
return filterField(obr_.lookupObject<vf>(fieldName));
return filterField(obr_.lookupObject<vf>(fieldName), true);
}
return tmp<Field<Type> >(new Field<Type>(0.0));
return tmp<Field<Type> >(new Field<Type>(0));
}
@ -131,10 +131,13 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
if (ok)
{
// Get (correctly oriented) field
Field<Type> values = combineFields(setFieldValues<Type>(fieldName));
scalarField magSf = combineFields(filterField(mesh().magSf()));
// Get unoriented magSf
scalarField magSf = combineFields(filterField(mesh().magSf(), false));
// Get (correctly oriented) weighting field
scalarField weightField =
combineFields(setFieldValues<scalar>(weightFieldName_));
@ -177,7 +180,8 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
(
const GeometricField<Type, fvPatchField, volMesh>& field
const GeometricField<Type, fvPatchField, volMesh>& field,
const bool applyOrientation
) const
{
tmp<Field<Type> > tvalues(new Field<Type>(faceId_.size()));
@ -205,8 +209,14 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
<< " Unable to process internal faces for volume field "
<< field.name() << nl << abort(FatalError);
}
}
values[i] *= flipMap_[i];
if (applyOrientation)
{
forAll(values, i)
{
values[i] *= faceSign_[i];
}
}
return tvalues;
@ -216,7 +226,8 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& field
const GeometricField<Type, fvsPatchField, surfaceMesh>& field,
const bool applyOrientation
) const
{
tmp<Field<Type> > tvalues(new Field<Type>(faceId_.size()));
@ -234,8 +245,14 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
{
values[i] = field[faceI];
}
}
values[i] *= flipMap_[i];
if (applyOrientation)
{
forAll(values, i)
{
values[i] *= faceSign_[i];
}
}
return tvalues;