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

STYLE: minor cleanup after merge

Browse Source
This commit is contained in:
Mark Olesen
2017-09-22 16:25:17 +02:00
parent b55ab4b0c3
commit 610854af03
44 changed files with 50 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/test/FixedList/Test-FixedList.C
View File

@ -34,8 +34,7 @@ See also
#include "argList.H" #include "argList.H"
#include "FixedList.H" #include "FixedList.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "IPstream.H" #include "IPstream.H"
#include "OPstream.H" #include "OPstream.H"

3
applications/test/primitivePatch/Test-PrimitivePatch.C
View File

@ -31,8 +31,7 @@ Description
#include "Time.H" #include "Time.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "primitivePatch.H" #include "primitivePatch.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
using namespace Foam; using namespace Foam;

3
applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
View File

@ -35,8 +35,7 @@ Description
#include "joints.H" #include "joints.H"
#include "rigidBodyRestraint.H" #include "rigidBodyRestraint.H"
#include "rigidBodyModelState.H" #include "rigidBodyModelState.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "constants.H" #include "constants.H"
using namespace Foam; using namespace Foam;

3
applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
View File

@ -35,8 +35,7 @@ Description
#include "joints.H" #include "joints.H"
#include "rigidBodyRestraint.H" #include "rigidBodyRestraint.H"
#include "rigidBodyModelState.H" #include "rigidBodyModelState.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
using namespace Foam; using namespace Foam;
using namespace RBD; using namespace RBD;

3
applications/test/rigidBodyDynamics/spring/spring.C
View File

@ -35,8 +35,7 @@ Description
#include "joints.H" #include "joints.H"
#include "rigidBodyRestraint.H" #include "rigidBodyRestraint.H"
#include "rigidBodyModelState.H" #include "rigidBodyModelState.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
using namespace Foam; using namespace Foam;
using namespace RBD; using namespace RBD;

3
applications/test/router/Test-processorRouter.C
View File

@ -28,8 +28,7 @@ Description
#include "argList.H" #include "argList.H"
#include "label.H" #include "label.H"
#include "labelList.H" #include "labelList.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "point.H" #include "point.H"
#include "Time.H" #include "Time.H"
#include "fvMesh.H" #include "fvMesh.H"

3
applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
View File

@ -38,9 +38,8 @@ Description
#include "Time.H" #include "Time.H"
#include "hexRef8.H" #include "hexRef8.H"
#include "cellSet.H" #include "cellSet.H"
#include "OFstream.H" #include "Fstream.H"
#include "meshTools.H" #include "meshTools.H"
#include "IFstream.H"
#include "polyTopoChange.H" #include "polyTopoChange.H"
#include "mapPolyMesh.H" #include "mapPolyMesh.H"
#include "volMesh.H" #include "volMesh.H"

3
applications/utilities/mesh/conversion/datToFoam/datToFoam.C
View File

@ -35,8 +35,7 @@ Description
#include "argList.H" #include "argList.H"
#include "Time.H" #include "Time.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "pointField.H" #include "pointField.H"
#include "unitConversion.H" #include "unitConversion.H"

3
applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
View File

@ -35,8 +35,7 @@ Description
#include "argList.H" #include "argList.H"
#include "Time.H" #include "Time.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "cellShape.H" #include "cellShape.H"
#include "cellModeller.H" #include "cellModeller.H"
#include "preservePatchTypes.H" #include "preservePatchTypes.H"

3
applications/utilities/mesh/manipulation/setSet/setSet.C
View File

@ -41,8 +41,7 @@ Description
#include "faceSet.H" #include "faceSet.H"
#include "pointSet.H" #include "pointSet.H"
#include "topoSetSource.H" #include "topoSetSource.H"
#include "OFstream.H" #include "Fstream.H"
#include "IFstream.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"
#include "foamVtkWriteCellSetFaces.H" #include "foamVtkWriteCellSetFaces.H"
#include "foamVtkWriteFaceSet.H" #include "foamVtkWriteFaceSet.H"

3
applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
View File

@ -114,8 +114,7 @@ Usage
#include "argList.H" #include "argList.H"
#include "profiling.H" #include "profiling.H"
#include "Time.H" #include "Time.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "includeEntry.H" #include "includeEntry.H"
using namespace Foam; using namespace Foam;

