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

functionObjects: Completed transformation of 'source' to vol/surfaceRegion

Browse Source
This commit is contained in:
Henry Weller 2016-06-13 09:42:14 +01:00
parent ae1a6dd12d
commit 118a0f225d
16 changed files with 71 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
View File

@ -15,13 +15,13 @@ writeControl timeStep;
writeInterval 1 writeInterval 1
log false; log false;
source1 region1
{ {
#includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" #includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg"
operation areaAverage; operation areaAverage;
fields (p); fields (p);
} }
source2 region2
{ {
#includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg" #includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg"
operation areaAverage; operation areaAverage;

4
etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
View File

@ -8,12 +8,12 @@
#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg" #includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
source1 region1
{ {
regionType patch; regionType patch;
name $patch1; name $patch1;
} }
source2 region2
{ {
regionType patch; regionType patch;
name $patch2; name $patch2;

6
etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
View File

@ -8,7 +8,7 @@
#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg" #includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
source1 region1
{ {
regionType sampledSurface; regionType sampledSurface;
@ -21,9 +21,9 @@ source1
} }
} }
source2 region2
{ {
$source1; $region1;
sampledSurfaceDict sampledSurfaceDict
{ {
surface $triSurface2; surface $triSurface2;

3
src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
View File

@ -133,9 +133,6 @@ public:
//- Return the input dictionary //- Return the input dictionary
inline const dictionary& dict() const; inline const dictionary& dict() const;
//- Return the region name
inline const word& regionName() const;
//- Return the execute control object //- Return the execute control object
inline const Foam::timeControl& executeControl() const; inline const Foam::timeControl& executeControl() const;

10
src/functionObjects/field/fieldValues/controlDict
View File

@ -60,8 +60,8 @@ functions
// Output field values as well // Output field values as well
writeFields true; writeFields true;
// Type of source: patch/faceZone/sampledSurface // Type of region: patch/faceZone/sampledSurface
source patch; regionType patch;
// if patch or faceZone: name of patch or faceZone // if patch or faceZone: name of patch or faceZone
name movingWall; name movingWall;
@ -73,7 +73,7 @@ functions
// // Sampling on triSurface // // Sampling on triSurface
// type sampledTriSurfaceMesh; // type sampledTriSurfaceMesh;
// surface integrationPlane.stl; // surface integrationPlane.stl;
// source cells; // sample cells or boundaryFaces // regionType cells; // sample cells or boundaryFaces
// interpolate true; // interpolate true;
//} //}
@ -96,7 +96,7 @@ functions
writeControl writeTime; writeControl writeTime;
log true; log true;
writeFields true; writeFields true;
source faceZone; regionType faceZone;
name f0; name f0;
operation sum; operation sum;
@ -114,7 +114,7 @@ functions
writeControl writeTime; writeControl writeTime;
log true; log true;
writeFields true; writeFields true;
source cellZone; regionType cellZone;
name c0; name c0;
operation volAverage; operation volAverage;

4
src/functionObjects/field/fieldValues/fieldValue/fieldValue.C
View File

@ -51,7 +51,7 @@ Foam::functionObjects::fieldValue::fieldValue
: :
writeFiles(name, runTime, dict, name), writeFiles(name, runTime, dict, name),
dict_(dict), dict_(dict),
name_(word::null), regionName_(word::null),
resultDict_(fileName("name"), dictionary::null) resultDict_(fileName("name"), dictionary::null)
{ {
read(dict); read(dict);
@ -69,7 +69,7 @@ Foam::functionObjects::fieldValue::fieldValue
: :
writeFiles(name, obr, dict, name), writeFiles(name, obr, dict, name),
dict_(dict), dict_(dict),
name_(word::null), regionName_(word::null),
resultDict_(fileName("name"), dictionary::null) resultDict_(fileName("name"), dictionary::null)
{ {
read(dict); read(dict);

8
src/functionObjects/field/fieldValues/fieldValue/fieldValue.H
View File

@ -69,8 +69,8 @@ protected:
//- Construction dictionary //- Construction dictionary
dictionary dict_; dictionary dict_;
//- Name of source object //- Name of region (patch, zone, etc.)
word name_; word regionName_;
//- List of field names to operate on //- List of field names to operate on
wordList fields_; wordList fields_;
@ -153,8 +153,8 @@ public:
//- Return the reference to the construction dictionary //- Return the reference to the construction dictionary
inline const dictionary& dict() const; inline const dictionary& dict() const;
//- Return the source name //- Return the region name
inline const word& name() const; inline const word& regionName() const;
//- Return the list of field names //- Return the list of field names
inline const wordList& fields() const; inline const wordList& fields() const;

4
src/functionObjects/field/fieldValues/fieldValue/fieldValueI.H
View File

@ -34,9 +34,9 @@ inline const Foam::dictionary& Foam::functionObjects::fieldValue::dict() const
} }
inline const Foam::word& Foam::functionObjects::fieldValue::name() const inline const Foam::word& Foam::functionObjects::fieldValue::regionName() const
{ {
return name_; return regionName_;
} }

28
src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
View File

@ -68,8 +68,8 @@ void Foam::functionObjects::fieldValues::fieldValueDelta::writeFileHeader
const label i const label i
) )
{ {
const wordList& fields1 = source1Ptr_->fields(); const wordList& fields1 = region1Ptr_->fields();
const wordList& fields2 = source2Ptr_->fields(); const wordList& fields2 = region2Ptr_->fields();
DynamicList<word> commonFields(fields1.size()); DynamicList<word> commonFields(fields1.size());
forAll(fields1, i) forAll(fields1, i)
@ -83,8 +83,8 @@ void Foam::functionObjects::fieldValues::fieldValueDelta::writeFileHeader
Ostream& os = file(); Ostream& os = file();
writeHeaderValue(os, "Source1", source1Ptr_->name()); writeHeaderValue(os, "Source1", region1Ptr_->name());
writeHeaderValue(os, "Source2", source2Ptr_->name()); writeHeaderValue(os, "Source2", region2Ptr_->name());
writeHeaderValue(os, "Operation", operationTypeNames_[operation_]); writeHeaderValue(os, "Operation", operationTypeNames_[operation_]);
writeCommented(os, "Time"); writeCommented(os, "Time");
@ -108,8 +108,8 @@ Foam::functionObjects::fieldValues::fieldValueDelta::fieldValueDelta
: :
writeFiles(name, runTime, dict, name), writeFiles(name, runTime, dict, name),
operation_(opSubtract), operation_(opSubtract),
source1Ptr_(NULL), region1Ptr_(NULL),
source2Ptr_(NULL) region2Ptr_(NULL)
{ {
if (!isA<fvMesh>(obr_)) if (!isA<fvMesh>(obr_))
{ {
@ -137,23 +137,23 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::read
{ {
writeFiles::read(dict); writeFiles::read(dict);
source1Ptr_.reset region1Ptr_.reset
( (
fieldValue::New fieldValue::New
( (
name() + ".source1", name() + ".region1",
obr_, obr_,
dict.subDict("source1"), dict.subDict("region1"),
false false
).ptr() ).ptr()
); );
source2Ptr_.reset region2Ptr_.reset
( (
fieldValue::New fieldValue::New
( (
name() + ".source2", name() + ".region2",
obr_, obr_,
dict.subDict("source2"), dict.subDict("region2"),
false false
).ptr() ).ptr()
); );
@ -168,8 +168,8 @@ bool Foam::functionObjects::fieldValues::fieldValueDelta::write()
{ {
writeFiles::write(); writeFiles::write();
source1Ptr_->write(); region1Ptr_->write();
source2Ptr_->write(); region2Ptr_->write();
if (Pstream::master()) if (Pstream::master())
{ {

8
src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
View File

@ -118,11 +118,11 @@ private:
//- Operation to apply to values //- Operation to apply to values
operationType operation_; operationType operation_;
//- Field value source object 1 //- Field value region object 1
autoPtr<fieldValue> source1Ptr_; autoPtr<fieldValue> region1Ptr_;
//- Field value source object 2 //- Field value region object 2
autoPtr<fieldValue> source2Ptr_; autoPtr<fieldValue> region2Ptr_;
// Private Member Functions // Private Member Functions

6
src/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
View File

@ -87,10 +87,10 @@ void Foam::functionObjects::fieldValues::fieldValueDelta::processFields
typedef GeometricField<Type, fvPatchField, volMesh> vf; typedef GeometricField<Type, fvPatchField, volMesh> vf;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> sf; typedef GeometricField<Type, fvsPatchField, surfaceMesh> sf;
const wordList& fields1 = source1Ptr_->fields(); const wordList& fields1 = region1Ptr_->fields();
const dictionary& results1 = source1Ptr_->resultDict(); const dictionary& results1 = region1Ptr_->resultDict();
const dictionary& results2 = source2Ptr_->resultDict(); const dictionary& results2 = region2Ptr_->resultDict();
Type r1(Zero); Type r1(Zero);
Type r2(Zero); Type r2(Zero);

20
src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.C
View File

@ -102,14 +102,14 @@ const Foam::NamedEnum
void Foam::functionObjects::fieldValues::surfaceRegion::setFaceZoneFaces() void Foam::functionObjects::fieldValues::surfaceRegion::setFaceZoneFaces()
{ {
label zoneId = mesh().faceZones().findZoneID(name_); label zoneId = mesh().faceZones().findZoneID(regionName_);
if (zoneId < 0) if (zoneId < 0)
{ {
FatalErrorInFunction FatalErrorInFunction
<< type() << " " << name() << ": " << type() << " " << name() << ": "
<< regionTypeNames_[regionType_] << "(" << name_ << "):" << nl << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl
<< " Unknown face zone name: " << name_ << " Unknown face zone name: " << regionName_
<< ". Valid face zones are: " << mesh().faceZones().names() << ". Valid face zones are: " << mesh().faceZones().names()
<< nl << exit(FatalError); << nl << exit(FatalError);
} }
@ -187,14 +187,14 @@ void Foam::functionObjects::fieldValues::surfaceRegion::setFaceZoneFaces()
void Foam::functionObjects::fieldValues::surfaceRegion::setPatchFaces() void Foam::functionObjects::fieldValues::surfaceRegion::setPatchFaces()
{ {
const label patchid = mesh().boundaryMesh().findPatchID(name_); const label patchid = mesh().boundaryMesh().findPatchID(regionName_);
if (patchid < 0) if (patchid < 0)
{ {
FatalErrorInFunction FatalErrorInFunction
<< type() << " " << name() << ": " << type() << " " << name() << ": "
<< regionTypeNames_[regionType_] << "(" << name_ << "):" << nl << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl
<< " Unknown patch name: " << name_ << " Unknown patch name: " << regionName_
<< ". Valid patch names are: " << ". Valid patch names are: "
<< mesh().boundaryMesh().names() << nl << mesh().boundaryMesh().names() << nl
<< exit(FatalError); << exit(FatalError);
@ -423,7 +423,7 @@ void Foam::functionObjects::fieldValues::surfaceRegion::initialise
const dictionary& dict const dictionary& dict
) )
{ {
dict.lookup("name") >> name_; dict.lookup("name") >> regionName_;
switch (regionType_) switch (regionType_)
{ {
@ -446,7 +446,7 @@ void Foam::functionObjects::fieldValues::surfaceRegion::initialise
{ {
FatalErrorInFunction FatalErrorInFunction
<< type() << " " << name() << ": " << type() << " " << name() << ": "
<< regionTypeNames_[regionType_] << "(" << name_ << "):" << regionTypeNames_[regionType_] << "(" << regionName_ << "):"
<< nl << " Unknown region type. Valid region types are:" << nl << " Unknown region type. Valid region types are:"
<< regionTypeNames_.sortedToc() << nl << exit(FatalError); << regionTypeNames_.sortedToc() << nl << exit(FatalError);
} }
@ -456,7 +456,7 @@ void Foam::functionObjects::fieldValues::surfaceRegion::initialise
{ {
FatalErrorInFunction FatalErrorInFunction
<< type() << " " << name() << ": " << type() << " " << name() << ": "
<< regionTypeNames_[regionType_] << "(" << name_ << "):" << nl << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl
<< " Region has no faces" << exit(FatalError); << " Region has no faces" << exit(FatalError);
} }
@ -539,7 +539,7 @@ void Foam::functionObjects::fieldValues::surfaceRegion::writeFileHeader
) )
{ {
writeCommented(file(), "Region type : "); writeCommented(file(), "Region type : ");
file() << regionTypeNames_[regionType_] << " " << name_ << endl; file() << regionTypeNames_[regionType_] << " " << regionName_ << endl;
writeCommented(file(), "Faces : "); writeCommented(file(), "Faces : ");
file() << nFaces_ << endl; file() << nFaces_ << endl;
writeCommented(file(), "Area : "); writeCommented(file(), "Area : ");

6
src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegionTemplates.C
View File

@ -321,7 +321,7 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::writeValues
surfaceWriterPtr_->write surfaceWriterPtr_->write
( (
outputDir, outputDir,
word(regionTypeNames_[regionType_]) + "_" + name_, word(regionTypeNames_[regionType_]) + "_" + regionName_,
points, points,
faces, faces,
fieldName, fieldName,
@ -345,7 +345,7 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::writeValues
file()<< tab << result; file()<< tab << result;
Log << " " << operationTypeNames_[operation_] Log << " " << operationTypeNames_[operation_]
<< "(" << name_ << ") of " << fieldName << "(" << regionName_ << ") of " << fieldName
<< " = " << result << endl; << " = " << result << endl;
} }
} }
@ -377,7 +377,7 @@ Foam::functionObjects::fieldValues::surfaceRegion::filterField
{ {
FatalErrorInFunction FatalErrorInFunction
<< type() << " " << name() << ": " << type() << " " << name() << ": "
<< regionTypeNames_[regionType_] << "(" << name_ << "):" << regionTypeNames_[regionType_] << "(" << regionName_ << "):"
<< nl << nl
<< " Unable to process internal faces for volume field " << " Unable to process internal faces for volume field "
<< field.name() << nl << abort(FatalError); << field.name() << nl << abort(FatalError);

12
src/functionObjects/field/fieldValues/volRegion/volRegion.C
View File

@ -93,14 +93,14 @@ void Foam::functionObjects::fieldValues::volRegion::setCellZoneCells()
{ {
case stCellZone: case stCellZone:
{ {
dict().lookup("name") >> name_; dict().lookup("name") >> regionName_;
label zoneId = mesh().cellZones().findZoneID(name_); label zoneId = mesh().cellZones().findZoneID(regionName_);
if (zoneId < 0) if (zoneId < 0)
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Unknown cell zone name: " << name_ << "Unknown cell zone name: " << regionName_
<< ". Valid cell zones are: " << mesh().cellZones().names() << ". Valid cell zones are: " << mesh().cellZones().names()
<< nl << exit(FatalError); << nl << exit(FatalError);
} }
@ -151,14 +151,14 @@ void Foam::functionObjects::fieldValues::volRegion::initialise
{ {
FatalErrorInFunction FatalErrorInFunction
<< type() << " " << name() << ": " << type() << " " << name() << ": "
<< regionTypeNames_[regionType_] << "(" << name_ << "):" << nl << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl
<< " Region has no cells" << exit(FatalError); << " Region has no cells" << exit(FatalError);
} }
volume_ = volume(); volume_ = volume();
Info<< type() << " " << name() << ":" Info<< type() << " " << name() << ":"
<< regionTypeNames_[regionType_] << "(" << name_ << "):" << nl << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl
<< " total cells = " << nCells_ << nl << " total cells = " << nCells_ << nl
<< " total volume = " << volume_ << " total volume = " << volume_
<< nl << endl; << nl << endl;
@ -178,7 +178,7 @@ void Foam::functionObjects::fieldValues::volRegion::writeFileHeader
) )
{ {
writeCommented(file(), "Region type : "); writeCommented(file(), "Region type : ");
file() << regionTypeNames_[regionType_] << " " << name_ << endl; file() << regionTypeNames_[regionType_] << " " << regionName_ << endl;
writeCommented(file(), "Cells : "); writeCommented(file(), "Cells : ");
file() << nCells_ << endl; file() << nCells_ << endl;
writeCommented(file(), "Volume : "); writeCommented(file(), "Volume : ");

4
src/functionObjects/field/fieldValues/volRegion/volRegionTemplates.C
View File

@ -192,7 +192,7 @@ bool Foam::functionObjects::fieldValues::volRegion::writeValues
IOobject IOobject
( (
fieldName + "_" + regionTypeNames_[regionType_] + "-" fieldName + "_" + regionTypeNames_[regionType_] + "-"
+ name_, + regionName_,
obr_.time().timeName(), obr_.time().timeName(),
obr_, obr_,
IOobject::NO_READ, IOobject::NO_READ,
@ -206,7 +206,7 @@ bool Foam::functionObjects::fieldValues::volRegion::writeValues
file()<< tab << result; file()<< tab << result;
Log << " " << operationTypeNames_[operation_] Log << " " << operationTypeNames_[operation_]
<< "(" << name_ << ") of " << fieldName << "(" << regionName_ << ") of " << fieldName
<< " = " << result << endl; << " = " << result << endl;
} }
} }

2
src/functionObjects/field/readFields/postProcessingDict
View File

@ -39,7 +39,7 @@ functions
writeInterval 1; writeInterval 1;
log true; log true;
writeFields true; writeFields true;
source faceZone; regionType faceZone;
name f0; name f0;
operation areaAverage; operation areaAverage;