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

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

Browse Source
This commit is contained in:
mattijs
2013-07-11 11:29:58 +01:00
parent c2e3902e7a 8973ce9b88
commit 00c663bca4
5 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
View File

@ -481,7 +481,8 @@ Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::faceAreaWeightAMI
const scalarField& srcMagSf,
const scalarField& tgtMagSf,
const faceAreaIntersect::triangulationMode& triMode,
const bool reverseTarget
const bool reverseTarget,
const bool restartUncoveredSourceFace
)
:
AMIMethod<SourcePatch, TargetPatch>
@ -492,7 +493,8 @@ Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::faceAreaWeightAMI
tgtMagSf,
triMode,
reverseTarget
)
),
restartUncoveredSourceFace_(restartUncoveredSourceFace)
{}
@ -557,7 +559,7 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
// Check for badly covered faces
if (debug)
if (restartUncoveredSourceFace_)
{
restartUncoveredSourceFace
(

10
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
View File

@ -51,6 +51,13 @@ class faceAreaWeightAMI
:
public AMIMethod<SourcePatch, TargetPatch>
{
private:
// Private data
//- Flag to restart uncovered source faces
const bool restartUncoveredSourceFace_;
protected:
@ -136,7 +143,8 @@ public:
const scalarField& srcMagSf,
const scalarField& tgtMagSf,
const faceAreaIntersect::triangulationMode& triMode,
const bool reverseTarget = false
const bool reverseTarget = false,
const bool restartUncoveredSourceFace = true
);

8
src/meshTools/searchableSurface/searchableSphere.C
View File

@ -47,13 +47,11 @@ Foam::pointIndexHit Foam::searchableSphere::findNearest
{
pointIndexHit info(false, sample, -1);
const vector n(sample-centre_);
scalar magSqrN = magSqr(n);
const vector n(sample - centre_);
scalar magN = mag(n);
if (nearestDistSqr >= magSqrN)
if (nearestDistSqr >= sqr(magN - radius_))
{
scalar magN = Foam::sqrt(magSqrN);
if (magN < ROOTVSMALL)
{
info.rawPoint() = centre_ + vector(1,0,0)*radius_;