3
applications/utilities/surface/surfaceAdd/surfaceAdd.C
View File

@ -38,8 +38,7 @@ Description
#include "argList.H" #include "argList.H"
#include "fileName.H" #include "fileName.H"
#include "triSurface.H" #include "triSurface.H"
#include "OFstream.H" #include "Fstream.H"
#include "IFstream.H"
#include "triFace.H" #include "triFace.H"
#include "triFaceList.H" #include "triFaceList.H"

3
applications/utilities/surface/surfaceSubset/surfaceSubset.C
View File

@ -36,8 +36,7 @@ Description
#include "triSurface.H" #include "triSurface.H"
#include "triSurfaceSearch.H" #include "triSurfaceSearch.H"
#include "argList.H" #include "argList.H"
#include "OFstream.H" #include "Fstream.H"
#include "IFstream.H"
#include "Switch.H" #include "Switch.H"
#include "IOdictionary.H" #include "IOdictionary.H"
#include "boundBox.H" #include "boundBox.H"

3
applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
View File

@ -41,8 +41,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "OFstream.H" #include "Fstream.H"
#include "IFstream.H"
#include "boundBox.H" #include "boundBox.H"
#include "transformField.H" #include "transformField.H"
#include "Pair.H" #include "Pair.H"

5
src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
View File

@ -27,9 +27,8 @@ License
#include "OPstream.H" #include "OPstream.H"
#include "IPstream.H" #include "IPstream.H"
#include "PstreamBuffers.H" #include "PstreamBuffers.H"
#include "OFstream.H" #include "Fstream.H"
#include "IFstream.H" #include "StringStream.H"
#include "IStringStream.H"
#include "dictionary.H" #include "dictionary.H"
#include <sys/time.h> #include <sys/time.h>
#include "objectRegistry.H" #include "objectRegistry.H"

5
src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
View File

@ -53,10 +53,11 @@ Foam::OFstreamAllocator::OFstreamAllocator
InfoInFunction << "Cannot open null file " << endl; InfoInFunction << "Cannot open null file " << endl;
} }
} }
ofstream::openmode mode(ofstream::out);
std::ios_base::openmode mode(std::ios_base::out);
if (append) if (append)
{ {
mode |= ofstream::app; mode |= std::ios_base::app;
} }
if (compression == IOstream::COMPRESSED) if (compression == IOstream::COMPRESSED)

2
src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
View File

@ -35,7 +35,7 @@ SourceFiles
#ifndef masterOFstream_H #ifndef masterOFstream_H
#define masterOFstream_H #define masterOFstream_H
#include "OStringStream.H" #include "StringStream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H
View File

@ -34,7 +34,7 @@ SourceFiles
#ifndef dummyISstream_H #ifndef dummyISstream_H
#define dummyISstream_H #define dummyISstream_H
#include "IStringStream.H" #include "StringStream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
View File

@ -26,8 +26,7 @@ License
#include "dynamicCode.H" #include "dynamicCode.H"
#include "dynamicCodeContext.H" #include "dynamicCodeContext.H"
#include "stringOps.H" #include "stringOps.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "etcFiles.H" #include "etcFiles.H"
#include "dictionary.H" #include "dictionary.H"

2
src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H
View File

@ -35,7 +35,7 @@ SourceFiles
#ifndef threadedCollatedOFstream_H #ifndef threadedCollatedOFstream_H
#define threadedCollatedOFstream_H #define threadedCollatedOFstream_H
#include "OStringStream.H" #include "StringStream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
View File

@ -25,8 +25,7 @@ License
#include "uncollatedFileOperation.H" #include "uncollatedFileOperation.H"
#include "Time.H" #include "Time.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "masterUncollatedFileOperation.H" #include "masterUncollatedFileOperation.H"
#include "decomposedBlockData.H" #include "decomposedBlockData.H"

2
src/OpenFOAM/primitives/predicates/predicates.H
View File

