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

globalIndexAndTransform: Support any number of transforms but no more than 3 per point

Browse Source 
Patch contributed by Mattijs Janssens
Resolves bug-report http://bugs.openfoam.org/view.php?id=1815
This commit is contained in:
Henry Weller
2016-09-22 14:10:45 +01:00
parent 40f8709488
commit c0f841e4f7
8 changed files with 384 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
View File

@ -24,19 +24,14 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "globalMeshData.H" #include "globalMeshData.H"
#include "Time.H"
#include "Pstream.H" #include "Pstream.H"
#include "PstreamCombineReduceOps.H" #include "PstreamCombineReduceOps.H"
#include "processorPolyPatch.H" #include "processorPolyPatch.H"
#include "demandDrivenData.H"
#include "globalPoints.H" #include "globalPoints.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "mapDistribute.H" #include "mapDistribute.H"
#include "labelIOList.H" #include "labelIOList.H"
#include "PackedList.H"
#include "mergePoints.H" #include "mergePoints.H"
#include "matchPoints.H"
#include "OFstream.H"
#include "globalIndexAndTransform.H" #include "globalIndexAndTransform.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -577,7 +572,7 @@ void Foam::globalMeshData::calcPointConnectivity
labelPairList myData(globalPointSlavesMap().constructSize()); labelPairList myData(globalPointSlavesMap().constructSize());
forAll(slaves, pointi) forAll(slaves, pointi)
{ {
myData[pointi] = globalIndexAndTransform::encode myData[pointi] = transforms.encode
( (
Pstream::myProcNo(), Pstream::myProcNo(),
pointi, pointi,
@ -624,9 +619,9 @@ void Foam::globalMeshData::calcPointConnectivity
); );
// Add transform to connectivity // Add transform to connectivity
const labelPair& n = myData[pTransformSlaves[i]]; const labelPair& n = myData[pTransformSlaves[i]];
label proci = globalIndexAndTransform::processor(n); label proci = transforms.processor(n);
label index = globalIndexAndTransform::index(n); label index = transforms.index(n);
pConnectivity[connI++] = globalIndexAndTransform::encode pConnectivity[connI++] = transforms.encode
( (
proci, proci,
index, index,
@ -678,6 +673,8 @@ void Foam::globalMeshData::calcGlobalPointEdges
const globalIndex& globalEdgeNumbers = globalEdgeNumbering(); const globalIndex& globalEdgeNumbers = globalEdgeNumbering();
const labelListList& slaves = globalPointSlaves(); const labelListList& slaves = globalPointSlaves();
const labelListList& transformedSlaves = globalPointTransformedSlaves(); const labelListList& transformedSlaves = globalPointTransformedSlaves();
const globalIndexAndTransform& transforms = globalTransforms();
// Create local version // Create local version
globalPointEdges.setSize(globalPointSlavesMap().constructSize()); globalPointEdges.setSize(globalPointSlavesMap().constructSize());
@ -697,11 +694,11 @@ void Foam::globalMeshData::calcGlobalPointEdges
forAll(pEdges, i) forAll(pEdges, i)
{ {
label otherPointi = edges[pEdges[i]].otherVertex(pointi); label otherPointi = edges[pEdges[i]].otherVertex(pointi);
globalPPoints[i] = globalIndexAndTransform::encode globalPPoints[i] = transforms.encode
( (
Pstream::myProcNo(), Pstream::myProcNo(),
otherPointi, otherPointi,
globalTransforms().nullTransformIndex() transforms.nullTransformIndex()
); );
} }
} }
@ -790,9 +787,9 @@ void Foam::globalMeshData::calcGlobalPointEdges
{ {
// Add transform to connectivity // Add transform to connectivity
const labelPair& n = otherData[j]; const labelPair& n = otherData[j];
label proci = globalIndexAndTransform::processor(n); label proci = transforms.processor(n);
label index = globalIndexAndTransform::index(n); label index = transforms.index(n);
globalPPoints[sz++] = globalIndexAndTransform::encode globalPPoints[sz++] = transforms.encode
( (
proci, proci,
index, index,
@ -834,16 +831,18 @@ Foam::label Foam::globalMeshData::findTransform
const label localPoint const label localPoint
) const ) const
{ {
const label remoteProci = globalIndexAndTransform::processor(remotePoint); const globalIndexAndTransform& transforms = globalTransforms();
const label remoteIndex = globalIndexAndTransform::index(remotePoint);
const label remoteProci = transforms.processor(remotePoint);
const label remoteIndex = transforms.index(remotePoint);
label remoteTransformI = -1; label remoteTransformI = -1;
label localTransformI = -1; label localTransformI = -1;
forAll(info, i) forAll(info, i)
{ {
label proci = globalIndexAndTransform::processor(info[i]); label proci = transforms.processor(info[i]);
label pointi = globalIndexAndTransform::index(info[i]); label pointi = transforms.index(info[i]);
label transformI = globalIndexAndTransform::transformIndex(info[i]); label transformI = transforms.transformIndex(info[i]);
if (proci == Pstream::myProcNo() && pointi == localPoint) if (proci == Pstream::myProcNo() && pointi == localPoint)
{ {
@ -875,7 +874,7 @@ Foam::label Foam::globalMeshData::findTransform
<< abort(FatalError); << abort(FatalError);
} }
return globalTransforms().subtractTransformIndex return transforms.subtractTransformIndex
( (
remoteTransformI, remoteTransformI,
localTransformI localTransformI
@ -893,6 +892,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
const edgeList& edges = coupledPatch().edges(); const edgeList& edges = coupledPatch().edges();
const globalIndex& globalEdgeNumbers = globalEdgeNumbering(); const globalIndex& globalEdgeNumbers = globalEdgeNumbering();
const globalIndexAndTransform& transforms = globalTransforms();
// The whole problem with deducting edge-connectivity from // The whole problem with deducting edge-connectivity from
@ -941,11 +941,11 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
// Append myself. // Append myself.
eEdges.append eEdges.append
( (
globalIndexAndTransform::encode transforms.encode
( (
Pstream::myProcNo(), Pstream::myProcNo(),
edgeI, edgeI,
globalTransforms().nullTransformIndex() transforms.nullTransformIndex()
) )
); );
@ -986,7 +986,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
label proci = globalEdgeNumbers.whichProcID(pEdges0[i]); label proci = globalEdgeNumbers.whichProcID(pEdges0[i]);
eEdges.append eEdges.append
( (
globalIndexAndTransform::encode transforms.encode
( (
proci, proci,
globalEdgeNumbers.toLocal(proci, pEdges0[i]), globalEdgeNumbers.toLocal(proci, pEdges0[i]),
@ -999,7 +999,11 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
} }
allEdgeConnectivity[edgeI].transfer(eEdges); allEdgeConnectivity[edgeI].transfer(eEdges);
sort(allEdgeConnectivity[edgeI], globalIndexAndTransform::less()); sort
(
allEdgeConnectivity[edgeI],
globalIndexAndTransform::less(transforms)
);
} }
// We now have - in allEdgeConnectivity - a list of edges which are shared // We now have - in allEdgeConnectivity - a list of edges which are shared
@ -1020,10 +1024,10 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
if if
( (
( (
globalIndexAndTransform::processor(masterInfo) transforms.processor(masterInfo)
== Pstream::myProcNo() == Pstream::myProcNo()
) )
&& (globalIndexAndTransform::index(masterInfo) == edgeI) && (transforms.index(masterInfo) == edgeI)
) )
{ {
// Sort into transformed and untransformed // Sort into transformed and untransformed
@ -1039,14 +1043,14 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
for (label i = 1; i < edgeInfo.size(); i++) for (label i = 1; i < edgeInfo.size(); i++)
{ {
const labelPair& info = edgeInfo[i]; const labelPair& info = edgeInfo[i];
label proci = globalIndexAndTransform::processor(info); label proci = transforms.processor(info);
label index = globalIndexAndTransform::index(info); label index = transforms.index(info);
label transform = globalIndexAndTransform::transformIndex label transform = transforms.transformIndex
( (
info info
); );
if (transform == globalTransforms().nullTransformIndex()) if (transform == transforms.nullTransformIndex())
{ {
eEdges[nonTransformI++] = globalEdgeNumbers.toGlobal eEdges[nonTransformI++] = globalEdgeNumbers.toGlobal
( (
@ -1078,7 +1082,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
globalEdgeNumbers, globalEdgeNumbers,
globalEdgeSlaves, globalEdgeSlaves,
globalTransforms(), transforms,
transformedEdges, transformedEdges,
globalEdgeTransformedSlavesPtr_(), globalEdgeTransformedSlavesPtr_(),
@ -1351,6 +1355,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
const labelListList& pointSlaves = globalPointSlaves(); const labelListList& pointSlaves = globalPointSlaves();
const labelListList& pointTransformSlaves = const labelListList& pointTransformSlaves =
globalPointTransformedSlaves(); globalPointTransformedSlaves();
const globalIndexAndTransform& transforms = globalTransforms();
// Any faces coming in through transformation // Any faces coming in through transformation
@ -1432,7 +1437,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
label proci = globalIndices.whichProcID(slave); label proci = globalIndices.whichProcID(slave);
label facei = globalIndices.toLocal(proci, slave); label facei = globalIndices.toLocal(proci, slave);
myBFaces[n++] = globalIndexAndTransform::encode myBFaces[n++] = transforms.encode
( (
proci, proci,
facei, facei,
@ -1466,7 +1471,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
globalIndices, globalIndices,
globalPointBoundaryFaces, globalPointBoundaryFaces,
globalTransforms(), transforms,
transformedFaces, transformedFaces,
globalPointTransformedBoundaryFacesPtr_(), globalPointTransformedBoundaryFacesPtr_(),
@ -1581,6 +1586,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
const labelListList& pointSlaves = globalPointSlaves(); const labelListList& pointSlaves = globalPointSlaves();
const labelListList& pointTransformSlaves = const labelListList& pointTransformSlaves =
globalPointTransformedSlaves(); globalPointTransformedSlaves();
const globalIndexAndTransform& transforms = globalTransforms();
List<labelPairList> transformedCells(pointSlaves.size()); List<labelPairList> transformedCells(pointSlaves.size());
@ -1660,7 +1666,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
{ {
label proci = globalIndices.whichProcID(slave); label proci = globalIndices.whichProcID(slave);
label celli = globalIndices.toLocal(proci, slave); label celli = globalIndices.toLocal(proci, slave);
myBCells[n++] = globalIndexAndTransform::encode myBCells[n++] = transforms.encode
( (
proci, proci,
celli, celli,
@ -1693,7 +1699,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
globalIndices, globalIndices,
globalPointBoundaryCells, globalPointBoundaryCells,
globalTransforms(), transforms,
transformedCells, transformedCells,
globalPointTransformedBoundaryCellsPtr_(), globalPointTransformedBoundaryCellsPtr_(),
@ -1765,12 +1771,12 @@ Foam::globalMeshData::globalMeshData(const polyMesh& mesh)
processorPatchIndices_(0), processorPatchIndices_(0),
processorPatchNeighbours_(0), processorPatchNeighbours_(0),
nGlobalPoints_(-1), nGlobalPoints_(-1),
sharedPointLabelsPtr_(nullptr), sharedPointLabelsPtr_(NULL),
sharedPointAddrPtr_(nullptr), sharedPointAddrPtr_(NULL),
sharedPointGlobalLabelsPtr_(nullptr), sharedPointGlobalLabelsPtr_(NULL),
nGlobalEdges_(-1), nGlobalEdges_(-1),
sharedEdgeLabelsPtr_(nullptr), sharedEdgeLabelsPtr_(NULL),
sharedEdgeAddrPtr_(nullptr) sharedEdgeAddrPtr_(NULL)
{ {
updateMesh(); updateMesh();
} }

1
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
View File

@ -72,7 +72,6 @@ See also
mapDistribute mapDistribute
globalIndexAndTransform globalIndexAndTransform
SourceFiles SourceFiles
globalMeshData.C globalMeshData.C
globalMeshDataTemplates.C globalMeshDataTemplates.C

66
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
View File

@ -64,15 +64,15 @@ Foam::label Foam::globalPoints::findSamePoint
const labelPair& info const labelPair& info
) const ) const
{ {
const label proci = globalIndexAndTransform::processor(info); const label proci = globalTransforms_.processor(info);
const label index = globalIndexAndTransform::index(info); const label index = globalTransforms_.index(info);
forAll(allInfo, i) forAll(allInfo, i)
{ {
if if
( (
globalIndexAndTransform::processor(allInfo[i]) == proci globalTransforms_.processor(allInfo[i]) == proci
&& globalIndexAndTransform::index(allInfo[i]) == index && globalTransforms_.index(allInfo[i]) == index
) )
{ {
return i; return i;
@ -98,21 +98,21 @@ Foam::labelPairList Foam::globalPoints::addSendTransform
forAll(info, i) forAll(info, i)
{ {
//Pout<< " adding send transform to" << nl //Pout<< " adding send transform to" << nl
// << " proc:" << globalIndexAndTransform::processor(info[i]) // << " proc:" << globalTransforms_.processor(info[i])
// << nl // << nl
// << " index:" << globalIndexAndTransform::index(info[i]) << nl // << " index:" << globalTransforms_.index(info[i]) << nl
// << " trafo:" // << " trafo:"
// << globalTransforms_.decodeTransformIndex // << globalTransforms_.decodeTransformIndex
// (globalIndexAndTransform::transformIndex(info[i])) // (globalTransforms_.transformIndex(info[i]))
// << endl; // << endl;
sendInfo[i] = globalIndexAndTransform::encode sendInfo[i] = globalTransforms_.encode
( (
globalIndexAndTransform::processor(info[i]), globalTransforms_.processor(info[i]),
globalIndexAndTransform::index(info[i]), globalTransforms_.index(info[i]),
globalTransforms_.addToTransformIndex globalTransforms_.addToTransformIndex
( (
globalIndexAndTransform::transformIndex(info[i]), globalTransforms_.transformIndex(info[i]),
patchi, patchi,
true, // patchi is sending side true, // patchi is sending side
tol // tolerance for comparison tol // tolerance for comparison
@ -204,11 +204,11 @@ bool Foam::globalPoints::mergeInfo
} }
else else
{ {
label myTransform = globalIndexAndTransform::transformIndex label myTransform = globalTransforms_.transformIndex
( (
myInfo[index] myInfo[index]
); );
label nbrTransform = globalIndexAndTransform::transformIndex label nbrTransform = globalTransforms_.transformIndex
( (
nbrInfo[i] nbrInfo[i]
); );
@ -294,7 +294,7 @@ bool Foam::globalPoints::mergeInfo
labelPairList knownInfo labelPairList knownInfo
( (
1, 1,
globalIndexAndTransform::encode globalTransforms_.encode
( (
Pstream::myProcNo(), Pstream::myProcNo(),
localPointi, localPointi,
@ -356,9 +356,9 @@ void Foam::globalPoints::printProcPoint
const labelPair& pointInfo const labelPair& pointInfo
) const ) const
{ {
label proci = globalIndexAndTransform::processor(pointInfo); label proci = globalTransforms_.processor(pointInfo);
label index = globalIndexAndTransform::index(pointInfo); label index = globalTransforms_.index(pointInfo);
label trafoI = globalIndexAndTransform::transformIndex(pointInfo); label trafoI = globalTransforms_.transformIndex(pointInfo);
Pout<< " proc:" << proci; Pout<< " proc:" << proci;
Pout<< " localpoint:"; Pout<< " localpoint:";
@ -421,7 +421,7 @@ void Foam::globalPoints::initOwnPoints
labelPairList knownInfo labelPairList knownInfo
( (
1, 1,
globalIndexAndTransform::encode globalTransforms_.encode
( (
Pstream::myProcNo(), Pstream::myProcNo(),
localPointi, localPointi,
@ -457,7 +457,7 @@ void Foam::globalPoints::initOwnPoints
labelPairList knownInfo labelPairList knownInfo
( (
1, 1,
globalIndexAndTransform::encode globalTransforms_.encode
( (
Pstream::myProcNo(), Pstream::myProcNo(),
localPointi, localPointi,
@ -750,8 +750,8 @@ void Foam::globalPoints::remove
// is in it. This would be an ordinary connection and can be // is in it. This would be an ordinary connection and can be
// handled by normal face-face connectivity. // handled by normal face-face connectivity.
label proc0 = globalIndexAndTransform::processor(pointInfo[0]); label proc0 = globalTransforms_.processor(pointInfo[0]);
label proc1 = globalIndexAndTransform::processor(pointInfo[1]); label proc1 = globalTransforms_.processor(pointInfo[1]);
if if
( (
@ -759,14 +759,14 @@ void Foam::globalPoints::remove
proc0 == Pstream::myProcNo() proc0 == Pstream::myProcNo()
&& directNeighbours.found && directNeighbours.found
( (
globalIndexAndTransform::index(pointInfo[0]) globalTransforms_.index(pointInfo[0])
) )
) )
|| ( || (
proc1 == Pstream::myProcNo() proc1 == Pstream::myProcNo()
&& directNeighbours.found && directNeighbours.found
( (
globalIndexAndTransform::index(pointInfo[1]) globalTransforms_.index(pointInfo[1])
) )
) )
) )
@ -776,14 +776,14 @@ void Foam::globalPoints::remove
{ {
//Pout<< "Removing direct neighbour:" //Pout<< "Removing direct neighbour:"
// << mesh_.points() // << mesh_.points()
// [globalIndexAndTransform::index(pointInfo[0])] // [globalTransforms_.index(pointInfo[0])]
// << endl; // << endl;
} }
else if (proc1 == Pstream::myProcNo()) else if (proc1 == Pstream::myProcNo())
{ {
//Pout<< "Removing direct neighbour:" //Pout<< "Removing direct neighbour:"
// << mesh_.points() // << mesh_.points()
// [globalIndexAndTransform::index(pointInfo[1])] // [globalTransforms_.index(pointInfo[1])]
// << endl; // << endl;
} }
} }
@ -812,11 +812,11 @@ void Foam::globalPoints::remove
// So this meshPoint will have info of size one only. // So this meshPoint will have info of size one only.
if if
( (
globalIndexAndTransform::processor(pointInfo[0]) globalTransforms_.processor(pointInfo[0])
!= Pstream::myProcNo() != Pstream::myProcNo()
|| !directNeighbours.found || !directNeighbours.found
( (
globalIndexAndTransform::index(pointInfo[0]) globalTransforms_.index(pointInfo[0])
) )
) )
{ {
@ -995,7 +995,7 @@ void Foam::globalPoints::calculateSharedPoints
forAllConstIter(Map<label>, meshToProcPoint_, iter) forAllConstIter(Map<label>, meshToProcPoint_, iter)
{ {
labelPairList& pointInfo = procPoints_[iter()]; labelPairList& pointInfo = procPoints_[iter()];
sort(pointInfo, globalIndexAndTransform::less()); sort(pointInfo, globalIndexAndTransform::less(globalTransforms_));
} }
@ -1017,10 +1017,10 @@ void Foam::globalPoints::calculateSharedPoints
if if
( (
( (
globalIndexAndTransform::processor(masterInfo) globalTransforms_.processor(masterInfo)
== Pstream::myProcNo() == Pstream::myProcNo()
) )
&& (globalIndexAndTransform::index(masterInfo) == iter.key()) && (globalTransforms_.index(masterInfo) == iter.key())
) )
{ {
labelList& pPoints = pointPoints_[iter.key()]; labelList& pPoints = pointPoints_[iter.key()];
@ -1035,9 +1035,9 @@ void Foam::globalPoints::calculateSharedPoints
for (label i = 1; i < pointInfo.size(); i++) for (label i = 1; i < pointInfo.size(); i++)
{ {
const labelPair& info = pointInfo[i]; const labelPair& info = pointInfo[i];
label proci = globalIndexAndTransform::processor(info); label proci = globalTransforms_.processor(info);
label index = globalIndexAndTransform::index(info); label index = globalTransforms_.index(info);
label transform = globalIndexAndTransform::transformIndex label transform = globalTransforms_.transformIndex
( (
info info
); );

24
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
View File

@ -270,10 +270,10 @@ Foam::mapDistribute::mapDistribute
forAll(transformedElements, i) forAll(transformedElements, i)
{ {
labelPair elem = transformedElements[i]; labelPair elem = transformedElements[i];
label proci = globalIndexAndTransform::processor(elem); label proci = globalTransforms.processor(elem);
if (proci != Pstream::myProcNo()) if (proci != Pstream::myProcNo())
{ {
label index = globalIndexAndTransform::index(elem); label index = globalTransforms.index(elem);
label nCompact = compactMap[proci].size(); label nCompact = compactMap[proci].size();
compactMap[proci].insert(index, nCompact); compactMap[proci].insert(index, nCompact);
} }
@ -301,7 +301,7 @@ Foam::mapDistribute::mapDistribute
forAll(transformedElements, i) forAll(transformedElements, i)
{ {
labelPair elem = transformedElements[i]; labelPair elem = transformedElements[i];
label trafoI = globalIndexAndTransform::transformIndex(elem); label trafoI = globalTransforms.transformIndex(elem);
nPerTransform[trafoI]++; nPerTransform[trafoI]++;
} }
// Offset per transformIndex // Offset per transformIndex
@ -321,9 +321,9 @@ Foam::mapDistribute::mapDistribute
forAll(transformedElements, i) forAll(transformedElements, i)
{ {
labelPair elem = transformedElements[i]; labelPair elem = transformedElements[i];
label proci = globalIndexAndTransform::processor(elem); label proci = globalTransforms.processor(elem);
label index = globalIndexAndTransform::index(elem); label index = globalTransforms.index(elem);
label trafoI = globalIndexAndTransform::transformIndex(elem); label trafoI = globalTransforms.transformIndex(elem);
// Get compact index for untransformed element // Get compact index for untransformed element
label rawElemI = label rawElemI =
@ -378,10 +378,10 @@ Foam::mapDistribute::mapDistribute
forAll(elems, i) forAll(elems, i)
{ {
label proci = globalIndexAndTransform::processor(elems[i]); label proci = globalTransforms.processor(elems[i]);
if (proci != Pstream::myProcNo()) if (proci != Pstream::myProcNo())
{ {
label index = globalIndexAndTransform::index(elems[i]); label index = globalTransforms.index(elems[i]);
label nCompact = compactMap[proci].size(); label nCompact = compactMap[proci].size();
compactMap[proci].insert(index, nCompact); compactMap[proci].insert(index, nCompact);
} }
@ -413,7 +413,7 @@ Foam::mapDistribute::mapDistribute
forAll(elems, i) forAll(elems, i)
{ {
label trafoI = globalIndexAndTransform::transformIndex(elems[i]); label trafoI = globalTransforms.transformIndex(elems[i]);
nPerTransform[trafoI]++; nPerTransform[trafoI]++;
} }
} }
@ -438,9 +438,9 @@ Foam::mapDistribute::mapDistribute
forAll(elems, i) forAll(elems, i)
{ {
label proci = globalIndexAndTransform::processor(elems[i]); label proci = globalTransforms.processor(elems[i]);
label index = globalIndexAndTransform::index(elems[i]); label index = globalTransforms.index(elems[i]);
label trafoI = globalIndexAndTransform::transformIndex(elems[i]); label trafoI = globalTransforms.transformIndex(elems[i]);
// Get compact index for untransformed element // Get compact index for untransformed element
label rawElemI = label rawElemI =

8
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
View File

@ -461,7 +461,7 @@ void Foam::mapDistributeBase::distribute
{ {
// Set up sends to neighbours // Set up sends to neighbours
List<List<T>> sendFields(Pstream::nProcs()); List<List<T > > sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++) for (label domain = 0; domain < Pstream::nProcs(); domain++)
{ {
@ -495,7 +495,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours // Set up receives from neighbours
List<List<T>> recvFields(Pstream::nProcs()); List<List<T > > recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++) for (label domain = 0; domain < Pstream::nProcs(); domain++)
{ {
@ -938,7 +938,7 @@ void Foam::mapDistributeBase::distribute
{ {
// Set up sends to neighbours // Set up sends to neighbours
List<List<T>> sendFields(Pstream::nProcs()); List<List<T > > sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++) for (label domain = 0; domain < Pstream::nProcs(); domain++)
{ {
@ -972,7 +972,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours // Set up receives from neighbours
List<List<T>> recvFields(Pstream::nProcs()); List<List<T > > recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++) for (label domain = 0; domain < Pstream::nProcs(); domain++)
{ {

274
src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
View File

@ -25,13 +25,14 @@ License
#include "globalIndexAndTransform.H" #include "globalIndexAndTransform.H"
#include "cyclicPolyPatch.H" #include "cyclicPolyPatch.H"
#include "DynamicField.H"
#include "globalMeshData.H"
// * * * * * * * * * * * * Private Static Data Members * * * * * * * * * * * // // * * * * * * * * * * * * Private Static Data Members * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(globalIndexAndTransform, 0); defineTypeNameAndDebug(globalIndexAndTransform, 0);
const label globalIndexAndTransform::base_ = 32;
} }
@ -127,10 +128,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
{ {
const polyBoundaryMesh& patches = mesh_.boundaryMesh(); const polyBoundaryMesh& patches = mesh_.boundaryMesh();
transforms_ = List<vectorTensorTransform>(6); DynamicList<vectorTensorTransform> localTransforms;
scalarField maxTol(6); DynamicField<scalar> localTols;
label nextTrans = 0;
label dummyMatch = -1; label dummyMatch = -1;
@ -170,7 +169,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
( (
matchTransform matchTransform
( (
transforms_, localTransforms,
dummyMatch, dummyMatch,
transform, transform,
cpp.matchTolerance(), cpp.matchTolerance(),
@ -178,15 +177,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
) == 0 ) == 0
) )
{ {
if (nextTrans == 6) localTransforms.append(transform);
{ localTols.append(cpp.matchTolerance());
FatalErrorInFunction
<< "More than six unsigned transforms"
<< " detected:" << nl << transforms_
<< exit(FatalError);
}
transforms_[nextTrans] = transform;
maxTol[nextTrans++] = cpp.matchTolerance();
} }
} }
} }
@ -207,7 +199,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
( (
matchTransform matchTransform
( (
transforms_, localTransforms,
dummyMatch, dummyMatch,
transform, transform,
cpp.matchTolerance(), cpp.matchTolerance(),
@ -215,15 +207,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
) == 0 ) == 0
) )
{ {
if (nextTrans == 6) localTransforms.append(transform);
{ localTols.append(cpp.matchTolerance());
FatalErrorInFunction
<< "More than six unsigned transforms"
<< " detected:" << nl << transforms_
<< exit(FatalError);
}
transforms_[nextTrans] = transform;
maxTol[nextTrans++] = cpp.matchTolerance();
} }
} }
} }
@ -233,21 +218,18 @@ void Foam::globalIndexAndTransform::determineTransforms()
// Collect transforms on master // Collect transforms on master
List<List<vectorTensorTransform>> allTransforms(Pstream::nProcs()); List<List<vectorTensorTransform>> allTransforms(Pstream::nProcs());
allTransforms[Pstream::myProcNo()] = transforms_; allTransforms[Pstream::myProcNo()] = localTransforms;
Pstream::gatherList(allTransforms); Pstream::gatherList(allTransforms);
// Collect matching tolerance on master // Collect matching tolerance on master
List<scalarField> allTols(Pstream::nProcs()); List<scalarField> allTols(Pstream::nProcs());
allTols[Pstream::myProcNo()] = maxTol; allTols[Pstream::myProcNo()] = localTols;
Pstream::gatherList(allTols); Pstream::gatherList(allTols);
if (Pstream::master()) if (Pstream::master())
{ {
transforms_ = List<vectorTensorTransform>(3); localTransforms.clear();
label nextTrans = 0;
forAll(allTransforms, proci) forAll(allTransforms, proci)
{ {
@ -264,45 +246,23 @@ void Foam::globalIndexAndTransform::determineTransforms()
( (
matchTransform matchTransform
( (
transforms_, localTransforms,
dummyMatch, dummyMatch,
transform, transform,
allTols[proci][pSVI], allTols[proci][pSVI],
true true
) == 0 ) == 0
) )
{ {
transforms_[nextTrans++] = transform; localTransforms.append(transform);
}
if (nextTrans > 3)
{
FatalErrorInFunction
<< "More than three independent basic "
<< "transforms detected:" << nl
<< allTransforms
<< transforms_
<< exit(FatalError);
} }
} }
} }
} }
transforms_.setSize(nextTrans);
} }
transforms_.transfer(localTransforms);
Pstream::scatter(transforms_); Pstream::scatter(transforms_);
if (transforms_.size() > 3)
{
WarningInFunction
<< "More than three independent basic "
<< "transforms detected:" << nl
<< transforms_ << nl
<< "This is not a space filling tiling and will probably"
<< " give problems for e.g. lagrangian tracking or interpolation"
<< endl;
}
} }
@ -351,16 +311,12 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{ {
const polyBoundaryMesh& patches = mesh_.boundaryMesh(); const polyBoundaryMesh& patches = mesh_.boundaryMesh();
patchTransformSign_.setSize(patches.size(), Pair<label>(-1, 0)); patchTransformSign_.setSize(patches.size(), labelPair(-1, 0));
label matchTransI = -1;
forAll(patches, patchi) forAll(patches, patchi)
{ {
const polyPatch& pp = patches[patchi]; const polyPatch& pp = patches[patchi];
// Pout<< nl << patchi << " " << pp.name() << endl;
// Note: special check for unordered cyclics. These are in fact // Note: special check for unordered cyclics. These are in fact
// transform bcs and should probably be split off. // transform bcs and should probably be split off.
if if
@ -375,15 +331,12 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
) )
) )
{ {
const coupledPolyPatch& cpp = const coupledPolyPatch& cpp = refCast<const coupledPolyPatch>(pp);
refCast<const coupledPolyPatch>(pp);
if (cpp.separated()) if (cpp.separated())
{ {
const vectorField& sepVecs = cpp.separation(); const vectorField& sepVecs = cpp.separation();
// Pout<< "sepVecs " << sepVecs << endl;
// This loop is implicitly expecting only a single // This loop is implicitly expecting only a single
// value for separation() // value for separation()
forAll(sepVecs, sVI) forAll(sepVecs, sVI)
@ -394,6 +347,7 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{ {
vectorTensorTransform t(sepVec); vectorTensorTransform t(sepVec);
label matchTransI;
label sign = matchTransform label sign = matchTransform
( (
transforms_, transforms_,
@ -402,22 +356,8 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
cpp.matchTolerance(), cpp.matchTolerance(),
true true
); );
// Pout<< sign << " " << matchTransI << endl;
// List<label> permutation(transforms_.size(), 0);
// permutation[matchTransI] = sign;
// Pout<< encodeTransformIndex(permutation) << nl
// << transformPermutations_
// [
// encodeTransformIndex(permutation)
// ]
// << endl;
patchTransformSign_[patchi] = patchTransformSign_[patchi] =
Pair<label>(matchTransI, sign); labelPair(matchTransI, sign);
} }
} }
@ -426,8 +366,6 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{ {
const tensorField& transTensors = cpp.reverseT(); const tensorField& transTensors = cpp.reverseT();
// Pout<< "transTensors " << transTensors << endl;
// This loop is implicitly expecting only a single // This loop is implicitly expecting only a single
// value for reverseT() // value for reverseT()
forAll(transTensors, tTI) forAll(transTensors, tTI)
@ -438,6 +376,7 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
{ {
vectorTensorTransform t(transT); vectorTensorTransform t(transT);
label matchTransI;
label sign = matchTransform label sign = matchTransform
( (
transforms_, transforms_,
@ -447,37 +386,65 @@ void Foam::globalIndexAndTransform::determinePatchTransformSign()
true true
); );
// Pout<< sign << " " << matchTransI << endl;
// List<label> permutation(transforms_.size(), 0);
// permutation[matchTransI] = sign;
// Pout<< encodeTransformIndex(permutation) << nl
// << transformPermutations_
// [
// encodeTransformIndex(permutation)
// ]
// << endl;
patchTransformSign_[patchi] = patchTransformSign_[patchi] =
Pair<label>(matchTransI, sign); labelPair(matchTransI, sign);
} }
} }
} }
} }
} }
}
// Pout<< patchTransformSign_ << endl;
bool Foam::globalIndexAndTransform::uniqueTransform
(
const point& pt,
labelPairList& trafos,
const label patchi,
const labelPair& patchTrafo
) const
{
if (findIndex(trafos, patchTrafo) == -1)
{
// New transform. Check if already have 3
if (trafos.size() == 3)
{
if (patchi > -1)
{
WarningInFunction
<< "Point " << pt
<< " is on patch " << mesh_.boundaryMesh()[patchi].name();
}
else
{
WarningInFunction
<< "Point " << pt << " is on a coupled patch";
}
Warning
<< " with transformation " << patchTrafo
<< " but also on 3 other patches with transforms "
<< trafos << nl
<< "This is not a space filling tiling and might"
<< " indicate a setup problem and give problems"
<< " for e.g. lagrangian tracking or interpolation" << endl;
// Already warned so no need to extend more
trafos.clear();
return false;
}
return true;
}
else
{
return false;
}
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::globalIndexAndTransform::globalIndexAndTransform Foam::globalIndexAndTransform::globalIndexAndTransform(const polyMesh& mesh)
(
const polyMesh& mesh
)
: :
mesh_(mesh), mesh_(mesh),
transforms_(), transforms_(),
@ -546,13 +513,102 @@ Foam::globalIndexAndTransform::globalIndexAndTransform
Info<< "nullTransformIndex:" << nullTransformIndex() << endl Info<< "nullTransformIndex:" << nullTransformIndex() << endl
<< endl; << endl;
} }
if (transforms_.size() > 0)
{
// Check that the transforms are space filling : any point
// can only use up to three transforms
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
// 1. Collect transform&sign per point and do local check
List<labelPairList> pointToTrafos(mesh_.nPoints());
forAll(patches, patchi)
{
const polyPatch& pp = patches[patchi];
const labelPair& transSign = patchTransformSign_[patchi];
if (transSign.first() > -1)
{
const labelList& mp = pp.meshPoints();
forAll(mp, i)
{
labelPairList& trafos = pointToTrafos[mp[i]];
bool newTransform = uniqueTransform
(
mesh_.points()[mp[i]],
trafos,
patchi,
transSign
);
if (newTransform)
{
trafos.append(transSign);
}
}
}
}
// Synchronise across collocated (= untransformed) points
// TBD: there is a big problem in that globalMeshData uses
// globalIndexAndTransform. Triggers recursion.
if (false)
{
const globalMeshData& gmd = mesh_.globalData();
const indirectPrimitivePatch& cpp = gmd.coupledPatch();
const labelList& meshPoints = cpp.meshPoints();
const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
const labelListList& slaves = gmd.globalCoPointSlaves();
List<labelPairList> elems(slavesMap.constructSize());
forAll(meshPoints, i)
{
elems[i] = pointToTrafos[meshPoints[i]];
}
// Pull slave data onto master. No need to update transformed slots.
slavesMap.distribute(elems, false);
// Combine master data with slave data
forAll(slaves, i)
{
labelPairList& trafos = elems[i];
const labelList& slavePoints = slaves[i];
// Combine master with untransformed slave data
forAll(slavePoints, j)
{
const labelPairList& slaveTrafos = elems[slavePoints[j]];
forAll(slaveTrafos, slaveI)
{
bool newTransform = uniqueTransform
(
mesh_.points()[meshPoints[i]],
trafos,
-1,
slaveTrafos[slaveI]
);
if (newTransform)
{
trafos.append(slaveTrafos[slaveI]);
}
}
}
}
}
}
} }
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::globalIndexAndTransform::~globalIndexAndTransform()
{}
// ************************************************************************* // // ************************************************************************* //

153
src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.H
View File

@ -28,7 +28,9 @@ Description
Determination and storage of the possible independent transforms Determination and storage of the possible independent transforms
introduced by coupledPolyPatches, as well as all of the possible introduced by coupledPolyPatches, as well as all of the possible
permutations of these transforms generated by the presence of permutations of these transforms generated by the presence of
multiple coupledPolyPatches, i.e. more than one cyclic boundary. multiple coupledPolyPatches, i.e. more than one cyclic boundary. Note that
any given point can be on maximum 3 transforms only (and these transforms
have to be perpendicular)
Also provides global index encoding and decoding for entity Also provides global index encoding and decoding for entity
(i.e. cell) index, processor index and transform index (0 or (i.e. cell) index, processor index and transform index (0 or
@ -71,8 +73,15 @@ public:
// - transform // - transform
class less class less
{ {
const globalIndexAndTransform& gi_;
public: public:
less(const globalIndexAndTransform& gi)
:
gi_(gi)
{}
inline bool operator()(const labelPair&, const labelPair&) const; inline bool operator()(const labelPair&, const labelPair&) const;
}; };
@ -87,10 +96,8 @@ private:
//- The possible independent (non-permuted) transforms of the //- The possible independent (non-permuted) transforms of the
// geometry, i.e. for a geometry with two cyclics, this // geometry, i.e. for a geometry with two cyclics, this
// stores the two transforms, not the eight permutations. // stores the two transforms, not the eight permutations.
// There may not be more than three transforms in the range // Any point can not be on more than three transforms but overall
// of coupledPolyPatch geometries (separated XOR // the mesh can have more than three.
// non-parallel) and symmetries (cuboid periodicity only)
// supported.
List<vectorTensorTransform> transforms_; List<vectorTensorTransform> transforms_;
//- The permutations of the transforms, stored for lookup //- The permutations of the transforms, stored for lookup
@ -105,13 +112,7 @@ private:
//- Mapping from patch index to which transform it matches (or //- Mapping from patch index to which transform it matches (or
// -1 for none) (.first()) and what sign to use for it, // -1 for none) (.first()) and what sign to use for it,
// i.e. +/- 1 (.second()). // i.e. +/- 1 (.second()).
List<Pair<label>> patchTransformSign_; List<labelPair> patchTransformSign_;
// Private static data
//- Number of spaces to reserve for transform encoding
static const label base_;
// Private Member Functions // Private Member Functions
@ -124,7 +125,7 @@ private:
void determineTransformPermutations(); void determineTransformPermutations();
//- Determine which patch uses which transform (if any) and which //- Determine which patch uses which transform (if any) and which
//- Sign to use // sign to use
void determinePatchTransformSign(); void determinePatchTransformSign();
//- Test a list of reference transforms to see if the test //- Test a list of reference transforms to see if the test
@ -139,16 +140,14 @@ private:
bool checkBothSigns bool checkBothSigns
) const; ) const;
//- Encode transform index. Hardcoded to 3 independent transforms max. //- Return true if transform is not yet present in trafos. Issues
inline label encodeTransformIndex // warning if too many transforms
bool uniqueTransform
( (
const FixedList<Foam::label, 3>& permutationIndices const point& pt,
) const; labelPairList& trafos,
const label patchi,
//- Decode transform index. Hardcoded to 3 independent transforms max. const labelPair& patchTrafo
inline FixedList<label, 3> decodeTransformIndex
(
const label transformIndex
) const; ) const;
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct
@ -160,10 +159,6 @@ private:
public: public:
//- Declare friendship with the entry class for IO
friend class globalPoints;
// Declare name of the class and its debug switch // Declare name of the class and its debug switch
ClassName("globalIndexAndTransform"); ClassName("globalIndexAndTransform");
@ -174,10 +169,6 @@ public:
globalIndexAndTransform(const polyMesh& mesh); globalIndexAndTransform(const polyMesh& mesh);
//- Destructor
~globalIndexAndTransform();
// Member Functions // Member Functions
//- Generate a transform index from the permutation indices of //- Generate a transform index from the permutation indices of
@ -185,9 +176,12 @@ public:
// only be -1, 0 or +1. // only be -1, 0 or +1.
inline label encodeTransformIndex inline label encodeTransformIndex
( (
const List<label>& permutationIndices const labelList& permutationIndices
) const; ) const;
//- Decode transform index
inline labelList decodeTransformIndex(const label transformIndex) const;
//- Add patch transformation to transformIndex. Return new //- Add patch transformation to transformIndex. Return new
// transformIndex. (by default the patch is the sending, not the // transformIndex. (by default the patch is the sending, not the
// receiving, patch) // receiving, patch)
@ -221,74 +215,71 @@ public:
) const; ) const;
//- Encode index and bare index as components on own processor //- Encode index and bare index as components on own processor
inline static labelPair encode inline labelPair encode
( (
const label index, const label index,
const label transformIndex const label transformIndex
); ) const;
//- Encode index and bare index as components on given processor //- Encode index and bare index as components on given processor
inline static labelPair encode inline labelPair encode
( (
const label proci, const label proci,
const label index, const label index,
const label transformIndex const label transformIndex
); ) const;
//- Index carried by the object //- Index carried by the object
inline static label index(const labelPair& globalIAndTransform); inline label index(const labelPair& globalIAndTransform) const;
//- Which processor does this come from? //- Which processor does this come from?
inline static label processor(const labelPair& globalIAndTransform); inline label processor(const labelPair& globalIAndTransform) const;
//- Transform carried by the object //- Transform carried by the object
inline static label transformIndex inline label transformIndex(const labelPair& globalIAndTransform) const;
//- Return the number of independent transforms
inline label nIndependentTransforms() const;
//- Return access to the stored independent transforms
inline const List<vectorTensorTransform>& transforms() const;
//- Return access to the permuted transforms
inline const List<vectorTensorTransform>&
transformPermutations() const;
//- Return the transformIndex (index in transformPermutations)
// of the identity transform
inline label nullTransformIndex() const;
//- Return access to the per-patch transform-sign pairs
inline const List<labelPair>& patchTransformSign() const;
//- Access the overall (permuted) transform corresponding
// to the transformIndex
inline const vectorTensorTransform& transform
( (
const labelPair& globalIAndTransform label transformIndex
); ) const;
// Access //- Access the all of the indices of the transform
// permutations corresponding the transforms of the
// listed patch indices. This only allows a maximum of three
// transformations (since routine is used to transform points and
// any given point can only be on 3 or less transforms)
inline labelList transformIndicesForPatches
(
const labelHashSet& patchIs
) const;
//- Return the number of independent transforms //- Apply all of the transform permutations
inline label nIndependentTransforms() const; // corresponding the transforms of the listed patch
// indices to the supplied point
//- Return access to the stored independent transforms inline pointField transformPatches
inline const List<vectorTensorTransform>& transforms() const; (
const labelHashSet& patchIs,
//- Return access to the permuted transforms const point& pt
inline const List<vectorTensorTransform>& ) const;
transformPermutations() const;
//- Return the transformIndex (index in transformPermutations)
// of the identity transform
inline label nullTransformIndex() const;
//- Return access to the per-patch transform-sign pairs
inline const List<Pair<label>>& patchTransformSign() const;
//- Access the overall (permuted) transform corresponding
// to the transformIndex
inline const vectorTensorTransform& transform
(
label transformIndex
) const;
//- Access the all of the indices of the transform
// permutations corresponding the transforms of the
// listed patch indices
inline labelList transformIndicesForPatches
(
const labelHashSet& patchIs
) const;
//- Apply all of the transform permutations
// corresponding the transforms of the listed patch
// indices to the supplied point
inline pointField transformPatches
(
const labelHashSet& patchIs,
const point& pt
) const;
}; };

142
src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
View File

@ -33,8 +33,8 @@ bool Foam::globalIndexAndTransform::less::operator()
const labelPair& b const labelPair& b
) const ) const
{ {
label procA = globalIndexAndTransform::processor(a); label procA = gi_.processor(a);
label procB = globalIndexAndTransform::processor(b); label procB = gi_.processor(b);
if (procA < procB) if (procA < procB)
{ {
@ -47,8 +47,8 @@ bool Foam::globalIndexAndTransform::less::operator()
else else
{ {
// Equal proc. // Equal proc.
label indexA = globalIndexAndTransform::index(a); label indexA = gi_.index(a);
label indexB = globalIndexAndTransform::index(b); label indexB = gi_.index(b);
if (indexA < indexB) if (indexA < indexB)
{ {
@ -61,8 +61,8 @@ bool Foam::globalIndexAndTransform::less::operator()
else else
{ {
// Equal index // Equal index
label transformA = globalIndexAndTransform::transformIndex(a); label transformA = gi_.transformIndex(a);
label transformB = globalIndexAndTransform::transformIndex(b); label transformB = gi_.transformIndex(b);
return transformA < transformB; return transformA < transformB;
} }
@ -72,7 +72,7 @@ bool Foam::globalIndexAndTransform::less::operator()
Foam::label Foam::globalIndexAndTransform::encodeTransformIndex Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
( (
const List<label>& permutationIndices const labelList& permutationIndices
) const ) const
{ {
if (permutationIndices.size() != transforms_.size()) if (permutationIndices.size() != transforms_.size())
@ -106,68 +106,20 @@ Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
} }
Foam::label Foam::globalIndexAndTransform::encodeTransformIndex Foam::labelList Foam::globalIndexAndTransform::decodeTransformIndex
(
const FixedList<Foam::label, 3>& permutation
) const
{
if (nIndependentTransforms() == 0)
{
return 0;
}
if (nIndependentTransforms() == 1)
{
return permutation[0]+1;
}
else if (nIndependentTransforms() == 2)
{
return (permutation[1]+1)*3 + (permutation[0]+1);
}
else
{
return
(permutation[2]+1)*9
+ (permutation[1]+1)*3
+ (permutation[0]+1);
}
}
Foam::FixedList<Foam::label, 3>
Foam::globalIndexAndTransform::decodeTransformIndex
( (
const label transformIndex const label transformIndex
) const ) const
{ {
FixedList<label, 3> permutation(label(0)); labelList permutation(transforms_.size(), 0);
label t = transformIndex; label t = transformIndex;
if (nIndependentTransforms() > 0) forAll(permutation, i)
{ {
permutation[0] = (t%3)-1; permutation[i] = (t%3)-1;
if (nIndependentTransforms() > 1) t /= 3;
{
t /= 3;
permutation[1] = (t%3)-1;
if (nIndependentTransforms() > 2)
{
t /= 3;
permutation[2] = (t%3)-1;
}
}
} }
#ifdef FULLDEBUG
t /= 3;
if (t != 0)
{
FatalErrorInFunction
<< "transformIndex : " << transformIndex
<< " has more than 3 fields."
<< abort(FatalError);
}
#endif
return permutation; return permutation;
} }
@ -180,15 +132,28 @@ Foam::label Foam::globalIndexAndTransform::addToTransformIndex
const scalar tol const scalar tol
) const ) const
{ {
const Pair<label>& transSign = patchTransformSign_[patchi]; const labelPair& transSign = patchTransformSign_[patchi];
label matchTransI = transSign.first(); label matchTransI = transSign.first();
// Hardcoded for max 3 transforms only! if (matchTransI >= transforms_.size())
if (matchTransI > -1 && matchTransI < 3)
{ {
FixedList<label, 3> permutation = decodeTransformIndex(transformIndex); FatalErrorInFunction
<< "patch:" << mesh_.boundaryMesh()[patchi].name()
<< " transform:" << matchTransI
<< " out of possible transforms:" << transforms_
<< exit(FatalError);
return labelMin;
}
else if (matchTransI == -1)
{
// No additional transformation for this patch
return transformIndex;
}
else
{
// Decode current set of transforms
labelList permutation(decodeTransformIndex(transformIndex));
// Add patch transform // Add patch transform
@ -267,10 +232,6 @@ Foam::label Foam::globalIndexAndTransform::addToTransformIndex
return encodeTransformIndex(permutation); return encodeTransformIndex(permutation);
} }
else
{
return transformIndex;
}
} }
@ -287,7 +248,7 @@ Foam::label Foam::globalIndexAndTransform::minimumTransformIndex
// Count number of transforms // Count number of transforms
FixedList<label, 3> permutation0 = decodeTransformIndex(transformIndex0); labelList permutation0(decodeTransformIndex(transformIndex0));
label n0 = 0; label n0 = 0;
forAll(permutation0, i) forAll(permutation0, i)
{ {
@ -297,7 +258,7 @@ Foam::label Foam::globalIndexAndTransform::minimumTransformIndex
} }
} }
FixedList<label, 3> permutation1 = decodeTransformIndex(transformIndex1); labelList permutation1(decodeTransformIndex(transformIndex1));
label n1 = 0; label n1 = 0;
forAll(permutation1, i) forAll(permutation1, i)
{ {
@ -324,8 +285,8 @@ Foam::label Foam::globalIndexAndTransform::subtractTransformIndex
const label transformIndex1 const label transformIndex1
) const ) const
{ {
FixedList<label, 3> permutation0 = decodeTransformIndex(transformIndex0); labelList permutation0(decodeTransformIndex(transformIndex0));
FixedList<label, 3> permutation1 = decodeTransformIndex(transformIndex1); labelList permutation1(decodeTransformIndex(transformIndex1));
forAll(permutation0, i) forAll(permutation0, i)
{ {
@ -340,7 +301,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
( (
const label index, const label index,
const label transformIndex const label transformIndex
) ) const
{ {
return encode(Pstream::myProcNo(), index, transformIndex); return encode(Pstream::myProcNo(), index, transformIndex);
} }
@ -351,21 +312,22 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
const label proci, const label proci,
const label index, const label index,
const label transformIndex const label transformIndex
) ) const
{ {
if (transformIndex < 0 || transformIndex >= base_) if (transformIndex < 0 || transformIndex >= transformPermutations_.size())
{ {
FatalErrorInFunction FatalErrorInFunction
<< "TransformIndex " << transformIndex << "TransformIndex " << transformIndex
<< " is outside allowed range of 0 to " << " is outside allowed range of 0 to "
<< base_ - 1 << transformPermutations_.size() - 1
<< abort(FatalError); << abort(FatalError);
} }
if (proci > labelMax/base_) if (proci > labelMax/transformPermutations_.size())
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Overflow : encoding processor " << proci << " in base " << base_ << "Overflow : encoding processor " << proci
<< " in base " << transformPermutations_.size()
<< " exceeds capability of label (" << labelMax << " exceeds capability of label (" << labelMax
<< "). Please recompile with larger datatype for label." << "). Please recompile with larger datatype for label."
<< exit(FatalError); << exit(FatalError);
@ -374,7 +336,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
return labelPair return labelPair
( (
index, index,
transformIndex + proci*base_ transformIndex + proci*transformPermutations_.size()
); );
} }
@ -382,7 +344,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
Foam::label Foam::globalIndexAndTransform::index Foam::label Foam::globalIndexAndTransform::index
( (
const labelPair& globalIAndTransform const labelPair& globalIAndTransform
) ) const
{ {
return globalIAndTransform.first(); return globalIAndTransform.first();
} }
@ -391,18 +353,18 @@ Foam::label Foam::globalIndexAndTransform::index
Foam::label Foam::globalIndexAndTransform::processor Foam::label Foam::globalIndexAndTransform::processor
( (
const labelPair& globalIAndTransform const labelPair& globalIAndTransform
) ) const
{ {
return globalIAndTransform.second()/base_; return globalIAndTransform.second()/transformPermutations_.size();
} }
Foam::label Foam::globalIndexAndTransform::transformIndex Foam::label Foam::globalIndexAndTransform::transformIndex
( (
const labelPair& globalIAndTransform const labelPair& globalIAndTransform
) ) const
{ {
return globalIAndTransform.second() % base_; return globalIAndTransform.second()%transformPermutations_.size();
} }
@ -432,7 +394,7 @@ Foam::label Foam::globalIndexAndTransform::nullTransformIndex() const
} }
const Foam::List<Foam::Pair<Foam::label>>& const Foam::labelPairList&
Foam::globalIndexAndTransform::patchTransformSign() const Foam::globalIndexAndTransform::patchTransformSign() const
{ {
return patchTransformSign_; return patchTransformSign_;
@ -453,7 +415,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
const labelHashSet& patchis const labelHashSet& patchis
) const ) const
{ {
List<label> permutation(transforms_.size(), 0); labelList permutation(transforms_.size(), 0);
labelList selectedTransformIs(0); labelList selectedTransformIs(0);
@ -466,7 +428,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
{ {
label patchi = iter.key(); label patchi = iter.key();
const Pair<label>& transSign = patchTransformSign_[patchi]; const labelPair& transSign = patchTransformSign_[patchi];
label matchTransI = transSign.first(); label matchTransI = transSign.first();
@ -520,7 +482,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
} }
case 2: case 2:
{ {
List<label> tempPermutation = permutation; labelList tempPermutation = permutation;
label a = 0; label a = 0;
label b = 1; label b = 1;
@ -565,7 +527,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
} }
case 3: case 3:
{ {
List<label> tempPermutation = permutation; labelList tempPermutation = permutation;
tempPermutation[0] = 0; tempPermutation[0] = 0;
tempPermutation[1] = 0; tempPermutation[1] = 0;