mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
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:
@ -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()
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
|
||||
Reference in New Issue
Block a user