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

BUG: use of unset autoPtr

Browse Source
This commit is contained in:
mattijs
2010-10-05 19:28:04 +01:00
parent 9ad20b0a3b
commit bb0e98f55b
2 changed files with 52 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
View File

@ -259,7 +259,7 @@ void writePatchField
word timeFile = prepend + itoa(timeIndex); word timeFile = prepend + itoa(timeIndex);
autoPtr<ensightStream> ensightFilePtr; ensightStream* ensightFilePtr = NULL;
if (Pstream::master()) if (Pstream::master())
{ {
if (timeIndex == 0) if (timeIndex == 0)
@ -279,29 +279,23 @@ void writePatchField
if (binary) if (binary)
{ {
ensightFilePtr.reset ensightFilePtr = new ensightBinaryStream
( (
new ensightBinaryStream postProcPath/ensightFileName,
( runTime
postProcPath/ensightFileName,
runTime
)
); );
} }
else else
{ {
ensightFilePtr.reset ensightFilePtr = new ensightAsciiStream
( (
new ensightAsciiStream postProcPath/ensightFileName,
( runTime
postProcPath/ensightFileName,
runTime
)
); );
} }
} }
ensightStream& ensightFile = ensightFilePtr(); ensightStream& ensightFile = *ensightFilePtr;
if (Pstream::master()) if (Pstream::master())
{ {
@ -334,6 +328,11 @@ void writePatchField
ensightFile ensightFile
); );
} }
if (Pstream::master())
{
delete ensightFilePtr;
}
} }
@ -374,7 +373,7 @@ void ensightField
const labelList& hexes = meshCellSets.hexes; const labelList& hexes = meshCellSets.hexes;
const labelList& polys = meshCellSets.polys; const labelList& polys = meshCellSets.polys;
autoPtr<ensightStream> ensightFilePtr; ensightStream* ensightFilePtr = NULL;
if (Pstream::master()) if (Pstream::master())
{ {
// set the filename of the ensight file // set the filename of the ensight file
@ -382,29 +381,23 @@ void ensightField
if (binary) if (binary)
{ {
ensightFilePtr.reset ensightFilePtr = new ensightBinaryStream
( (
new ensightBinaryStream postProcPath/ensightFileName,
( runTime
postProcPath/ensightFileName,
runTime
)
); );
} }
else else
{ {
ensightFilePtr.reset ensightFilePtr = new ensightAsciiStream
( (
new ensightAsciiStream postProcPath/ensightFileName,
( runTime
postProcPath/ensightFileName,
runTime
)
); );
} }
} }
ensightStream& ensightFile = ensightFilePtr(); ensightStream& ensightFile = *ensightFilePtr;
if (patchNames.empty()) if (patchNames.empty())
{ {
@ -595,6 +588,10 @@ void ensightField
} }
} }
} }
if (Pstream::master())
{
delete ensightFilePtr;
}
} }
@ -614,10 +611,7 @@ void ensightPointField
word timeFile = prepend + itoa(timeIndex); word timeFile = prepend + itoa(timeIndex);
//const fvMesh& mesh = eMesh.mesh(); ensightStream* ensightFilePtr = NULL;
//const Time& runTime = mesh.time();
autoPtr<ensightStream> ensightFilePtr;
if (Pstream::master()) if (Pstream::master())
{ {
// set the filename of the ensight file // set the filename of the ensight file
@ -625,29 +619,23 @@ void ensightPointField
if (binary) if (binary)
{ {
ensightFilePtr.reset ensightFilePtr = new ensightBinaryStream
( (
new ensightBinaryStream postProcPath/ensightFileName,
( eMesh.mesh().time()
postProcPath/ensightFileName,
eMesh.mesh().time()
)
); );
} }
else else
{ {
ensightFilePtr.reset ensightFilePtr = new ensightAsciiStream
( (
new ensightAsciiStream postProcPath/ensightFileName,
( eMesh.mesh().time()
postProcPath/ensightFileName,
eMesh.mesh().time()
)
); );
} }
} }
ensightStream& ensightFile = ensightFilePtr(); ensightStream& ensightFile = *ensightFilePtr;
if (eMesh.patchNames().empty()) if (eMesh.patchNames().empty())
{ {
@ -700,6 +688,11 @@ void ensightPointField
} }
} }
} }
if (Pstream::master())
{
delete ensightFilePtr;
}
} }

29
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
View File

@ -1012,35 +1012,29 @@ void Foam::ensightMesh::write
// set the filename of the ensight file // set the filename of the ensight file
fileName ensightGeometryFileName = timeFile + "mesh"; fileName ensightGeometryFileName = timeFile + "mesh";
autoPtr<ensightStream> ensightGeometryFilePtr; ensightStream* ensightGeometryFilePtr = NULL;
if (Pstream::master()) if (Pstream::master())
{ {
if (binary_) if (binary_)
{ {
ensightGeometryFilePtr.reset ensightGeometryFilePtr = new ensightBinaryStream
( (
new ensightBinaryStream postProcPath/ensightGeometryFileName,
( runTime
postProcPath/ensightGeometryFileName,
runTime
)
); );
ensightGeometryFilePtr().write("C binary"); ensightGeometryFilePtr->write("C binary");
} }
else else
{ {
ensightGeometryFilePtr.reset ensightGeometryFilePtr = new ensightAsciiStream
( (
new ensightAsciiStream postProcPath/ensightGeometryFileName,
( runTime
postProcPath/ensightGeometryFileName,
runTime
)
); );
} }
} }
ensightStream& ensightGeometryFile = ensightGeometryFilePtr(); ensightStream& ensightGeometryFile = *ensightGeometryFilePtr;
if (Pstream::master()) if (Pstream::master())
{ {
@ -1289,6 +1283,11 @@ void Foam::ensightMesh::write
); );
} }
} }
if (Pstream::master())
{
delete ensightGeometryFilePtr;
}
} }