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

GIT: conflict resolution

Browse Source
This commit is contained in:
andy
2012-09-26 12:13:44 +01:00
parent cedc508575 4c06fb5339
commit f1deb4445e
636 changed files with 20768 additions and 5580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,8 @@ Description
functionObjectLibs ("libfieldFunctionObjects.so");
...
log yes;
valueOutput yes;
valueOutput true;
surfaceFormat none;
source faceZone;
sourceName f0;
operation sum;
@ -64,7 +65,8 @@ Description
Property | Description | Required | Default value
type | type name: faceSource | yes |
log | write data to standard output | no | no
valueOutput | write the raw output values | yes |
valueOutput | write the output values | yes |
surfaceFormat | output value format | no |
source | face source: see below | yes |
sourceName | name of face source if required | no |
operation | operation to perform | yes |
@ -132,6 +134,7 @@ SourceFiles
#include "fieldValue.H"
#include "surfaceFieldsFwd.H"
#include "volFieldsFwd.H"
#include "surfaceWriter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -201,11 +204,21 @@ private:
//- Set faces according to sampledSurface
void sampledSurfaceFaces(const dictionary&);
//- Combine faces and points from multiple processors
void combineSurfaceGeometry
(
faceList& faces,
pointField& points
) const;
protected:
// Protected data
//- Surface writer
autoPtr<surfaceWriter> surfaceWriterPtr_;
//- Source type
sourceType source_;
@ -219,7 +232,7 @@ protected:
label nFaces_;
// If operating on mesh faces (faceZone,patch)
// If operating on mesh faces (faceZone, patch)
//- Local list of face IDs
labelList faceId_;
@ -231,6 +244,7 @@ protected:
// (1 use as is, -1 negate)
labelList faceSign_;
// If operating on sampledSurface
//- underlying sampledSurface