exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Porting changes: gcc-4.4.2

Browse source
This commit is contained in:
Hrvoje Jasak 2015-07-08 02:33:52 +01:00
parent 8c26070cd9
commit 1ce14c5e16
3 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
View file

@ -52,7 +52,7 @@ void writeData(const scalarField& sf, OFstream& ensightFile)
template<class Type> template<class Type>
scalarField map scalarField ensMap
( (
const Field<Type>& vf, const Field<Type>& vf,
const labelList& map, const labelList& map,
@ -71,7 +71,7 @@ scalarField map
template<class Type> template<class Type>
scalarField map scalarField ensMap
( (
const Field<Type>& vf, const Field<Type>& vf,
const labelList& map1, const labelList& map1,
@ -115,7 +115,7 @@ void writeAllData
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
writeData(map(vf, prims, cmpt), ensightFile); writeData(ensMap(vf, prims, cmpt), ensightFile);
for (int slave=1; slave<Pstream::nProcs(); slave++) for (int slave=1; slave<Pstream::nProcs(); slave++)
{ {
@ -130,7 +130,7 @@ void writeAllData
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(vf, prims, cmpt); toMaster<< ensMap(vf, prims, cmpt);
} }
} }
} }
@ -155,7 +155,7 @@ void writeAllDataBinary
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
writeEnsDataBinary(map(vf, prims, cmpt), ensightFile); writeEnsDataBinary(ensMap(vf, prims, cmpt), ensightFile);
for (int slave=1; slave<Pstream::nProcs(); slave++) for (int slave=1; slave<Pstream::nProcs(); slave++)
{ {
@ -170,7 +170,7 @@ void writeAllDataBinary
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(vf, prims, cmpt); toMaster<< ensMap(vf, prims, cmpt);
} }
} }
} }
@ -196,7 +196,7 @@ void writeAllFaceData
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
writeData(map(pf, prims, cmpt), ensightFile); writeData(ensMap(pf, prims, cmpt), ensightFile);
forAll (patchProcessors, i) forAll (patchProcessors, i)
{ {
@ -216,7 +216,7 @@ void writeAllFaceData
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(pf, prims, cmpt); toMaster<< ensMap(pf, prims, cmpt);
} }
} }
} }
@ -242,7 +242,7 @@ void writeAllFaceDataBinary
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
writeEnsDataBinary(map(pf, prims, cmpt), ensightFile); writeEnsDataBinary(ensMap(pf, prims, cmpt), ensightFile);
forAll (patchProcessors, i) forAll (patchProcessors, i)
{ {
@ -262,7 +262,7 @@ void writeAllFaceDataBinary
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(pf, prims, cmpt); toMaster<< ensMap(pf, prims, cmpt);
} }
} }
} }
@ -587,7 +587,7 @@ void ensightFieldAscii
{ {
writeData writeData
( (
map(vf, hexes, wedges, cmpt), ensMap(vf, hexes, wedges, cmpt),
ensightFile ensightFile
); );
@ -604,7 +604,7 @@ void ensightFieldAscii
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(vf, hexes, wedges, cmpt); toMaster<< ensMap(vf, hexes, wedges, cmpt);
} }
} }
} }
@ -756,7 +756,7 @@ void ensightFieldBinary
{ {
writeEnsDataBinary writeEnsDataBinary
( (
map(vf, hexes, wedges, cmpt), ensMap(vf, hexes, wedges, cmpt),
ensightFile ensightFile
); );
@ -773,7 +773,7 @@ void ensightFieldBinary
for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++) for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(vf, hexes, wedges, cmpt); toMaster<< ensMap(vf, hexes, wedges, cmpt);
} }
} }
} }

46
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
View file

