Commit 1b277864 authored by mattijs's avatar mattijs
Browse files

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

parents e9be8229 1d3aaec8
......@@ -127,7 +127,6 @@ Foam::interRegionHeatTransferModel::~interRegionHeatTransferModel()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::interRegionHeatTransferModel::addSup
(
fvMatrix<scalar>& eEqn,
......
......@@ -453,7 +453,7 @@ public:
void interpolateToSource
(
const UList<Type>& fld,
const CombineOp& bop,
const CombineOp& cop,
List<Type>& result
) const;
......@@ -463,7 +463,7 @@ public:
void interpolateToTarget
(
const UList<Type>& fld,
const CombineOp& bop,
const CombineOp& cop,
List<Type>& result
) const;
......
......@@ -321,11 +321,11 @@ public:
) const;
//- Low-level interpolate List
template<class Type, class BinaryOp>
template<class Type, class CombineOp>
void interpolate
(
const UList<Type>& fld,
const BinaryOp& bop,
const CombineOp& cop,
List<Type>& result
) const;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
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
(
const UList<Type>& fld,
const BinaryOp& bop,
const CombineOp& cop,
List<Type>& result
) const
{
if (owner())
{
AMI().interpolateToSource(fld, bop, result);
AMI().interpolateToSource(fld, cop, result);
}
else
{
neighbPatch().AMI().interpolateToTarget(fld, bop, result);
neighbPatch().AMI().interpolateToTarget(fld, cop, result);
}
}
......
......@@ -266,4 +266,12 @@ bool Foam::codedFunctionObject::read(const dictionary& dict)
}
void Foam::codedFunctionObject::updateMesh(const mapPolyMesh&)
{}
void Foam::codedFunctionObject::movePoints(const polyMesh&)
{}
// ************************************************************************* //
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -82,8 +82,10 @@ void vanDriestDelta::calcDelta()
}
}
scalar cutOff = wallPointYPlus::yPlusCutOff;
wallPointYPlus::yPlusCutOff = 500;
wallDistData<wallPointYPlus> y(mesh_, ystar);
wallPointYPlus::yPlusCutOff = cutOff;
delta_ = min
(
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -81,8 +81,10 @@ void vanDriestDelta::calcDelta()
}
}
scalar cutOff = wallPointYPlus::yPlusCutOff;
wallPointYPlus::yPlusCutOff = 500;
wallDistData<wallPointYPlus> y(mesh_, ystar);
wallPointYPlus::yPlusCutOff = cutOff;
delta_ = min
(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment