research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

Browse source
This commit is contained in:
mattijs 2014-08-06 17:02:00 +01:00
commit 764f07594c
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
View file

@ -19,7 +19,7 @@ functions
turbulenceFields1
{
type turbulenceFields;
functionObjectLibs ("libfieldFunctionObjects.so");
functionObjectLibs ("libutilityFunctionObjects.so");
enabled true;
outputControl timeStep;
outputInterval 1;

4
src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
View file

@ -143,7 +143,7 @@ void Foam::turbulenceFields::read(const dictionary& dict)
Info<< "storing fields:" << nl;
forAllConstIter(wordHashSet, fieldSet_, iter)
{
Info<< " " << modelName << '.' << iter.key() << nl;
Info<< " " << modelName << ':' << iter.key() << nl;
}
Info<< endl;
}
@ -151,8 +151,6 @@ void Foam::turbulenceFields::read(const dictionary& dict)
{
Info<< "no fields requested to be stored" << nl << endl;
}
execute();
}
}

6
src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
View file

@ -32,16 +32,16 @@ Description
further manipulation.
Fields are stored as copies of the original, with the prefix
"tubulenceModel::", e.g.
"tubulenceModel:", e.g.
turbulenceModel::R
turbulenceModel:R
Example of function object specification:
\verbatim
turbulenceFields1
{
type turbulenceFields;
functionObjectLibs ("libfieldFunctionObjects.so");
functionObjectLibs ("libutilityFunctionObjects.so");
...
fields
(

2
src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
View file

@ -36,7 +36,7 @@ void Foam::turbulenceFields::processField
{
typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
const word scopedName = modelName + '.' + fieldName;
const word scopedName = modelName + ':' + fieldName;
if (obr_.foundObject<FieldType>(scopedName))
{

6
src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -217,6 +217,8 @@ void Foam::radiation::P1::calculate()
E_ = absorptionEmission_->E();
const volScalarField sigmaEff(scatter_->sigmaEff());
const dimensionedScalar a0 ("a0", a_.dimensions(), ROOTVSMALL);
// Construct diffusion
const volScalarField gamma
(
@ -228,7 +230,7 @@ void Foam::radiation::P1::calculate()
IOobject::NO_READ,
IOobject::NO_WRITE
),
1.0/(3.0*a_ + sigmaEff)
1.0/(3.0*a_ + sigmaEff + a0)
);
// Solve G transport equation