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 'olesenm'

Browse Source
This commit is contained in:
andy
2011-01-04 10:52:41 +00:00
parent 372fcb4305 b50395b846
commit 7a6cfda2f8
972 changed files with 7372 additions and 4906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
View File

@ -30,7 +30,11 @@ License
namespace Foam
{
template<>
const char* Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>::names[] =
const char* Foam::NamedEnum
<
Foam::fieldAverageItem::baseType,
2
>::names[] =
{
"iteration",
"time"

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

@ -36,7 +36,11 @@ defineTypeNameAndDebug(Foam::fieldMinMax, 0);
namespace Foam
{
template<>
const char* Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>::names[] =
const char* Foam::NamedEnum
<
Foam::fieldMinMax::modeType,
2
>::names[] =
{
"magnitude",
"component"

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

@ -31,21 +31,42 @@ License
defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2>::
names[] = {"cellZone", "all"};
namespace Foam
{
template<>
const char* Foam::NamedEnum
<
Foam::fieldValues::cellSource::sourceType,
2
>::names[] =
{
"cellZone",
"all"
};
template<>
const char* Foam::NamedEnum
<
Foam::fieldValues::cellSource::operationType,
7
>::names[] =
{
"none",
"sum",
"volAverage",
"volIntegrate",
"weightedAverage",
"min",
"max"
};
}
const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2>
Foam::fieldValues::cellSource::sourceTypeNames_;
template<>
const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
names[] =
{
"none", "sum", "volAverage",
"volIntegrate", "weightedAverage", "min", "max"
};
const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>
Foam::fieldValues::cellSource::operationTypeNames_;

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

@ -119,12 +119,14 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
if (ok)
{
Field<Type> values = combineFields(setFieldValues<Type>(fieldName));
Field<Type> values(combineFields(setFieldValues<Type>(fieldName)));
scalarField V = combineFields(filterField(mesh().V()));
scalarField V(combineFields(filterField(mesh().V())));
scalarField weightField =
combineFields(setFieldValues<scalar>(weightFieldName_));
scalarField weightField
(
combineFields(setFieldValues<scalar>(weightFieldName_))
);
if (Pstream::master())
{

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

@ -34,25 +34,43 @@ License
defineTypeNameAndDebug(Foam::fieldValues::faceSource, 0);
template<>
const char* Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 3>::
names[] =
namespace Foam
{
"faceZone", "patch", "sampledSurface"
};
template<>
const char* Foam::NamedEnum
<
Foam::fieldValues::faceSource::sourceType,
3
>::names[] =
{
"faceZone",
"patch",
"sampledSurface"
};
template<>
const char* Foam::NamedEnum
<
Foam::fieldValues::faceSource::operationType,
7
>::names[] =
{
"none",
"sum",
"areaAverage",
"areaIntegrate",
"weightedAverage",
"min",
"max"
};
}
const Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 3>
Foam::fieldValues::faceSource::sourceTypeNames_;
template<>
const char* Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>::
names[] =
{
"none", "sum", "areaAverage",
"areaIntegrate", "weightedAverage", "min", "max"
};
const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>
Foam::fieldValues::faceSource::operationTypeNames_;

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

@ -138,8 +138,8 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
if (ok)
{
Field<Type> values = getFieldValues<Type>(fieldName);
scalarField weightField = getFieldValues<scalar>(weightFieldName_);
Field<Type> values(getFieldValues<Type>(fieldName));
scalarField weightField(getFieldValues<scalar>(weightFieldName_));
scalarField magSf;
if (surfacePtr_.valid())