songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs 2012-12-17 14:34:00 +00:00
commit 1b277864db
7 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
View File

@ -127,7 +127,6 @@ Foam::interRegionHeatTransferModel::~interRegionHeatTransferModel()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::interRegionHeatTransferModel::addSup void Foam::interRegionHeatTransferModel::addSup
( (
fvMatrix<scalar>& eEqn, fvMatrix<scalar>& eEqn,

4
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
View File

@ -453,7 +453,7 @@ public:
void interpolateToSource void interpolateToSource
( (
const UList<Type>& fld, const UList<Type>& fld,
const CombineOp& bop, const CombineOp& cop,
List<Type>& result List<Type>& result
) const; ) const;
@ -463,7 +463,7 @@ public:
void interpolateToTarget void interpolateToTarget
( (
const UList<Type>& fld, const UList<Type>& fld,
const CombineOp& bop, const CombineOp& cop,
List<Type>& result List<Type>& result
) const; ) const;

4
src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
View File

@ -321,11 +321,11 @@ public:
) const; ) const;
//- Low-level interpolate List //- Low-level interpolate List
template<class Type, class BinaryOp> template<class Type, class CombineOp>
void interpolate void interpolate
( (
const UList<Type>& fld, const UList<Type>& fld,
const BinaryOp& bop, const CombineOp& cop,
List<Type>& result List<Type>& result
) const; ) const;

10
src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -59,21 +59,21 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
} }
template<class Type, class BinaryOp> template<class Type, class CombineOp>
void Foam::cyclicAMIPolyPatch::interpolate void Foam::cyclicAMIPolyPatch::interpolate
( (
const UList<Type>& fld, const UList<Type>& fld,
const BinaryOp& bop, const CombineOp& cop,
List<Type>& result List<Type>& result
) const ) const
{ {
if (owner()) if (owner())
{ {
AMI().interpolateToSource(fld, bop, result); AMI().interpolateToSource(fld, cop, result);
} }
else else
{ {
neighbPatch().AMI().interpolateToTarget(fld, bop, result); neighbPatch().AMI().interpolateToTarget(fld, cop, result);
} }
} }

8
src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
View File

@ -266,4 +266,12 @@ bool Foam::codedFunctionObject::read(const dictionary& dict)
} }
void Foam::codedFunctionObject::updateMesh(const mapPolyMesh&)
{}
void Foam::codedFunctionObject::movePoints(const polyMesh&)
{}
// ************************************************************************* // // ************************************************************************* //

4
src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -82,8 +82,10 @@ void vanDriestDelta::calcDelta()
} }
} }
scalar cutOff = wallPointYPlus::yPlusCutOff;
wallPointYPlus::yPlusCutOff = 500; wallPointYPlus::yPlusCutOff = 500;
wallDistData<wallPointYPlus> y(mesh_, ystar); wallDistData<wallPointYPlus> y(mesh_, ystar);
wallPointYPlus::yPlusCutOff = cutOff;
delta_ = min delta_ = min
( (

4
src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,8 +81,10 @@ void vanDriestDelta::calcDelta()
} }
} }
scalar cutOff = wallPointYPlus::yPlusCutOff;
wallPointYPlus::yPlusCutOff = 500; wallPointYPlus::yPlusCutOff = 500;
wallDistData<wallPointYPlus> y(mesh_, ystar); wallDistData<wallPointYPlus> y(mesh_, ystar);
wallPointYPlus::yPlusCutOff = cutOff;
delta_ = min delta_ = min
( (