Add Foam:: namespace in instantiations of SLList where needed in applications/*
This commit is contained in:
parent
fd689d2b6c
commit
12bad5958e
15 changed files with 114 additions and 114 deletions
|
@ -44,8 +44,8 @@ nCoupledFacesToBreak = 0;
|
|||
|
||||
maxEffTractionFraction = gMax(effTractionFraction);
|
||||
|
||||
SLList<label> facesToBreakList;
|
||||
SLList<scalar> facesToBreakEffTractionFractionList;
|
||||
Foam::SLList<label> facesToBreakList;
|
||||
Foam::SLList<scalar> facesToBreakEffTractionFractionList;
|
||||
|
||||
forAll(effTractionFraction, faceI)
|
||||
{
|
||||
|
@ -128,8 +128,8 @@ nCoupledFacesToBreak = 0;
|
|||
|
||||
// Check coupled (processor) patches
|
||||
|
||||
SLList<label> coupledFacesToBreakList;
|
||||
SLList<scalar> coupledFacesToBreakEffTractionFractionList;
|
||||
Foam::SLList<label> coupledFacesToBreakList;
|
||||
Foam::SLList<scalar> coupledFacesToBreakEffTractionFractionList;
|
||||
forAll(mesh.boundary(), patchI)
|
||||
{
|
||||
if (mesh.boundary()[patchI].coupled())
|
||||
|
|
|
@ -46,8 +46,8 @@ nCoupledFacesToBreak = 0;
|
|||
|
||||
maxEffTractionFraction = gMax(effTractionFraction);
|
||||
|
||||
SLList<label> facesToBreakList;
|
||||
SLList<scalar> facesToBreakEffTractionFractionList;
|
||||
Foam::SLList<label> facesToBreakList;
|
||||
Foam::SLList<scalar> facesToBreakEffTractionFractionList;
|
||||
|
||||
forAll(effTractionFraction, faceI)
|
||||
{
|
||||
|
@ -130,8 +130,8 @@ nCoupledFacesToBreak = 0;
|
|||
|
||||
// Check coupled (processor) patches
|
||||
|
||||
SLList<label> coupledFacesToBreakList;
|
||||
SLList<scalar> coupledFacesToBreakEffTractionFractionList;
|
||||
Foam::SLList<label> coupledFacesToBreakList;
|
||||
Foam::SLList<scalar> coupledFacesToBreakEffTractionFractionList;
|
||||
forAll(mesh.boundary(), patchI)
|
||||
{
|
||||
if (mesh.boundary()[patchI].coupled())
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
labelList globalFaceZones;
|
||||
|
||||
{
|
||||
SLList<label> globalFaceZonesSet;
|
||||
Foam::SLList<label> globalFaceZonesSet;
|
||||
|
||||
const faceZoneMesh& faceZones = mesh.faceZones();
|
||||
|
||||
|
|
|
@ -44,8 +44,8 @@ nCoupledFacesToBreak = 0;
|
|||
|
||||
maxEffTractionFraction = gMax(effTractionFraction);
|
||||
|
||||
SLList<label> facesToBreakList;
|
||||
SLList<scalar> facesToBreakEffTractionFractionList;
|
||||
Foam::SLList<label> facesToBreakList;
|
||||
Foam::SLList<scalar> facesToBreakEffTractionFractionList;
|
||||
|
||||
forAll(effTractionFraction, faceI)
|
||||
{
|
||||
|
@ -128,8 +128,8 @@ nCoupledFacesToBreak = 0;
|
|||
|
||||
// Check coupled (processor) patches
|
||||
|
||||
SLList<label> coupledFacesToBreakList;
|
||||
SLList<scalar> coupledFacesToBreakEffTractionFractionList;
|
||||
Foam::SLList<label> coupledFacesToBreakList;
|
||||
Foam::SLList<scalar> coupledFacesToBreakEffTractionFractionList;
|
||||
forAll(mesh.boundary(), patchI)
|
||||
{
|
||||
if (mesh.boundary()[patchI].coupled())
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
labelList globalFaceZones;
|
||||
|
||||
{
|
||||
SLList<label> globalFaceZonesSet;
|
||||
Foam::SLList<label> globalFaceZonesSet;
|
||||
|
||||
const faceZoneMesh& faceZones = mesh.faceZones();
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
labelList globalFaceZones;
|
||||
|
||||
{
|
||||
SLList<label> globalFaceZonesSet;
|
||||
Foam::SLList<label> globalFaceZonesSet;
|
||||
|
||||
const faceZoneMesh& faceZones = stressMesh.faceZones();
|
||||
|
||||
|
|
|
@ -763,7 +763,7 @@ void freeSurface::makeFluidIndicator()
|
|||
// get cell-cells addressing
|
||||
const labelListList& cellCells = mesh().cellCells();
|
||||
|
||||
SLList<label> slList(startCell);
|
||||
Foam::SLList<label> slList(startCell);
|
||||
|
||||
while (slList.size())
|
||||
{
|
||||
|
|
|
@ -253,7 +253,7 @@ int main(int argc, char *argv[])
|
|||
// Set edgeLabels for each faPatch
|
||||
for(label pI=0; pI<(faPatches.size()-1); pI++)
|
||||
{
|
||||
SLList<label> tmpList;
|
||||
Foam::SLList<label> tmpList;
|
||||
|
||||
forAll (bndEdgeFaPatchIDs, eI)
|
||||
{
|
||||
|
@ -267,7 +267,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
// Check for undefined edges
|
||||
SLList<label> tmpList;
|
||||
Foam::SLList<label> tmpList;
|
||||
|
||||
forAll (bndEdgeFaPatchIDs, eI)
|
||||
{
|
||||
|
@ -287,7 +287,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
// Add good patches to faMesh
|
||||
SLList<faPatch*> faPatchLst;
|
||||
Foam::SLList<faPatch*> faPatchLst;
|
||||
|
||||
for(label pI = 0; pI < faPatches.size(); pI++)
|
||||
{
|
||||
|
|
|
@ -57,17 +57,17 @@ using namespace Foam;
|
|||
#include "SLList.H"
|
||||
#include "SLPtrList.H"
|
||||
|
||||
SLList<point> slPoints;
|
||||
SLList<label> slPointMap;
|
||||
Foam::SLList<point> slPoints;
|
||||
Foam::SLList<label> slPointMap;
|
||||
label maxNodei = 0;
|
||||
|
||||
SLPtrList<labelList> slCellLabels;
|
||||
SLList<label> slCellMap;
|
||||
SLList<label> slCellType;
|
||||
Foam::SLList<label> slCellMap;
|
||||
Foam::SLList<label> slCellType;
|
||||
label maxCelli = 0;
|
||||
|
||||
PtrList<SLList<label> > slPatchCells;
|
||||
PtrList<SLList<label> > slPatchCellFaces;
|
||||
PtrList<Foam::SLList<label> > slPatchCells;
|
||||
PtrList<Foam::SLList<label> > slPatchCellFaces;
|
||||
|
||||
// Cell types
|
||||
Map<word> cellTypes;
|
||||
|
@ -195,7 +195,7 @@ elementType ^{space}"TYPE"{cspace}
|
|||
{
|
||||
if (!slPatchCells(i))
|
||||
{
|
||||
slPatchCells.set(i, new SLList<label>);
|
||||
slPatchCells.set(i, new Foam::SLList<label>);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -208,7 +208,7 @@ elementType ^{space}"TYPE"{cspace}
|
|||
{
|
||||
if (!slPatchCellFaces(i))
|
||||
{
|
||||
slPatchCellFaces.set(i, new SLList<label>);
|
||||
slPatchCellFaces.set(i, new Foam::SLList<label>);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -339,7 +339,7 @@ int main(int argc, char *argv[])
|
|||
pointField points(slPoints.size());
|
||||
|
||||
label i = 0;
|
||||
forAllConstIter(SLList<point>, slPoints, pointIter)
|
||||
forAllConstIter(Foam::SLList<point>, slPoints, pointIter)
|
||||
{
|
||||
// Scale points for the given scale factor
|
||||
points[i++] = scaleFactor * pointIter();
|
||||
|
@ -349,7 +349,7 @@ int main(int argc, char *argv[])
|
|||
labelList pointMap(maxNodei+1);
|
||||
|
||||
i = 0;
|
||||
forAllConstIter(SLList<label>, slPointMap, pointMapIter)
|
||||
forAllConstIter(Foam::SLList<label>, slPointMap, pointMapIter)
|
||||
{
|
||||
pointMap[pointMapIter()] = i++;
|
||||
}
|
||||
|
@ -359,7 +359,7 @@ int main(int argc, char *argv[])
|
|||
labelList cellMap(maxCelli+1);
|
||||
|
||||
i = 0;
|
||||
forAllConstIter(SLList<label>, slCellMap, cellMapIter)
|
||||
forAllConstIter(Foam::SLList<label>, slCellMap, cellMapIter)
|
||||
{
|
||||
cellMap[cellMapIter()] = i++;
|
||||
}
|
||||
|
@ -491,10 +491,10 @@ int main(int argc, char *argv[])
|
|||
|
||||
forAll(slPatchCells, patchI)
|
||||
{
|
||||
SLList<face> patchFaces;
|
||||
Foam::SLList<face> patchFaces;
|
||||
|
||||
SLList<label>::iterator cellIter(slPatchCells[patchI].begin());
|
||||
SLList<label>::iterator faceIter(slPatchCellFaces[patchI].begin());
|
||||
Foam::SLList<label>::iterator cellIter(slPatchCells[patchI].begin());
|
||||
Foam::SLList<label>::iterator faceIter(slPatchCellFaces[patchI].begin());
|
||||
|
||||
for
|
||||
(
|
||||
|
@ -664,8 +664,8 @@ int main(int argc, char *argv[])
|
|||
// Pick up cells in zone
|
||||
DynamicList<label> addr;
|
||||
|
||||
SLList<label>::iterator cellMapIter = slCellMap.begin();
|
||||
SLList<label>::iterator typeIter = slCellType.begin();
|
||||
Foam::SLList<label>::iterator cellMapIter = slCellMap.begin();
|
||||
Foam::SLList<label>::iterator typeIter = slCellType.begin();
|
||||
|
||||
for
|
||||
(
|
||||
|
|
|
@ -75,23 +75,23 @@ label nFaces = 0;
|
|||
label nCells = 0;
|
||||
|
||||
pointField points(0);
|
||||
SLList<label> pointGroupZoneID;
|
||||
SLList<label> pointGroupStartIndex;
|
||||
SLList<label> pointGroupEndIndex;
|
||||
Foam::SLList<label> pointGroupZoneID;
|
||||
Foam::SLList<label> pointGroupStartIndex;
|
||||
Foam::SLList<label> pointGroupEndIndex;
|
||||
|
||||
|
||||
faceList faces(0);
|
||||
labelList owner(0);
|
||||
labelList neighbour(0);
|
||||
SLList<label> faceGroupZoneID;
|
||||
SLList<label> faceGroupStartIndex;
|
||||
SLList<label> faceGroupEndIndex;
|
||||
Foam::SLList<label> faceGroupZoneID;
|
||||
Foam::SLList<label> faceGroupStartIndex;
|
||||
Foam::SLList<label> faceGroupEndIndex;
|
||||
|
||||
labelList fluentCellModelID(0);
|
||||
SLList<label> cellGroupZoneID;
|
||||
SLList<label> cellGroupStartIndex;
|
||||
SLList<label> cellGroupEndIndex;
|
||||
SLList<label> cellGroupType;
|
||||
Foam::SLList<label> cellGroupZoneID;
|
||||
Foam::SLList<label> cellGroupStartIndex;
|
||||
Foam::SLList<label> cellGroupEndIndex;
|
||||
Foam::SLList<label> cellGroupType;
|
||||
|
||||
// number of zones adjusted at run-time if necessary
|
||||
label maxZoneID = 100;
|
||||
|
@ -1211,10 +1211,10 @@ int main(int argc, char *argv[])
|
|||
|
||||
// Make boundary patches
|
||||
|
||||
SLList<label>::iterator faceGroupZoneIDIter = faceGroupZoneID.begin();
|
||||
SLList<label>::iterator faceGroupStartIndexIter =
|
||||
Foam::SLList<label>::iterator faceGroupZoneIDIter = faceGroupZoneID.begin();
|
||||
Foam::SLList<label>::iterator faceGroupStartIndexIter =
|
||||
faceGroupStartIndex.begin();
|
||||
SLList<label>::iterator faceGroupEndIndexIter = faceGroupEndIndex.begin();
|
||||
Foam::SLList<label>::iterator faceGroupEndIndexIter = faceGroupEndIndex.begin();
|
||||
|
||||
// Note. Not all groups of faces will be boundary patches.
|
||||
// Take care on construction
|
||||
|
@ -1245,7 +1245,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
for
|
||||
(
|
||||
SLList<label>::iterator fgzIDIter = faceGroupZoneID.begin();
|
||||
Foam::SLList<label>::iterator fgzIDIter = faceGroupZoneID.begin();
|
||||
fgzIDIter != faceGroupZoneID.end();
|
||||
++fgzIDIter
|
||||
)
|
||||
|
@ -1650,9 +1650,9 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
label cnt = 0;
|
||||
SLList<label>::iterator cg = cellGroupZoneID.begin();
|
||||
SLList<label>::iterator start = cellGroupStartIndex.begin();
|
||||
SLList<label>::iterator end = cellGroupEndIndex.begin();
|
||||
Foam::SLList<label>::iterator cg = cellGroupZoneID.begin();
|
||||
Foam::SLList<label>::iterator start = cellGroupStartIndex.begin();
|
||||
Foam::SLList<label>::iterator end = cellGroupEndIndex.begin();
|
||||
|
||||
for (; cg != cellGroupZoneID.end(); ++cg, ++start, ++end)
|
||||
{
|
||||
|
@ -1773,9 +1773,9 @@ int main(int argc, char *argv[])
|
|||
{
|
||||
Info<< "Writing cell sets" << endl;
|
||||
|
||||
SLList<label>::iterator cg = cellGroupZoneID.begin();
|
||||
SLList<label>::iterator start = cellGroupStartIndex.begin();
|
||||
SLList<label>::iterator end = cellGroupEndIndex.begin();
|
||||
Foam::SLList<label>::iterator cg = cellGroupZoneID.begin();
|
||||
Foam::SLList<label>::iterator start = cellGroupStartIndex.begin();
|
||||
Foam::SLList<label>::iterator end = cellGroupEndIndex.begin();
|
||||
|
||||
// Note: cellGroupXXX are all Fluent indices (starting at 1)
|
||||
// so offset before using.
|
||||
|
|
|
@ -232,7 +232,7 @@ const char* kivaPatchNames[nBCs] =
|
|||
};
|
||||
|
||||
|
||||
List<SLList<face> > pFaces[nBCs];
|
||||
List<Foam::SLList<face> > pFaces[nBCs];
|
||||
|
||||
face quadFace(4);
|
||||
face triFace(3);
|
||||
|
@ -327,7 +327,7 @@ if
|
|||
{
|
||||
scalar minz = GREAT;
|
||||
|
||||
forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
|
||||
forAllConstIter(Foam::SLList<face>, pFaces[CYLINDERHEAD][0], iter)
|
||||
{
|
||||
const face& pf = iter();
|
||||
|
||||
|
@ -339,9 +339,9 @@ if
|
|||
|
||||
minz += SMALL;
|
||||
|
||||
SLList<face> newLinerFaces;
|
||||
Foam::SLList<face> newLinerFaces;
|
||||
|
||||
forAllConstIter(SLList<face>, pFaces[LINER][0], iter)
|
||||
forAllConstIter(Foam::SLList<face>, pFaces[LINER][0], iter)
|
||||
{
|
||||
const face& pf = iter();
|
||||
|
||||
|
@ -368,9 +368,9 @@ if
|
|||
pFaces[LINER][0] = newLinerFaces;
|
||||
}
|
||||
|
||||
SLList<face> newCylinderHeadFaces;
|
||||
Foam::SLList<face> newCylinderHeadFaces;
|
||||
|
||||
forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
|
||||
forAllConstIter(Foam::SLList<face>, pFaces[CYLINDERHEAD][0], iter)
|
||||
{
|
||||
const face& pf = iter();
|
||||
|
||||
|
@ -421,8 +421,8 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
|
|||
|
||||
scalar tanTheta = Foam::tan(degToRad(2.5));
|
||||
|
||||
SLList<face>::iterator iterf = pFaces[WEDGE][0].begin();
|
||||
SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
|
||||
Foam::SLList<face>::iterator iterf = pFaces[WEDGE][0].begin();
|
||||
Foam::SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
|
||||
for
|
||||
(
|
||||
;
|
||||
|
@ -441,7 +441,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
|
|||
{
|
||||
pFaces[CYCLIC].setSize(1);
|
||||
pFaces[CYCLIC][0] = pFaces[WEDGE][0];
|
||||
forAllIter(SLList<face>, pFaces[WEDGE][1], iterb)
|
||||
forAllIter(Foam::SLList<face>, pFaces[WEDGE][1], iterb)
|
||||
{
|
||||
pFaces[CYCLIC][0].append(iterb());
|
||||
}
|
||||
|
|
|
@ -51,9 +51,9 @@ void starMesh::createCoupleMatches()
|
|||
);
|
||||
|
||||
// Store newly created faces for each cell
|
||||
Map<SLList<face> > cellAddedFaces(cellMapSize);
|
||||
Map<Foam::SLList<face> > cellAddedFaces(cellMapSize);
|
||||
|
||||
Map<SLList<label> > cellRemovedFaces(cellMapSize);
|
||||
Map<Foam::SLList<label> > cellRemovedFaces(cellMapSize);
|
||||
|
||||
// In order to remove often allocation, remember the number of live points.
|
||||
// If you run out of space in point creation, increase it by the number of
|
||||
|
@ -115,7 +115,7 @@ void starMesh::createCoupleMatches()
|
|||
{
|
||||
// Master face is replaced by a set of slave faces
|
||||
|
||||
Map<SLList<label> >::iterator crfIter =
|
||||
Map<Foam::SLList<label> >::iterator crfIter =
|
||||
cellRemovedFaces.find(fp.masterCell());
|
||||
|
||||
if (crfIter == cellRemovedFaces.end())
|
||||
|
@ -123,7 +123,7 @@ void starMesh::createCoupleMatches()
|
|||
cellRemovedFaces.insert
|
||||
(
|
||||
fp.masterCell(),
|
||||
SLList<label>(fp.masterFace())
|
||||
Foam::SLList<label>(fp.masterFace())
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -131,14 +131,14 @@ void starMesh::createCoupleMatches()
|
|||
crfIter().append(fp.masterFace());
|
||||
}
|
||||
|
||||
Map<SLList<face> >::iterator cafIter =
|
||||
Map<Foam::SLList<face> >::iterator cafIter =
|
||||
cellAddedFaces.find(fp.masterCell());
|
||||
if (cafIter == cellAddedFaces.end())
|
||||
{
|
||||
cellAddedFaces.insert
|
||||
(
|
||||
fp.masterCell(),
|
||||
SLList<face>(slaveFace.reverseFace())
|
||||
Foam::SLList<face>(slaveFace.reverseFace())
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -151,15 +151,15 @@ void starMesh::createCoupleMatches()
|
|||
// Create cut faces, which replace both master and slave faces
|
||||
|
||||
// Store newly created points
|
||||
SLList<point> coupleFacePoints;
|
||||
Foam::SLList<point> coupleFacePoints;
|
||||
|
||||
// Master data
|
||||
edgeList masterEdges = masterFace.edges();
|
||||
List<SLList<label> > masterEdgePoints(masterEdges.size());
|
||||
List<Foam::SLList<label> > masterEdgePoints(masterEdges.size());
|
||||
|
||||
// Slave data
|
||||
edgeList slaveEdges = slaveFace.edges();
|
||||
List<SLList<label> > slaveEdgePoints(slaveEdges.size());
|
||||
List<Foam::SLList<label> > slaveEdgePoints(slaveEdges.size());
|
||||
|
||||
// Find common plane
|
||||
vector n = masterFace.normal(points_);
|
||||
|
@ -480,7 +480,7 @@ void starMesh::createCoupleMatches()
|
|||
|
||||
for
|
||||
(
|
||||
SLList<point>::iterator coupleFacePointsIter =
|
||||
Foam::SLList<point>::iterator coupleFacePointsIter =
|
||||
coupleFacePoints.begin();
|
||||
coupleFacePointsIter != coupleFacePoints.end();
|
||||
++coupleFacePointsIter
|
||||
|
@ -523,7 +523,7 @@ void starMesh::createCoupleMatches()
|
|||
nTmpMasterLabels++;
|
||||
|
||||
// get reference to added points of current edge
|
||||
const SLList<label>& curMEdgePoints =
|
||||
const Foam::SLList<label>& curMEdgePoints =
|
||||
masterEdgePoints[masterEdgeI];
|
||||
|
||||
// create a markup list of points that have been used
|
||||
|
@ -554,7 +554,7 @@ void starMesh::createCoupleMatches()
|
|||
|
||||
for
|
||||
(
|
||||
SLList<label>::const_iterator curMEdgePointsIter =
|
||||
Foam::SLList<label>::const_iterator curMEdgePointsIter =
|
||||
curMEdgePoints.begin();
|
||||
curMEdgePointsIter != curMEdgePoints.end();
|
||||
++curMEdgePointsIter
|
||||
|
@ -717,7 +717,7 @@ void starMesh::createCoupleMatches()
|
|||
nTmpSlaveLabels++;
|
||||
|
||||
// get reference to added points of current edge
|
||||
const SLList<label>& curSEdgePoints =
|
||||
const Foam::SLList<label>& curSEdgePoints =
|
||||
slaveEdgePoints[slaveEdgeI];
|
||||
|
||||
// create a markup list of points that have been used
|
||||
|
@ -748,7 +748,7 @@ void starMesh::createCoupleMatches()
|
|||
|
||||
for
|
||||
(
|
||||
SLList<label>::const_iterator curSEdgePointsIter =
|
||||
Foam::SLList<label>::const_iterator curSEdgePointsIter =
|
||||
curSEdgePoints.begin();
|
||||
curSEdgePointsIter != curSEdgePoints.end();
|
||||
++curSEdgePointsIter
|
||||
|
@ -1049,7 +1049,7 @@ void starMesh::createCoupleMatches()
|
|||
|
||||
do
|
||||
{
|
||||
SLList<edge> edgesToConsider;
|
||||
Foam::SLList<edge> edgesToConsider;
|
||||
|
||||
// collect master edges
|
||||
forAll (newMasterEdges, edgeI)
|
||||
|
@ -1139,7 +1139,7 @@ void starMesh::createCoupleMatches()
|
|||
|
||||
for
|
||||
(
|
||||
SLList<edge>::iterator etcIter =
|
||||
Foam::SLList<edge>::iterator etcIter =
|
||||
edgesToConsider.begin();
|
||||
etcIter != edgesToConsider.end();
|
||||
++etcIter
|
||||
|
@ -1354,7 +1354,7 @@ void starMesh::createCoupleMatches()
|
|||
// Add the new face to both master and slave
|
||||
|
||||
// Master face is replaced by a set of slave faces
|
||||
Map<SLList<label> >::iterator crfMasterIter =
|
||||
Map<Foam::SLList<label> >::iterator crfMasterIter =
|
||||
cellRemovedFaces.find(fp.masterCell());
|
||||
|
||||
if (crfMasterIter == cellRemovedFaces.end())
|
||||
|
@ -1362,7 +1362,7 @@ void starMesh::createCoupleMatches()
|
|||
cellRemovedFaces.insert
|
||||
(
|
||||
fp.masterCell(),
|
||||
SLList<label>(fp.masterFace())
|
||||
Foam::SLList<label>(fp.masterFace())
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -1370,7 +1370,7 @@ void starMesh::createCoupleMatches()
|
|||
crfMasterIter().append(fp.masterFace());
|
||||
}
|
||||
|
||||
Map<SLList<label> >::iterator crfSlaveIter =
|
||||
Map<Foam::SLList<label> >::iterator crfSlaveIter =
|
||||
cellRemovedFaces.find(fp.slaveCell());
|
||||
|
||||
if (crfSlaveIter == cellRemovedFaces.end())
|
||||
|
@ -1378,7 +1378,7 @@ void starMesh::createCoupleMatches()
|
|||
cellRemovedFaces.insert
|
||||
(
|
||||
fp.slaveCell(),
|
||||
SLList<label>(fp.slaveFace())
|
||||
Foam::SLList<label>(fp.slaveFace())
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -1386,14 +1386,14 @@ void starMesh::createCoupleMatches()
|
|||
crfSlaveIter().append(fp.slaveFace());
|
||||
}
|
||||
|
||||
Map<SLList<face> >::iterator cafMasterIter =
|
||||
Map<Foam::SLList<face> >::iterator cafMasterIter =
|
||||
cellAddedFaces.find(fp.masterCell());
|
||||
if (cafMasterIter == cellAddedFaces.end())
|
||||
{
|
||||
cellAddedFaces.insert
|
||||
(
|
||||
fp.masterCell(),
|
||||
SLList<face>(intersectedFace)
|
||||
Foam::SLList<face>(intersectedFace)
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -1401,14 +1401,14 @@ void starMesh::createCoupleMatches()
|
|||
cafMasterIter().append(intersectedFace);
|
||||
}
|
||||
|
||||
Map<SLList<face> >::iterator cafSlaveIter =
|
||||
Map<Foam::SLList<face> >::iterator cafSlaveIter =
|
||||
cellAddedFaces.find(fp.slaveCell());
|
||||
if (cafSlaveIter == cellAddedFaces.end())
|
||||
{
|
||||
cellAddedFaces.insert
|
||||
(
|
||||
fp.slaveCell(),
|
||||
SLList<face>(intersectedFace.reverseFace())
|
||||
Foam::SLList<face>(intersectedFace.reverseFace())
|
||||
);
|
||||
}
|
||||
else
|
||||
|
@ -1427,11 +1427,11 @@ void starMesh::createCoupleMatches()
|
|||
{
|
||||
const label curCell = crfToc[cellI];
|
||||
|
||||
const SLList<label>& curRemovedFaces = cellRemovedFaces[curCell];
|
||||
const Foam::SLList<label>& curRemovedFaces = cellRemovedFaces[curCell];
|
||||
|
||||
for
|
||||
(
|
||||
SLList<label>::const_iterator curRemovedFacesIter =
|
||||
Foam::SLList<label>::const_iterator curRemovedFacesIter =
|
||||
curRemovedFaces.begin();
|
||||
curRemovedFacesIter != curRemovedFaces.end();
|
||||
++curRemovedFacesIter
|
||||
|
@ -1454,7 +1454,7 @@ void starMesh::createCoupleMatches()
|
|||
{
|
||||
const label curCell = cafToc[cellI];
|
||||
|
||||
const SLList<face>& curAddedFaces = cellAddedFaces[curCell];
|
||||
const Foam::SLList<face>& curAddedFaces = cellAddedFaces[curCell];
|
||||
|
||||
faceList oldFaces = cellFaces_[curCell];
|
||||
|
||||
|
@ -1476,7 +1476,7 @@ void starMesh::createCoupleMatches()
|
|||
// add new faces
|
||||
for
|
||||
(
|
||||
SLList<face>::const_iterator curAddedFacesIter =
|
||||
Foam::SLList<face>::const_iterator curAddedFacesIter =
|
||||
curAddedFaces.begin();
|
||||
curAddedFacesIter != curAddedFaces.end();
|
||||
++curAddedFacesIter
|
||||
|
|
|
@ -30,10 +30,10 @@ License
|
|||
Foam::fluentDataConverter::fluentDataConverter
|
||||
(
|
||||
const fvMesh& mesh,
|
||||
const SLList<label>& fieldID,
|
||||
const SLList<label>& zoneID,
|
||||
const SLList<label>& firstID,
|
||||
const SLList<label>& lastID,
|
||||
const Foam::SLList<label>& fieldID,
|
||||
const Foam::SLList<label>& zoneID,
|
||||
const Foam::SLList<label>& firstID,
|
||||
const Foam::SLList<label>& lastID,
|
||||
const SLPtrList<FieldField<Field, scalar> >& zoneData
|
||||
)
|
||||
:
|
||||
|
@ -88,10 +88,10 @@ Foam::tmp<Foam::volScalarField> Foam::fluentDataConverter::convertField
|
|||
);
|
||||
volScalarField& result = tresult();
|
||||
|
||||
SLList<label>::const_iterator fieldIDIter = fieldID_.begin();
|
||||
SLList<label>::const_iterator zoneIDIter = zoneID_.begin();
|
||||
SLList<label>::const_iterator firstIDIter = firstID_.begin();
|
||||
SLList<label>::const_iterator lastIDIter = lastID_.begin();
|
||||
Foam::SLList<label>::const_iterator fieldIDIter = fieldID_.begin();
|
||||
Foam::SLList<label>::const_iterator zoneIDIter = zoneID_.begin();
|
||||
Foam::SLList<label>::const_iterator firstIDIter = firstID_.begin();
|
||||
Foam::SLList<label>::const_iterator lastIDIter = lastID_.begin();
|
||||
SLPtrList<FieldField<Field, scalar> >::const_iterator zoneDataIter =
|
||||
zoneData_.begin();
|
||||
|
||||
|
|
|
@ -61,16 +61,16 @@ class fluentDataConverter
|
|||
const wordIOList zoneToPatchName_;
|
||||
|
||||
//- Field ID list
|
||||
const SLList<label>& fieldID_;
|
||||
const Foam::SLList<label>& fieldID_;
|
||||
|
||||
//- Zone ID list
|
||||
const SLList<label>& zoneID_;
|
||||
const Foam::SLList<label>& zoneID_;
|
||||
|
||||
//- Zone start index
|
||||
const SLList<label>& firstID_;
|
||||
const Foam::SLList<label>& firstID_;
|
||||
|
||||
//- Zone end index
|
||||
const SLList<label>& lastID_;
|
||||
const Foam::SLList<label>& lastID_;
|
||||
|
||||
//- Fluent zone data
|
||||
const SLPtrList<FieldField<Field, scalar> >& zoneData_;
|
||||
|
@ -94,10 +94,10 @@ public:
|
|||
fluentDataConverter
|
||||
(
|
||||
const fvMesh& mesh,
|
||||
const SLList<label>& fieldID,
|
||||
const SLList<label>& zoneID,
|
||||
const SLList<label>& firstID,
|
||||
const SLList<label>& lastID,
|
||||
const Foam::SLList<label>& fieldID,
|
||||
const Foam::SLList<label>& zoneID,
|
||||
const Foam::SLList<label>& firstID,
|
||||
const Foam::SLList<label>& lastID,
|
||||
const SLPtrList<FieldField<Field, scalar> >& zoneData
|
||||
);
|
||||
|
||||
|
|
|
@ -66,11 +66,11 @@ label nPoints = 0;
|
|||
label nFaces = 0;
|
||||
label nCells = 0;
|
||||
|
||||
SLList<label> fieldID;
|
||||
SLList<label> zoneID;
|
||||
SLList<label> nEntriesPerObject;
|
||||
SLList<label> firstID;
|
||||
SLList<label> lastID;
|
||||
Foam::SLList<label> fieldID;
|
||||
Foam::SLList<label> zoneID;
|
||||
Foam::SLList<label> nEntriesPerObject;
|
||||
Foam::SLList<label> firstID;
|
||||
Foam::SLList<label> lastID;
|
||||
|
||||
SLPtrList<FieldField<Field, scalar> > zoneData;
|
||||
|
||||
|
@ -491,7 +491,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
for
|
||||
(
|
||||
SLList<label>::const_iterator fieldIDIter = fieldID.begin();
|
||||
Foam::SLList<label>::const_iterator fieldIDIter = fieldID.begin();
|
||||
fieldIDIter != fieldID.end();
|
||||
++fieldIDIter
|
||||
)
|
||||
|
|
Reference in a new issue