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

cyclicACMIPolyPatch: remove tolerance from the ACMI interpolation

Browse Source 
Maybe resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1335
awaiting feedback from reporter.
This commit is contained in:
Henry Weller
2015-10-24 21:39:10 +01:00
parent 8a25e3aad7
commit f19e3deb40
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.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) 2013-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -23,8 +23,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type> template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
( (
@ -32,27 +30,20 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
const Field<Type>& fldNonOverlap const Field<Type>& fldNonOverlap
) const ) const
{ {
// note: do not scale AMI field as face areas have already been taken // Note: do not scale AMI field as face areas have already been taken into
// into account // account
if (owner()) if (owner())
{ {
const scalarField& w = srcMask_; return
AMI().interpolateToSource(fldCouple)
tmp<Field<Type> > interpField(AMI().interpolateToSource(fldCouple)); + (1.0 - AMI().srcWeightsSum())*fldNonOverlap;
return interpField + (1.0 - w)*fldNonOverlap;
} }
else else
{ {
const scalarField& w = neighbPatch().tgtMask(); return
tmp<Field<Type> > interpField
(
neighbPatch().AMI().interpolateToTarget(fldCouple) neighbPatch().AMI().interpolateToTarget(fldCouple)
); + (1.0 - neighbPatch().AMI().tgtWeightsSum())*fldNonOverlap;
return interpField + (1.0 - w)*fldNonOverlap;
} }
} }
@ -77,22 +68,18 @@ void Foam::cyclicACMIPolyPatch::interpolate
List<Type>& result List<Type>& result
) const ) const
{ {
// note: do not scale AMI field as face areas have already been taken // Note: do not scale AMI field as face areas have already been taken into
// into account // account
if (owner()) if (owner())
{ {
const scalarField& w = srcMask_;
AMI().interpolateToSource(fldCouple, cop, result); AMI().interpolateToSource(fldCouple, cop, result);
result = result + (1.0 - w)*fldNonOverlap; result += (1.0 - AMI().srcWeightsSum())*fldNonOverlap;
} }
else else
{ {
const scalarField& w = neighbPatch().tgtMask();
neighbPatch().AMI().interpolateToTarget(fldCouple, cop, result); neighbPatch().AMI().interpolateToTarget(fldCouple, cop, result);
result = result + (1.0 - w)*fldNonOverlap; result += (1.0 - neighbPatch().AMI().tgtWeightsSum())*fldNonOverlap;
} }
} }