@ -72,7 +72,7 @@ public:
return true; return true;
} }
//- Binary predicate returning false //- Binary predicate returning true
template<class T1, class T2> template<class T1, class T2>
inline bool operator()(const T1&, const T2&) const inline bool operator()(const T1&, const T2&) const
{ {

3
src/conversion/ccm/reader/ccmReader.C
View File

@ -587,7 +587,8 @@ void Foam::ccm::reader::writeMesh
( (
fmt, fmt,
IOstream::currentVersion, IOstream::currentVersion,
IOstream::UNCOMPRESSED IOstream::UNCOMPRESSED,
true
); );
writeAux(mesh); writeAux(mesh);
} }

3
src/conversion/ccm/reader/ccmReaderAux.C
View File

@ -174,7 +174,8 @@ void Foam::ccm::reader::writeMeshLabelList
( (
fmt, fmt,
IOstream::currentVersion, IOstream::currentVersion,
IOstream::UNCOMPRESSED IOstream::UNCOMPRESSED,
true
); );
} }

3
src/conversion/ccm/reader/ccmReaderMesh.C
View File

@ -28,8 +28,7 @@ License
#include "emptyPolyPatch.H" #include "emptyPolyPatch.H"
#include "symmetryPolyPatch.H" #include "symmetryPolyPatch.H"
#include "wallPolyPatch.H" #include "wallPolyPatch.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "IOdictionary.H" #include "IOdictionary.H"
#include "ccmBoundaryInfo.H" #include "ccmBoundaryInfo.H"

3
src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
View File

@ -29,8 +29,7 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "momentOfInertia.H" #include "momentOfInertia.H"
#include "cartesianCS.H" #include "cartesianCS.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "globalIndex.H" #include "globalIndex.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

3
src/functionObjects/field/externalCoupled/externalCoupled.C
View File

@ -26,8 +26,7 @@ License
#include "externalCoupled.H" #include "externalCoupled.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "volFields.H" #include "volFields.H"
#include "globalIndex.H" #include "globalIndex.H"
#include "fvMesh.H" #include "fvMesh.H"

3
src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
View File

@ -26,8 +26,7 @@ License
#include "externalCoupled.H" #include "externalCoupled.H"
//#include "fvMesh.H" //#include "fvMesh.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "volFields.H" #include "volFields.H"
#include "externalCoupledMixedFvPatchFields.H" #include "externalCoupledMixedFvPatchFields.H"
#include "mixedFvPatchFields.H" #include "mixedFvPatchFields.H"

3
src/lumpedPointMotion/lumpedPointMovement.C
View File

@ -27,8 +27,7 @@ License
#include "lumpedPointIOMovement.H" #include "lumpedPointIOMovement.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"
#include "linearInterpolationWeights.H" #include "linearInterpolationWeights.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "volFields.H" #include "volFields.H"
#include "surfaceFields.H" #include "surfaceFields.H"
#include "PtrMap.H" #include "PtrMap.H"

3
src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C
View File

@ -26,8 +26,7 @@ License
#include "edgeMeshFormatsCore.H" #include "edgeMeshFormatsCore.H"
#include "Time.H" #include "Time.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "edgeMesh.H" #include "edgeMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

5
src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
View File

@ -25,10 +25,9 @@ License
#include "OBJedgeFormat.H" #include "OBJedgeFormat.H"
#include "clock.H" #include "clock.H"
#include "IFstream.H" #include "Fstream.H"
#include "StringStream.H"
#include "Ostream.H" #include "Ostream.H"
#include "OFstream.H" #include "StringStream.H"
#include "ListOps.H" #include "ListOps.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

3
src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
View File

@ -38,9 +38,8 @@ SourceFiles
#define OBJedgeFormat_H #define OBJedgeFormat_H
#include "edgeMesh.H" #include "edgeMesh.H"
#include "IFstream.H" #include "Fstream.H"
#include "Ostream.H" #include "Ostream.H"
#include "OFstream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
View File

@ -44,9 +44,8 @@ SourceFiles
#include "edgeMesh.H" #include "edgeMesh.H"
#include "STARCDCore.H" #include "STARCDCore.H"
#include "IFstream.H" #include "Fstream.H"
#include "Ostream.H" #include "Ostream.H"
#include "OFstream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C
View File

@ -24,9 +24,8 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "VTKedgeFormat.H" #include "VTKedgeFormat.H"
#include "OFstream.H" #include "Fstream.H"
#include "clock.H" #include "clock.H"
#include "IFstream.H"
#include "vtkUnstructuredReader.H" #include "vtkUnstructuredReader.H"
#include "Time.H" #include "Time.H"

