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' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source 
Conflicts:
	src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
	src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
	src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
This commit is contained in:
mattijs
2010-04-13 11:07:19 +01:00
parent 130dfe7dc6 9544796a98
commit defea5836e
960 changed files with 4013 additions and 5378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/postProcessing/functionObjects/field/fieldAverage/controlDict
View File

@ -36,29 +36,29 @@ writeFormat ascii;
writePrecision 6;
writeCompression uncompressed;
writeCompression off;
timeFormat general;
timePrecision 6;
runTimeModifiable yes;
runTimeModifiable true;
functions
{
fieldAverage1
{
// Type of functionObject
type fieldAverage;
type fieldAverage;
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldAverage.so");
// Function object enabled flag
enabled true;
enabled true;
// When to output the average fields
outputControl outputTime;
outputControl outputTime;
// Fields to be averaged - runTime modifiable
fields

5
src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
View File

@ -31,10 +31,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(fieldMinMax, 0);
}
defineTypeNameAndDebug(Foam::fieldMinMax, 0);
template<>

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

@ -29,32 +29,28 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>::
names[] =
{
namespace fieldValues
{
defineTypeNameAndDebug(cellSource, 0);
}
"cellZone"
};
template<>
const char* NamedEnum<fieldValues::cellSource::sourceType, 1>::
names[] = {"cellZone"};
const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>
Foam::fieldValues::cellSource::sourceTypeNames_;
const NamedEnum<fieldValues::cellSource::sourceType, 1>
fieldValues::cellSource::sourceTypeNames_;
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
names[] =
{
"none", "sum", "volAverage",
"volIntegrate", "weightedAverage", "min", "max"
};
template<>
const char* NamedEnum<fieldValues::cellSource::operationType, 7>::
names[] =
{
"none", "sum", "volAverage",
"volIntegrate", "weightedAverage", "min", "max"
};
const NamedEnum<fieldValues::cellSource::operationType, 7>
fieldValues::cellSource::operationTypeNames_;
}
const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>
Foam::fieldValues::cellSource::operationTypeNames_;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -238,4 +234,3 @@ void Foam::fieldValues::cellSource::write()
// ************************************************************************* //

12
src/postProcessing/functionObjects/field/fieldValues/controlDict
View File

@ -37,16 +37,16 @@ writeFormat ascii;
writePrecision 6;
writeCompression uncompressed;
writeCompression off;
timeFormat general;
timePrecision 6;
runTimeModifiable yes;
runTimeModifiable true;
functions
(
{
faceObj1
{
type faceSource;
@ -69,6 +69,7 @@ functions
// Operation: areaAverage/sum/weightedAverage ...
operation areaAverage;
fields
(
p
@ -88,6 +89,7 @@ functions
source faceZone;
sourceName f0;
operation sum;
fields
(
phi
@ -105,13 +107,13 @@ functions
source cellZone;
sourceName c0;
operation volAverage;
fields
(
p
U
);
}
);
}
// ************************************************************************* //

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

@ -33,32 +33,25 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
defineTypeNameAndDebug(Foam::fieldValues::faceSource, 0);
template<>
const char* Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 2>::
names[] =
{
namespace fieldValues
{
defineTypeNameAndDebug(faceSource, 0);
}
"faceZone", "patch"
};
template<>
const char* NamedEnum<fieldValues::faceSource::sourceType, 2>::
names[] = {"faceZone", "patch"};
template<>
const char* Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>::
names[] =
{
"none", "sum", "areaAverage",
"areaIntegrate", "weightedAverage", "min", "max"
};
const NamedEnum<fieldValues::faceSource::sourceType, 2>
fieldValues::faceSource::sourceTypeNames_;
template<>
const char* NamedEnum<fieldValues::faceSource::operationType, 7>::
names[] =
{
"none", "sum", "areaAverage",
"areaIntegrate", "weightedAverage", "min", "max"
};
const NamedEnum<fieldValues::faceSource::operationType, 7>
fieldValues::faceSource::operationTypeNames_;
}
const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>
Foam::fieldValues::faceSource::operationTypeNames_;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

8
src/postProcessing/functionObjects/field/readFields/postProcessingDict
View File

@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
functions
(
{
readFields1
{
type readFields;
@ -24,11 +24,13 @@ functions
enabled true;
outputControl timeStep;
outputInterval 1;
fields
(
interpolateU
);
}
faceObj2
{
type faceSource;
@ -41,12 +43,12 @@ functions
source faceZone;
sourceName f0;
operation areaAverage;
fields
(
interpolateU
);
}
);
}
// ************************************************************************* //

5
src/postProcessing/functionObjects/field/readFields/readFields.C
View File

@ -28,10 +28,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(readFields, 0);
}
defineTypeNameAndDebug(Foam::readFields, 0);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

3
src/postProcessing/functionObjects/field/streamLine/streamLine.H
View File

@ -166,8 +166,7 @@ public:
//- Destructor
virtual ~streamLine();
virtual ~streamLine();
// Member Functions

5
src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
View File

@ -31,14 +31,17 @@ License
namespace Foam
{
defineTypeNameAndDebug(streamLineParticle, 0);
defineParticleTypeNameAndDebug(streamLineParticle, 0);
defineTemplateTypeNameAndDebugWithName
(
IOField<vectorField>,
"vectorFieldField",
0
);
};
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

2
src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
View File

@ -30,7 +30,7 @@ License
namespace Foam
{
defineTemplateTypeNameAndDebug(Cloud<streamLineParticle>, 0);
};
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //