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

ENH: AMI - further robustness improvements

Browse Source
This commit is contained in:
andy
2014-01-15 12:44:35 +00:00
parent e18b42c881
commit 2faa7efea4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -310,6 +310,8 @@ Foam::scalar Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::interArea
const label tgtFaceI const label tgtFaceI
) const ) const
{ {
scalar area = 0;
const pointField& srcPoints = this->srcPatch_.points(); const pointField& srcPoints = this->srcPatch_.points();
const pointField& tgtPoints = this->tgtPatch_.points(); const pointField& tgtPoints = this->tgtPatch_.points();
@ -322,7 +324,7 @@ Foam::scalar Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::interArea
const scalar tgtMag = tgt.mag(tgtPoints); const scalar tgtMag = tgt.mag(tgtPoints);
if ((this->srcMagSf_[srcFaceI] < ROOTVSMALL) || (tgtMag < ROOTVSMALL)) if ((this->srcMagSf_[srcFaceI] < ROOTVSMALL) || (tgtMag < ROOTVSMALL))
{ {
return 0.0; return area;
} }
// create intersection object // create intersection object
@ -338,12 +340,11 @@ Foam::scalar Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::interArea
{ {
n += this->tgtPatch_.faceNormals()[tgtFaceI]; n += this->tgtPatch_.faceNormals()[tgtFaceI];
} }
n *= 0.5; scalar magN = mag(n);
scalar area = 0; if (magN > ROOTVSMALL)
if (mag(n) > ROOTVSMALL)
{ {
area = inter.calc(src, tgt, n, this->triMode_); area = inter.calc(src, tgt, n/magN, this->triMode_);
} }
else else
{ {
@ -549,7 +550,7 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
tgtFaceI tgtFaceI
); );
if (this->srcNonOverlap_.size() != 0) if (debug && !this->srcNonOverlap_.empty())
{ {
Pout<< " AMI: " << this->srcNonOverlap_.size() Pout<< " AMI: " << this->srcNonOverlap_.size()
<< " non-overlap faces identified" << " non-overlap faces identified"