3
src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
View File

@ -30,8 +30,7 @@ License
#include "treeDataPoint.H" #include "treeDataPoint.H"
#include "meshTools.H" #include "meshTools.H"
#include "linePointRef.H" #include "linePointRef.H"
#include "OFstream.H" #include "Fstream.H"
#include "IFstream.H"
#include "unitConversion.H" #include "unitConversion.H"
#include "EdgeMap.H" #include "EdgeMap.H"

3
src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
View File

@ -24,8 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "IOmanip.H" #include "IOmanip.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "ensightPartFaces.H" #include "ensightPartFaces.H"
#include "ensightSerialOutput.H" #include "ensightSerialOutput.H"

3
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
View File

@ -26,8 +26,7 @@ License
#include "MeshedSurface.H" #include "MeshedSurface.H"
#include "UnsortedMeshedSurface.H" #include "UnsortedMeshedSurface.H"
#include "MeshedSurfaceProxy.H" #include "MeshedSurfaceProxy.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "Time.H" #include "Time.H"
#include "ListOps.H" #include "ListOps.H"
#include "polyBoundaryMesh.H" #include "polyBoundaryMesh.H"

3
src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
View File

@ -35,9 +35,8 @@ SourceFiles
#ifndef AC3DsurfaceFormatCore_H #ifndef AC3DsurfaceFormatCore_H
#define AC3DsurfaceFormatCore_H #define AC3DsurfaceFormatCore_H
#include "IFstream.H" #include "Fstream.H"
#include "Ostream.H" #include "Ostream.H"
#include "OFstream.H"
#include "MeshedSurface.H" #include "MeshedSurface.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
View File

@ -26,9 +26,8 @@ License
#include "GTSsurfaceFormat.H" #include "GTSsurfaceFormat.H"
#include "surfaceFormatsCore.H" #include "surfaceFormatsCore.H"
#include "clock.H" #include "clock.H"
#include "IFstream.H" #include "Fstream.H"
#include "StringStream.H" #include "StringStream.H"
#include "OFstream.H"
#include "faceTraits.H" #include "faceTraits.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

3
src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
View File

@ -25,9 +25,8 @@ License
#include "OBJsurfaceFormat.H" #include "OBJsurfaceFormat.H"
#include "clock.H" #include "clock.H"
#include "IFstream.H" #include "Fstream.H"
#include "StringStream.H" #include "StringStream.H"
#include "OFstream.H"
#include "ListOps.H" #include "ListOps.H"
#include "faceTraits.H" #include "faceTraits.H"

3
src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
View File

@ -25,10 +25,9 @@ License
#include "OFFsurfaceFormat.H" #include "OFFsurfaceFormat.H"
#include "clock.H" #include "clock.H"
#include "IFstream.H" #include "Fstream.H"
#include "StringStream.H" #include "StringStream.H"
#include "faceTraits.H" #include "faceTraits.H"
#include "OFstream.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

3
src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
View File

@ -35,9 +35,8 @@ SourceFiles
#ifndef STARCDsurfaceFormatCore_H #ifndef STARCDsurfaceFormatCore_H
#define STARCDsurfaceFormatCore_H #define STARCDsurfaceFormatCore_H
#include "IFstream.H" #include "Fstream.H"
#include "Ostream.H" #include "Ostream.H"
#include "OFstream.H"
#include "MeshedSurface.H" #include "MeshedSurface.H"
#include "STARCDCore.H" #include "STARCDCore.H"

3
src/surfMesh/surfaceFormats/surfaceFormatsCore.C
View File

@ -27,8 +27,7 @@ License
#include "Time.H" #include "Time.H"
#include "ListOps.H" #include "ListOps.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "surfMesh.H" #include "surfMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

3
src/surfMesh/triSurface/triSurface.C
View File

@ -25,8 +25,7 @@ License
#include "triSurface.H" #include "triSurface.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"
#include "IFstream.H" #include "Fstream.H"
#include "OFstream.H"
#include "Time.H" #include "Time.H"
#include "boundBox.H" #include "boundBox.H"
#include "SortableList.H" #include "SortableList.H"