@ -308,7 +308,7 @@ void Foam::ensightMesh::writePoints
} }
Foam::cellShapeList Foam::ensightMesh::map Foam::cellShapeList Foam::ensightMesh::ensMap
( (
const cellShapeList& cellShapes, const cellShapeList& cellShapes,
const labelList& prims const labelList& prims
@ -325,7 +325,7 @@ Foam::cellShapeList Foam::ensightMesh::map
} }
Foam::cellShapeList Foam::ensightMesh::map Foam::cellShapeList Foam::ensightMesh::ensMap
( (
const cellShapeList& cellShapes, const cellShapeList& cellShapes,
const labelList& hexes, const labelList& hexes,
@ -932,7 +932,7 @@ void Foam::ensightMesh::writeFacePrimsBinary
} }
Foam::faceList Foam::ensightMesh::map Foam::faceList Foam::ensightMesh::ensMap
( (
const faceList& patchFaces, const faceList& patchFaces,
const labelList& prims const labelList& prims
@ -970,7 +970,7 @@ void Foam::ensightMesh::writeAllFacePrims
{ {
writeFacePrims writeFacePrims
( (
map(patchFaces, prims), ensMap(patchFaces, prims),
0, 0,
ensightGeometryFile ensightGeometryFile
); );
@ -996,7 +996,7 @@ void Foam::ensightMesh::writeAllFacePrims
else if (&prims != NULL) else if (&prims != NULL)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(patchFaces, prims); toMaster<< ensMap(patchFaces, prims);
} }
} }
} }
@ -1057,7 +1057,7 @@ void Foam::ensightMesh::writeAllNSided
{ {
writeNSidedNPointsPerFace writeNSidedNPointsPerFace
( (
map(patchFaces, prims), ensMap(patchFaces, prims),
ensightGeometryFile ensightGeometryFile
); );
} }
@ -1081,7 +1081,7 @@ void Foam::ensightMesh::writeAllNSided
else if (&prims != NULL) else if (&prims != NULL)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(patchFaces, prims); toMaster<< ensMap(patchFaces, prims);
} }
// List of points id for each face // List of points id for each face
@ -1091,7 +1091,7 @@ void Foam::ensightMesh::writeAllNSided
{ {
writeNSidedPoints writeNSidedPoints
( (
map(patchFaces, prims), ensMap(patchFaces, prims),
0, 0,
ensightGeometryFile ensightGeometryFile
); );
@ -1117,7 +1117,7 @@ void Foam::ensightMesh::writeAllNSided
else if (&prims != NULL) else if (&prims != NULL)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(patchFaces, prims); toMaster<< ensMap(patchFaces, prims);
} }
} }
} }
@ -1181,7 +1181,7 @@ void Foam::ensightMesh::writeAllNSidedBinary
{ {
writeNSidedNPointsPerFaceBinary writeNSidedNPointsPerFaceBinary
( (
map(patchFaces, prims), ensMap(patchFaces, prims),
ensightGeometryFile ensightGeometryFile
); );
} }
@ -1205,7 +1205,7 @@ void Foam::ensightMesh::writeAllNSidedBinary
else if (&prims != NULL) else if (&prims != NULL)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(patchFaces, prims); toMaster<< ensMap(patchFaces, prims);
} }
// List of points id for each face // List of points id for each face
@ -1215,7 +1215,7 @@ void Foam::ensightMesh::writeAllNSidedBinary
{ {
writeNSidedPointsBinary writeNSidedPointsBinary
( (
map(patchFaces, prims), ensMap(patchFaces, prims),
0, 0,
ensightGeometryFile ensightGeometryFile
); );
@ -1241,7 +1241,7 @@ void Foam::ensightMesh::writeAllNSidedBinary
else if (&prims != NULL) else if (&prims != NULL)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(patchFaces, prims); toMaster<< ensMap(patchFaces, prims);
} }
} }
} }
@ -1269,7 +1269,7 @@ void Foam::ensightMesh::writeAllFacePrimsBinary
{ {
writeFacePrimsBinary writeFacePrimsBinary
( (
map(patchFaces, prims), ensMap(patchFaces, prims),
0, 0,
ensightGeometryFile ensightGeometryFile
); );
@ -1295,7 +1295,7 @@ void Foam::ensightMesh::writeAllFacePrimsBinary
else if (&prims != NULL) else if (&prims != NULL)
{ {
OPstream toMaster(Pstream::scheduled, Pstream::masterNo()); OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster<< map(patchFaces, prims); toMaster<< ensMap(patchFaces, prims);
} }
} }
} }
@ -1424,7 +1424,7 @@ void Foam::ensightMesh::writeAscii
( (
"hexa8", "hexa8",
meshCellSets_.nHexesWedges, meshCellSets_.nHexesWedges,
map(cellShapes, meshCellSets_.hexes, meshCellSets_.wedges), ensMap(cellShapes, meshCellSets_.hexes, meshCellSets_.wedges),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );
@ -1433,7 +1433,7 @@ void Foam::ensightMesh::writeAscii
( (
"penta6", "penta6",
meshCellSets_.nPrisms, meshCellSets_.nPrisms,
map(cellShapes, meshCellSets_.prisms), ensMap(cellShapes, meshCellSets_.prisms),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );
@ -1442,7 +1442,7 @@ void Foam::ensightMesh::writeAscii
( (
"pyramid5", "pyramid5",
meshCellSets_.nPyrs, meshCellSets_.nPyrs,
map(cellShapes, meshCellSets_.pyrs), ensMap(cellShapes, meshCellSets_.pyrs),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );
@ -1451,7 +1451,7 @@ void Foam::ensightMesh::writeAscii
( (
"tetra4", "tetra4",
meshCellSets_.nTets, meshCellSets_.nTets,
map(cellShapes, meshCellSets_.tets), ensMap(cellShapes, meshCellSets_.tets),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );
@ -1710,7 +1710,7 @@ void Foam::ensightMesh::writeBinary
( (
"hexa8", "hexa8",
meshCellSets_.nHexesWedges, meshCellSets_.nHexesWedges,
map(cellShapes, meshCellSets_.hexes, meshCellSets_.wedges), ensMap(cellShapes, meshCellSets_.hexes, meshCellSets_.wedges),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );
@ -1719,7 +1719,7 @@ void Foam::ensightMesh::writeBinary
( (
"penta6", "penta6",
meshCellSets_.nPrisms, meshCellSets_.nPrisms,
map(cellShapes, meshCellSets_.prisms), ensMap(cellShapes, meshCellSets_.prisms),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );
@ -1728,7 +1728,7 @@ void Foam::ensightMesh::writeBinary
( (
"pyramid5", "pyramid5",
meshCellSets_.nPyrs, meshCellSets_.nPyrs,
map(cellShapes, meshCellSets_.pyrs), ensMap(cellShapes, meshCellSets_.pyrs),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );
@ -1737,7 +1737,7 @@ void Foam::ensightMesh::writeBinary
( (
"tetra4", "tetra4",
meshCellSets_.nTets, meshCellSets_.nTets,
map(cellShapes, meshCellSets_.tets), ensMap(cellShapes, meshCellSets_.tets),
pointOffsets, pointOffsets,
ensightGeometryFile ensightGeometryFile
); );

6
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
View file

@ -115,13 +115,13 @@ private:
OFstream& ensightGeometryFile OFstream& ensightGeometryFile
) const; ) const;
cellShapeList map cellShapeList ensMap
( (
const cellShapeList& cellShapes, const cellShapeList& cellShapes,
const labelList& prims const labelList& prims
) const; ) const;
cellShapeList map cellShapeList ensMap
( (
const cellShapeList& cellShapes, const cellShapeList& cellShapes,
const labelList& hexes, const labelList& hexes,
@ -181,7 +181,7 @@ private:
OFstream& ensightGeometryFile OFstream& ensightGeometryFile
) const; ) const;
faceList map faceList ensMap
( (
const faceList& patchFaces, const faceList& patchFaces,
const labelList& prims const labelList& prims