Mac OS X port: fixed to tet edge swapping, with Sandeep Menon
This commit is contained in:
parent
59214afc30
commit
402a2fefee
6 changed files with 24 additions and 13 deletions
|
@ -43,7 +43,8 @@ threadHandler<T>::threadHandler
|
||||||
threader_(threader),
|
threader_(threader),
|
||||||
argList_(0),
|
argList_(0),
|
||||||
nThreads_(threader.getNumThreads()),
|
nThreads_(threader.getNumThreads()),
|
||||||
pthreadID_(-1),
|
pthreadID_(0),//HJ, bug fix - please review (-1 not allowed)
|
||||||
|
// pthreadID_(-1),
|
||||||
master_(false),
|
master_(false),
|
||||||
predicate_(false)
|
predicate_(false)
|
||||||
{}
|
{}
|
||||||
|
|
|
@ -33,7 +33,7 @@ Author
|
||||||
University of Massachusetts Amherst
|
University of Massachusetts Amherst
|
||||||
All rights reserved
|
All rights reserved
|
||||||
|
|
||||||
\*----------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
#include "dynamicTopoFvMesh.H"
|
#include "dynamicTopoFvMesh.H"
|
||||||
#include "addToRunTimeSelectionTable.H"
|
#include "addToRunTimeSelectionTable.H"
|
||||||
|
@ -1519,12 +1519,15 @@ void dynamicTopoFvMesh::initializeThreadingEnvironment
|
||||||
|
|
||||||
if (threadI == 0)
|
if (threadI == 0)
|
||||||
{
|
{
|
||||||
handlerPtr_[0].setID(-1);
|
// HJ, bug fix - please review: negative number not allowed
|
||||||
|
// HJ, 6/Nov/2010
|
||||||
|
handlerPtr_[0].setID(0);
|
||||||
|
// handlerPtr_[0].setID(-1);
|
||||||
handlerPtr_[0].setMaster();
|
handlerPtr_[0].setMaster();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
handlerPtr_[threadI].setID(threader_->getID(threadI-1));
|
handlerPtr_[threadI].setID(threader_->getID(threadI - 1));
|
||||||
handlerPtr_[threadI].setSlave();
|
handlerPtr_[threadI].setSlave();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,6 +42,7 @@ defineTypeNameAndDebug(eMesh, 0);
|
||||||
|
|
||||||
word eMesh::meshSubDir = "eMesh";
|
word eMesh::meshSubDir = "eMesh";
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||||
|
|
||||||
void eMesh::clearGeom() const
|
void eMesh::clearGeom() const
|
||||||
|
|
|
@ -80,6 +80,16 @@ ePatch::ePatch
|
||||||
size_(readLabel(dict.lookup("size")))
|
size_(readLabel(dict.lookup("size")))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
ePatch::ePatch(const ePatch& p)
|
||||||
|
:
|
||||||
|
patchIdentifier(p, p.index()),
|
||||||
|
boundaryMesh_(p.boundaryMesh_),
|
||||||
|
start_(p.start()),
|
||||||
|
size_(p.size())
|
||||||
|
{}
|
||||||
|
|
||||||
|
|
||||||
ePatch::ePatch(const ePatch& p, const eBoundaryMesh& bm)
|
ePatch::ePatch(const ePatch& p, const eBoundaryMesh& bm)
|
||||||
:
|
:
|
||||||
patchIdentifier(p, p.index()),
|
patchIdentifier(p, p.index()),
|
||||||
|
|
|
@ -69,13 +69,6 @@ private:
|
||||||
//- Size of the patch
|
//- Size of the patch
|
||||||
label size_;
|
label size_;
|
||||||
|
|
||||||
// Demand-driven private data
|
|
||||||
|
|
||||||
|
|
||||||
// Private Member Functions
|
|
||||||
|
|
||||||
//- Disallow construct as copy
|
|
||||||
ePatch(const ePatch&);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
@ -170,6 +163,9 @@ public:
|
||||||
const eBoundaryMesh& bm
|
const eBoundaryMesh& bm
|
||||||
);
|
);
|
||||||
|
|
||||||
|
//- Construct as copy
|
||||||
|
ePatch(const ePatch&);
|
||||||
|
|
||||||
//- Construct as copy, resetting the boundary mesh
|
//- Construct as copy, resetting the boundary mesh
|
||||||
ePatch(const ePatch&, const eBoundaryMesh&);
|
ePatch(const ePatch&, const eBoundaryMesh&);
|
||||||
|
|
||||||
|
@ -189,7 +185,7 @@ public:
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
//- Return a pointer to a new patch created
|
//- Return a pointer to a new patch created
|
||||||
// on freestore from dictionary
|
// on freestore from dictionary
|
||||||
static autoPtr<ePatch> New
|
static autoPtr<ePatch> New
|
||||||
(
|
(
|
||||||
|
|
|
@ -232,7 +232,7 @@ inline label tetApexPoint
|
||||||
|
|
||||||
apexPoint = findIsolatedPoint(baseFace, faceToCheck);
|
apexPoint = findIsolatedPoint(baseFace, faceToCheck);
|
||||||
|
|
||||||
if (foundApex > -1)
|
if (apexPoint > -1)
|
||||||
{
|
{
|
||||||
foundApex = true;
|
foundApex = true;
|
||||||
break;
|
break;
|
||||||
|
|
Reference in a new issue