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: use autoPtr::New and tmp::New for simple return types

Browse Source
This commit is contained in:
Mark Olesen
2018-02-26 14:00:30 +01:00
parent 52b36f84b5
commit 57291e8692
196 changed files with 555 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
View File

@ -100,7 +100,7 @@ public:
autoPtr<phaseModel> operator()(Istream& is) const
{
return autoPtr<phaseModel>(new phaseModel(is, p_, T_));
return autoPtr<phaseModel>::New(is, p_, T_);
}
};

2
applications/test/PtrList/Test-PtrList.C
View File

@ -60,7 +60,7 @@ public:
autoPtr<Scalar> clone() const
{
return autoPtr<Scalar>(new Scalar(data_));
return autoPtr<Scalar>::New(data_);
}
friend Ostream& operator<<(Ostream& os, const Scalar& val)

22
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
View File

@ -93,14 +93,11 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
indices.transfer(dynIndices);
List<Map<label>> compactMap;
return autoPtr<mapDistribute>
return autoPtr<mapDistribute>::New
(
new mapDistribute
(
globalIndexing,
indices,
compactMap
)
globalIndexing,
indices,
compactMap
);
}
@ -157,14 +154,11 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
}
List<Map<label>> compactMap;
return autoPtr<mapDistribute>
return autoPtr<mapDistribute>::New
(
new mapDistribute
(
globalIndexing,
pointPoints,
compactMap
)
globalIndexing,
pointPoints,
compactMap
);
}

61
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -518,39 +518,36 @@ autoPtr<mapPolyMesh> reorderMesh
}
return autoPtr<mapPolyMesh>
return autoPtr<mapPolyMesh>::New
(
new mapPolyMesh
(
mesh, // const polyMesh& mesh,
mesh.nPoints(), // nOldPoints,
mesh.nFaces(), // nOldFaces,
mesh.nCells(), // nOldCells,
identity(mesh.nPoints()), // pointMap,
List<objectMap>(0), // pointsFromPoints,
faceOrder, // faceMap,
List<objectMap>(0), // facesFromPoints,
List<objectMap>(0), // facesFromEdges,
List<objectMap>(0), // facesFromFaces,
cellOrder, // cellMap,
List<objectMap>(0), // cellsFromPoints,
List<objectMap>(0), // cellsFromEdges,
List<objectMap>(0), // cellsFromFaces,
List<objectMap>(0), // cellsFromCells,
identity(mesh.nPoints()), // reversePointMap,
reverseFaceOrder, // reverseFaceMap,
reverseCellOrder, // reverseCellMap,
flipFaceFlux, // flipFaceFlux,
patchPointMap, // patchPointMap,
labelListList(0), // pointZoneMap,
labelListList(0), // faceZonePointMap,
labelListList(0), // faceZoneFaceMap,
labelListList(0), // cellZoneMap,
pointField(0), // preMotionPoints,
patchStarts, // oldPatchStarts,
oldPatchNMeshPoints, // oldPatchNMeshPoints
autoPtr<scalarField>() // oldCellVolumes
)
mesh, // const polyMesh& mesh,
mesh.nPoints(), // nOldPoints,
mesh.nFaces(), // nOldFaces,
mesh.nCells(), // nOldCells,
identity(mesh.nPoints()), // pointMap,
List<objectMap>(), // pointsFromPoints,
faceOrder, // faceMap,
List<objectMap>(), // facesFromPoints,
List<objectMap>(), // facesFromEdges,
List<objectMap>(), // facesFromFaces,
cellOrder, // cellMap,
List<objectMap>(), // cellsFromPoints,
List<objectMap>(), // cellsFromEdges,
List<objectMap>(), // cellsFromFaces,
List<objectMap>(), // cellsFromCells,
identity(mesh.nPoints()), // reversePointMap,
reverseFaceOrder, // reverseFaceMap,
reverseCellOrder, // reverseCellMap,
flipFaceFlux, // flipFaceFlux,
patchPointMap, // patchPointMap,
labelListList(), // pointZoneMap,
labelListList(), // faceZonePointMap,
labelListList(), // faceZoneFaceMap,
labelListList(), // cellZoneMap,
pointField(), // preMotionPoints,
patchStarts, // oldPatchStarts,
oldPatchNMeshPoints, // oldPatchNMeshPoints
autoPtr<scalarField>() // oldCellVolumes
);
}

36
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -98,15 +98,12 @@ autoPtr<faceCoupleInfo> determineCoupledFaces
{
if (fullMatch || masterMesh.nCells() == 0)
{
return autoPtr<faceCoupleInfo>
return autoPtr<faceCoupleInfo>::New
(
new faceCoupleInfo
(
masterMesh,
meshToAdd,
mergeDist, // Absolute merging distance
true // Matching faces identical
)
masterMesh,
meshToAdd,
mergeDist, // Absolute merging distance
true // Matching faces identical
);
}
else
@ -215,20 +212,17 @@ autoPtr<faceCoupleInfo> determineCoupledFaces
}
addFaces.shrink();
return autoPtr<faceCoupleInfo>
return autoPtr<faceCoupleInfo>::New
(
new faceCoupleInfo
(
masterMesh,
masterFaces,
meshToAdd,
addFaces,
mergeDist, // Absolute merging distance
true, // Matching faces identical?
false, // If perfect match are faces already ordered
// (e.g. processor patches)
false // are faces each on separate patch?
)
masterMesh,
masterFaces,
meshToAdd,
addFaces,
mergeDist, // Absolute merging distance
true, // Matching faces identical?
false, // If perfect match are faces already ordered
// (e.g. processor patches)
false // are faces each on separate patch?
);
}
}

2
applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
View File

@ -49,7 +49,7 @@ Foam::tmp<Foam::Field<Type>> Foam::readParticleField
if (obj != nullptr)
{
IOField<Type> newField(*obj);
return tmp<Field<Type>>(new Field<Type>(newField.xfer()));
return tmp<Field<Type>>::New(newField.xfer());
}
FatalErrorInFunction

25
applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
View File

@ -55,22 +55,19 @@ autoPtr<GeoFieldType> loadField
Info<< "Reading " << GeoFieldType::typeName
<< ' ' << io->name() << endl;
return autoPtr<GeoFieldType>
return autoPtr<GeoFieldType>::New
(
new GeoFieldType
IOobject
(
IOobject
(
io->name(),
io->instance(),
io->local(),
io->db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE,
io->registerObject()
),
mesh
)
io->name(),
io->instance(),
io->local(),
io->db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE,
io->registerObject()
),
mesh
);
}

4
applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
View File

@ -244,7 +244,7 @@ tmp<volScalarField> calcNut
// Correct nut
turbulence->validate();
return tmp<volScalarField>(new volScalarField(turbulence->nut()));
return tmp<volScalarField>::New(turbulence->nut());
}
else
{
@ -264,7 +264,7 @@ tmp<volScalarField> calcNut
// Correct nut
turbulence->validate();
return tmp<volScalarField>(new volScalarField(turbulence->nut()));
return tmp<volScalarField>::New(turbulence->nut());
}
}

8
applications/utilities/preProcessing/setFields/setFields.C
View File

@ -141,7 +141,7 @@ public:
autoPtr<setCellField> clone() const
{
return autoPtr<setCellField>(new setCellField());
return autoPtr<setCellField>::New();
}
class iNew
@ -182,7 +182,7 @@ public:
<< endl;
}
return autoPtr<setCellField>(new setCellField());
return autoPtr<setCellField>::New();
}
};
};
@ -332,7 +332,7 @@ public:
autoPtr<setFaceField> clone() const
{
return autoPtr<setFaceField>(new setFaceField());
return autoPtr<setFaceField>::New();
}
class iNew
@ -373,7 +373,7 @@ public:
<< endl;
}
return autoPtr<setFaceField>(new setFaceField());
return autoPtr<setFaceField>::New();
}
};
};

41
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -1480,33 +1480,30 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
//calcFeaturePoints(inter.cutPoints(), inter.cutEdges());
return autoPtr<extendedFeatureEdgeMesh>
return autoPtr<extendedFeatureEdgeMesh>::New
(
new extendedFeatureEdgeMesh
(
io,
inter.cutPoints(),
inter.cutEdges(),
io,
inter.cutPoints(),
inter.cutEdges(),
0, // concaveStart,
0, // mixedStart,
0, // nonFeatureStart,
0, // concaveStart,
0, // mixedStart,
0, // nonFeatureStart,
internalStart, // internalStart,
nIntOrExt, // flatStart,
nIntOrExt + nFlat, // openStart,
nIntOrExt + nFlat + nOpen, // multipleStart,
internalStart, // internalStart,
nIntOrExt, // flatStart,
nIntOrExt + nFlat, // openStart,
nIntOrExt + nFlat + nOpen, // multipleStart,
normalsTmp,
normalVolumeTypesTmp,
edgeDirections,
normalDirectionsTmp,
edgeNormalsTmp,
normalsTmp,
normalVolumeTypesTmp,
edgeDirections,
normalDirectionsTmp,
edgeNormalsTmp,
labelListList(0), // featurePointNormals,
labelListList(0), // featurePointEdges,
labelList(0) // regionEdges
)
labelListList(), // featurePointNormals,
labelListList(), // featurePointEdges,
labelList() // regionEdges
);
}

15
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
View File

@ -86,16 +86,13 @@ Foam::surfaceFeaturesExtraction::extractFromFile::features
<< "Selecting edges based purely on geometric tests: "
<< geometricTestOnly().c_str() << endl;
return autoPtr<surfaceFeatures>
return autoPtr<surfaceFeatures>::New
(
new surfaceFeatures
(
surf,
eMesh.points(),
eMesh.edges(),
1e-6, // mergeTol
geometricTestOnly()
)
surf,
eMesh.points(),
eMesh.edges(),
1e-6, // mergeTol
geometricTestOnly()
);
}

2
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
View File

@ -73,7 +73,7 @@ Foam::surfaceFeaturesExtraction::extractFromNone::features
const triSurface& surf
) const
{
return autoPtr<surfaceFeatures>(new surfaceFeatures(surf));
return autoPtr<surfaceFeatures>::New(surf);
}

15
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
View File

@ -80,16 +80,13 @@ Foam::surfaceFeaturesExtraction::extractFromSurface::features
<< "Selecting edges based purely on geometric tests: "
<< geometricTestOnly().c_str() << endl;
return autoPtr<surfaceFeatures>
return autoPtr<surfaceFeatures>::New
(
new surfaceFeatures
(
surf,
includedAngle(),
0, // minLen
0, // minElems
geometricTestOnly()
)
surf,
includedAngle(),
0, // minLen
0, // minElems
geometricTestOnly()
);
}

5
src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
View File

@ -418,10 +418,7 @@ public:
//- Clone
autoPtr<dynamicIndexedOctree<Type>> clone() const
{
return autoPtr<dynamicIndexedOctree<Type>>
(
new dynamicIndexedOctree<Type>(*this)
);
return autoPtr<dynamicIndexedOctree<Type>>::New(*this);
}

5
src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
View File

@ -432,10 +432,7 @@ public:
//- Clone
autoPtr<indexedOctree<Type>> clone() const
{
return autoPtr<indexedOctree<Type>>
(
new indexedOctree<Type>(*this)
);
return autoPtr<indexedOctree<Type>>::New(*this);
}
// Member Functions

5
src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
View File

@ -101,10 +101,7 @@ template<class T, class Container>
inline Foam::autoPtr<Foam::CompactListList<T, Container>>
Foam::CompactListList<T, Container>::clone() const
{
return autoPtr<CompactListList<T, Container>>
(
new CompactListList<T, Container>(*this)
);
return autoPtr<CompactListList<T, Container>>::New(*this);
}

2
src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
View File

@ -135,7 +135,7 @@ template<class T, unsigned Size>
inline Foam::autoPtr<Foam::FixedList<T, Size>>
Foam::FixedList<T, Size>::clone() const
{
return autoPtr<FixedList<T, Size>>(new FixedList<T, Size>(*this));
return autoPtr<FixedList<T, Size>>::New(*this);
}

2
src/OpenFOAM/containers/Lists/List/ListI.H
View File

@ -95,7 +95,7 @@ inline constexpr Foam::List<T>::List() noexcept
template<class T>
inline Foam::autoPtr<Foam::List<T>> Foam::List<T>::clone() const
{
return autoPtr<List<T>>(new List<T>(*this));
return autoPtr<List<T>>::New(*this);
}

2
src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
View File

@ -125,7 +125,7 @@ inline Foam::PackedBoolList::PackedBoolList
inline Foam::autoPtr<Foam::PackedBoolList>
Foam::PackedBoolList::clone() const
{
return autoPtr<PackedBoolList>(new PackedBoolList(*this));
return autoPtr<PackedBoolList>::New(*this);
}

2
src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
View File

@ -267,7 +267,7 @@ template<unsigned nBits>
inline Foam::autoPtr<Foam::PackedList<nBits>>
Foam::PackedList<nBits>::clone() const
{
return autoPtr<PackedList<nBits>>(new PackedList<nBits>(*this));
return autoPtr<PackedList<nBits>>::New(*this);
}

4
src/OpenFOAM/db/IOobject/IOobject.H
View File

@ -279,13 +279,13 @@ public:
//- Clone
autoPtr<IOobject> clone() const
{
return autoPtr<IOobject>(new IOobject(*this));
return autoPtr<IOobject>::New(*this);
}
//- Clone resetting registry
autoPtr<IOobject> clone(const objectRegistry& registry) const
{
return autoPtr<IOobject>(new IOobject(*this, registry));
return autoPtr<IOobject>::New(*this, registry);
}

2
src/OpenFOAM/db/dictionary/dictionary.C
View File

@ -150,7 +150,7 @@ Foam::dictionary::dictionary
Foam::autoPtr<Foam::dictionary> Foam::dictionary::clone() const
{
return autoPtr<dictionary>(new dictionary(*this));
return autoPtr<dictionary>::New(*this);
}

2
src/OpenFOAM/db/dictionary/dictionaryIO.C
View File

@ -71,7 +71,7 @@ Foam::dictionary::dictionary(Istream& is, bool keepHeader)
Foam::autoPtr<Foam::dictionary> Foam::dictionary::New(Istream& is)
{
return autoPtr<dictionary>(new dictionary(is));
return autoPtr<dictionary>::New(is);
}

2
src/OpenFOAM/dimensionSet/dimensionSet.H
View File

@ -250,7 +250,7 @@ public:
//- Construct and return a clone
autoPtr<dimensionSet> clone() const
{
return autoPtr<dimensionSet>(new dimensionSet(*this));
return autoPtr<dimensionSet>::New(*this);
}
//- Construct from Istream

2
src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
View File

@ -177,7 +177,7 @@ FieldField<Field, Type>::FieldField(Istream& is)
template<template<class> class Field, class Type>
tmp<FieldField<Field, Type>> FieldField<Field, Type>::clone() const
{
return tmp<FieldField<Field, Type>>(new FieldField<Field, Type>(*this));
return tmp<FieldField<Field, Type>>::New(*this);
}

2
src/OpenFOAM/fields/Fields/Field/Field.C
View File

@ -348,7 +348,7 @@ Foam::Field<Type>::Field
template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::clone() const
{
return tmp<Field<Type>>(new Field<Type>(*this));
return tmp<Field<Type>>::New(*this);
}

2
src/OpenFOAM/fields/Fields/Field/Field.H
View File

@ -241,7 +241,7 @@ public:
template<class Type2>
static tmp<Field<Type>> NewCalculatedType(const Field<Type2>& f)
{
return tmp<Field<Type>>(new Field<Type>(f.size()));
return tmp<Field<Type>>::New(f.size());
}

2
src/OpenFOAM/fields/Fields/Field/FieldMapper.H
View File

@ -118,7 +118,7 @@ public:
template<class Type>
tmp<Field<Type>> operator()(const Field<Type>& f) const
{
return tmp<Field<Type>>(new Field<Type>(f, *this));
return tmp<Field<Type>>::New(f, *this);
}
};

2
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
View File

@ -149,7 +149,7 @@ Foam::pointPatchField<Type>::patchInternalField
<< abort(FatalError);
}
return tmp<Field<Type1>>(new Field<Type1>(iF, meshPoints));
return tmp<Field<Type1>>::New(iF, meshPoints);
}

2
src/OpenFOAM/graph/curve/curve.H
View File

@ -145,7 +145,7 @@ public:
autoPtr<curve> clone() const
{
return autoPtr<curve>(new curve(*this));
return autoPtr<curve>::New(*this);
}

2
src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
View File

@ -98,7 +98,7 @@ public:
static autoPtr<procLduInterface> New(Istream& is)
{
return autoPtr<procLduInterface>(new procLduInterface(is));
return autoPtr<procLduInterface>::New(is);
}

21
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
View File

@ -89,20 +89,15 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
)
);
}
else
{
FatalIOErrorInFunction
(
preconditionerDict
) << "cannot preconditione incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
(
nullptr
);
}
FatalIOErrorInFunction
(
preconditionerDict
) << "cannot preconditione incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>();
}

15
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
View File

@ -84,17 +84,12 @@ Foam::LduMatrix<Type, DType, LUType>::smoother::New
)
);
}
else
{
FatalIOErrorInFunction(smootherDict)
<< "cannot solve incomplete matrix, no off-diagonal coefficients"
<< exit(FatalIOError);
return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
(
nullptr
);
}
FatalIOErrorInFunction(smootherDict)
<< "cannot solve incomplete matrix, no off-diagonal coefficients"
<< exit(FatalIOError);
return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>();
}

17
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
View File

@ -99,18 +99,13 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
)
);
}
else
{
FatalIOErrorInFunction(solverDict)
<< "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>
(
nullptr
);
}
FatalIOErrorInFunction(solverDict)
<< "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>();
}

2
src/OpenFOAM/matrices/Matrix/MatrixI.H
View File

@ -40,7 +40,7 @@ template<class Form, class Type>
inline Foam::autoPtr<Foam::Matrix<Form, Type>> Foam::Matrix<Form, Type>::
clone() const
{
return autoPtr<Matrix<Form, Type>>(new Matrix<Form, Type>(*this));
return autoPtr<Matrix<Form, Type>>::New(*this);
}

5
src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
View File

@ -110,10 +110,7 @@ template<class Type>
inline Foam::autoPtr<Foam::RectangularMatrix<Type>>
Foam::RectangularMatrix<Type>::clone() const
{
return autoPtr<RectangularMatrix<Type>>
(
new RectangularMatrix<Type>(*this)
);
return autoPtr<RectangularMatrix<Type>>::New(*this);
}

2
src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
View File

@ -148,7 +148,7 @@ template<class Type>
inline Foam::autoPtr<Foam::SquareMatrix<Type>>
Foam::SquareMatrix<Type>::clone() const
{
return autoPtr<SquareMatrix<Type>>(new SquareMatrix<Type>(*this));
return autoPtr<SquareMatrix<Type>>::New(*this);
}

5
src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
View File

@ -88,10 +88,7 @@ template<class Type>
inline Foam::autoPtr<Foam::SymmetricSquareMatrix<Type>>
Foam::SymmetricSquareMatrix<Type>::clone() const
{
return autoPtr<SymmetricSquareMatrix<Type>>
(
new SymmetricSquareMatrix<Type>(*this)
);
return autoPtr<SymmetricSquareMatrix<Type>>::New(*this);
}

18
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
View File

@ -130,17 +130,15 @@ Foam::lduMatrix::preconditioner::New
)
);
}
else
{
FatalIOErrorInFunction
(
controls
) << "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<lduMatrix::preconditioner>();
}
FatalIOErrorInFunction
(
controls
) << "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<lduMatrix::preconditioner>();
}

14
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
View File

@ -136,15 +136,13 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
)
);
}
else
{
FatalIOErrorInFunction(solverControls)
<< "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<lduMatrix::smoother>();
}
FatalIOErrorInFunction(solverControls)
<< "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<lduMatrix::smoother>();
}

14
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
View File

@ -116,15 +116,13 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
)
);
}
else
{
FatalIOErrorInFunction(solverControls)
<< "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<lduMatrix::solver>();
}
FatalIOErrorInFunction(solverControls)
<< "cannot solve incomplete matrix, "
"no diagonal or off-diagonal coefficient"
<< exit(FatalIOError);
return autoPtr<lduMatrix::solver>();
}

4
src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
View File

@ -157,13 +157,13 @@ public:
//- Return a new cellModel on free-store created from Istream
static autoPtr<cellModel> New(Istream& is)
{
return autoPtr<cellModel>(new cellModel(is));
return autoPtr<cellModel>::New(is);
}
//- Return clone
autoPtr<cellModel> clone() const
{
return autoPtr<cellModel>(new cellModel(*this));
return autoPtr<cellModel>::New(*this);
}

2
src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
View File

@ -77,7 +77,7 @@ inline Foam::cellShape::cellShape(Istream& is)
inline Foam::autoPtr<Foam::cellShape> Foam::cellShape::clone() const
{
return autoPtr<cellShape>(new cellShape(*this));
return autoPtr<cellShape>::New(*this);
}

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

@ -498,7 +498,7 @@ Foam::mapDistribute::mapDistribute(Istream& is)
Foam::autoPtr<Foam::mapDistribute> Foam::mapDistribute::clone() const
{
return autoPtr<mapDistribute>(new mapDistribute(*this));
return autoPtr<mapDistribute>::New(*this);
}

2
src/OpenFOAM/meshes/polyMesh/polyMesh.C
View File

@ -149,7 +149,7 @@ Foam::autoPtr<Foam::labelIOList> Foam::polyMesh::readTetBasePtIs() const
if (io.typeHeaderOk<labelIOList>(true))
{
return autoPtr<labelIOList>(new labelIOList(io));
return autoPtr<labelIOList>::New(io);
}
return autoPtr<labelIOList>();

13
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
View File

@ -231,7 +231,7 @@ public:
//- Construct and return a clone, resetting the boundary mesh
virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
{
return autoPtr<polyPatch>(new polyPatch(*this, bm));
return autoPtr<polyPatch>::New(*this, bm);
}
//- Construct and return a clone, resetting the face list
@ -244,10 +244,7 @@ public:
const label newStart
) const
{
return autoPtr<polyPatch>
(
new polyPatch(*this, bm, index, newSize, newStart)
);
return autoPtr<polyPatch>::New(*this, bm, index, newSize, newStart);
}
//- Construct and return a clone, resetting the face list
@ -260,10 +257,8 @@ public:
const label newStart
) const
{
return autoPtr<polyPatch>
(
new polyPatch(*this, bm, index, mapAddressing, newStart)
);
return autoPtr<polyPatch>::New
(*this, bm, index, mapAddressing, newStart);
}

10
src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
View File

@ -182,10 +182,7 @@ public:
//- Construct and return a clone, resetting the zone mesh
virtual autoPtr<cellZone> clone(const cellZoneMesh& zm) const
{
return autoPtr<cellZone>
(
new cellZone(*this, *this, index(), zm)
);
return autoPtr<cellZone>::New(*this, *this, index(), zm);
}
//- Construct and return a clone,
@ -197,10 +194,7 @@ public:
const cellZoneMesh& zm
) const
{
return autoPtr<cellZone>
(
new cellZone(*this, addr, index, zm)
);
return autoPtr<cellZone>::New(*this, addr, index, zm);
}

10
src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
View File

@ -228,10 +228,7 @@ public:
//- Construct and return a clone, resetting the zone mesh
virtual autoPtr<faceZone> clone(const faceZoneMesh& zm) const
{
return autoPtr<faceZone>
(
new faceZone(*this, *this, flipMap(), index(), zm)
);
return autoPtr<faceZone>::New(*this, *this, flipMap(), index(), zm);
}
//- Construct and return a clone,
@ -244,10 +241,7 @@ public:
const faceZoneMesh& zm
) const
{
return autoPtr<faceZone>
(
new faceZone(*this, addr, fm, index, zm)
);
return autoPtr<faceZone>::New(*this, addr, fm, index, zm);
}

10
src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
View File

@ -183,10 +183,7 @@ public:
//- Construct and return a clone, resetting the zone mesh
virtual autoPtr<pointZone> clone(const pointZoneMesh& zm) const
{
return autoPtr<pointZone>
(
new pointZone(*this, *this, index(), zm)
);
return autoPtr<pointZone>::New(*this, *this, index(), zm);
}
//- Construct and return a clone, resetting the point list
@ -198,10 +195,7 @@ public:
const labelUList& addr
) const
{
return autoPtr<pointZone>
(
new pointZone(*this, addr, index, zm)
);
return autoPtr<pointZone>::New(*this, addr, index, zm);
}

2
src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
View File

@ -90,7 +90,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::Constant<Type>::value
const scalarField& x
) const
{
return tmp<Field<Type>>(new Field<Type>(x.size(), value_));
return tmp<Field<Type>>::New(x.size(), value_);
}

2
src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
View File

@ -60,7 +60,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1Types::OneConstant<Type>::value
const scalarField& x
) const
{
return tmp<Field<Type>>(new Field<Type>(x.size(), pTraits<Type>::one));
return tmp<Field<Type>>::New(x.size(), pTraits<Type>::one);
}

2
src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
View File

@ -75,7 +75,7 @@ Foam::Function1Types::Constant<Foam::label>::integrate
) const
{
NotImplemented;
return tmp<Field<label>>(new Field<label>(x1.size()));
return tmp<Field<label>>::New(x1.size());
}

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
View File

@ -38,7 +38,7 @@ namespace Foam
tmp<scalarField> nutLowReWallFunctionFvPatchScalarField::calcNut() const
{
return tmp<scalarField>(new scalarField(patch().size(), 0.0));
return tmp<scalarField>::New(patch().size(), 0.0);
}

4
src/conversion/ccm/reader/ccmReaderSolution.C
View File

@ -377,7 +377,7 @@ Foam::ccm::reader::readField
|| !fieldTable_.found(fieldName)
)
{
return tmp<scalarField>(new Field<scalar>());
return tmp<scalarField>::New();
}
CCMIODataLocation requestedLocation = kCCMIOCell;
@ -395,7 +395,7 @@ Foam::ccm::reader::readField
// we can skip empty fields immediately
if (!maxId)
{
return tmp<scalarField>(new Field<scalar>());
return tmp<scalarField>::New();
}
char shortName[kCCMIOProstarShortNameLength+1];

2
src/dynamicMesh/boundaryPatch/boundaryPatch.C
View File

@ -75,7 +75,7 @@ Foam::boundaryPatch::boundaryPatch(const boundaryPatch& p, const label index)
Foam::autoPtr<Foam::boundaryPatch> Foam::boundaryPatch::clone() const
{
return autoPtr<boundaryPatch>(new boundaryPatch(*this));
return autoPtr<boundaryPatch>::New(*this);
}

126
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
View File

@ -3204,51 +3204,48 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
labelHashSet flipFaceFluxSet(getSetIndices(flipFaceFlux_));
return autoPtr<mapPolyMesh>
return autoPtr<mapPolyMesh>::New
(
new mapPolyMesh
(
mesh,
nOldPoints,
nOldFaces,
nOldCells,
mesh,
nOldPoints,
nOldFaces,
nOldCells,
pointMap_,
pointsFromPoints,
pointMap_,
pointsFromPoints,
faceMap_,
facesFromPoints,
facesFromEdges,
facesFromFaces,
faceMap_,
facesFromPoints,
facesFromEdges,
facesFromFaces,
cellMap_,
cellsFromPoints,
cellsFromEdges,
cellsFromFaces,
cellsFromCells,
cellMap_,
cellsFromPoints,
cellsFromEdges,
cellsFromFaces,
cellsFromCells,
reversePointMap_,
reverseFaceMap_,
reverseCellMap_,
reversePointMap_,
reverseFaceMap_,
reverseCellMap_,
flipFaceFluxSet,
flipFaceFluxSet,
patchPointMap,
patchPointMap,
pointZoneMap,
pointZoneMap,
faceZonePointMap,
faceZoneFaceMap,
cellZoneMap,
faceZonePointMap,
faceZoneFaceMap,
cellZoneMap,
newPoints, // if empty signals no inflation.
oldPatchStarts,
oldPatchNMeshPoints,
newPoints, // if empty signals no inflation.
oldPatchStarts,
oldPatchNMeshPoints,
oldCellVolumes,
oldCellVolumes,
true // steal storage.
)
true // steal storage.
);
// At this point all member DynamicList (pointMap_, cellMap_ etc.) will
@ -3498,49 +3495,46 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
labelHashSet flipFaceFluxSet(getSetIndices(flipFaceFlux_));
return autoPtr<mapPolyMesh>
return autoPtr<mapPolyMesh>::New
(
new mapPolyMesh
(
newMesh,
nOldPoints,
nOldFaces,
nOldCells,
newMesh,
nOldPoints,
nOldFaces,
nOldCells,
pointMap_,
pointsFromPoints,
pointMap_,
pointsFromPoints,
faceMap_,
facesFromPoints,
facesFromEdges,
facesFromFaces,
faceMap_,
facesFromPoints,
facesFromEdges,
facesFromFaces,
cellMap_,
cellsFromPoints,
cellsFromEdges,
cellsFromFaces,
cellsFromCells,
cellMap_,
cellsFromPoints,
cellsFromEdges,
cellsFromFaces,
cellsFromCells,
reversePointMap_,
reverseFaceMap_,
reverseCellMap_,
reversePointMap_,
reverseFaceMap_,
reverseCellMap_,
flipFaceFluxSet,
flipFaceFluxSet,
patchPointMap,
patchPointMap,
pointZoneMap,
pointZoneMap,
faceZonePointMap,
faceZoneFaceMap,
cellZoneMap,
faceZonePointMap,
faceZoneFaceMap,
cellZoneMap,
newPoints, // if empty signals no inflation.
oldPatchStarts,
oldPatchNMeshPoints,
oldCellVolumes,
true // steal storage.
)
newPoints, // if empty signals no inflation.
oldPatchStarts,
oldPatchNMeshPoints,
oldCellVolumes,
true // steal storage.
);
// At this point all member DynamicList (pointMap_, cellMap_ etc.) will

4
src/engine/ignition/ignitionSite.H
View File

@ -105,7 +105,7 @@ public:
autoPtr<ignitionSite> operator()(Istream& is) const
{
return autoPtr<ignitionSite>(new ignitionSite(is, db_, mesh_));
return autoPtr<ignitionSite>::New(is, db_, mesh_);
}
};
@ -121,7 +121,7 @@ public:
//- Clone
autoPtr<ignitionSite> clone() const
{
return autoPtr<ignitionSite>(new ignitionSite(*this));
return autoPtr<ignitionSite>::New(*this);
}

2
src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
View File

@ -337,7 +337,7 @@ Foam::tmp<Foam::vectorField> Foam::faPatch::ngbPolyPatchPointNormals() const
{
if (ngbPolyPatchIndex() == -1)
{
return tmp<vectorField>(new vectorField());
return tmp<vectorField>::New();
}
const labelListList& pntEdges = pointEdges();

7
src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
View File

@ -196,10 +196,9 @@ public:
const label ngbPolyPatchIndex
) const
{
return autoPtr<faPatch>
(
new faPatch(name(), edgeLabels, index, bm, ngbPolyPatchIndex)
);
return
autoPtr<faPatch>::New
(name(), edgeLabels, index, bm, ngbPolyPatchIndex);
}

2
src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
View File

@ -34,7 +34,7 @@ template<>
Foam::tmp<Foam::scalarField>
Foam::basicSymmetryFaPatchField<Foam::scalar>::snGrad() const
{
return tmp<scalarField>(new scalarField(size(), 0.0));
return tmp<scalarField>::New(size(), 0.0);
}

7
src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
View File

@ -146,7 +146,7 @@ Foam::fixedGradientFaPatchField<Type>::valueInternalCoeffs
const tmp<scalarField>&
) const
{
return tmp<Field<Type>>(new Field<Type>(this->size(), pTraits<Type>::one));
return tmp<Field<Type>>::New(this->size(), pTraits<Type>::one);
}
@ -165,10 +165,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::fixedGradientFaPatchField<Type>::gradientInternalCoeffs() const
{
return tmp<Field<Type>>
(
new Field<Type>(this->size(), pTraits<Type>::zero)
);
return tmp<Field<Type>>::New(this->size(), pTraits<Type>::zero);
}

2
src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
View File

@ -33,7 +33,7 @@ template<>
Foam::tmp<Foam::scalarField>
Foam::transformFaPatchField<Foam::scalar>::gradientInternalCoeffs() const
{
return tmp<scalarField>(new scalarField(size(), 0.0));
return tmp<scalarField>::New(size(), 0.0);
}

8
src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H
View File

@ -165,7 +165,7 @@ public:
const tmp<scalarField>&
) const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
//- Return the matrix source coefficients corresponding to the
@ -175,21 +175,21 @@ public:
const tmp<scalarField>&
) const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
//- Return the matrix diagonal coefficients corresponding to the
// evaluation of the gradient of this patchField
tmp<Field<Type>> gradientInternalCoeffs() const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
//- Return the matrix source coefficients corresponding to the
// evaluation of the gradient of this patchField
tmp<Field<Type>> gradientBoundaryCoeffs() const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
};

2
src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
View File

@ -34,7 +34,7 @@ template<>
Foam::tmp<Foam::scalarField>
Foam::wedgeFaPatchField<Foam::scalar>::snGrad() const
{
return tmp<scalarField>(new scalarField(size(), 0.0));
return tmp<scalarField>::New(size(), 0.0);
}

2
src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
View File

@ -32,7 +32,7 @@ template<>
Foam::tmp<Foam::scalarField>
Foam::basicSymmetryFvPatchField<Foam::scalar>::snGrad() const
{
return tmp<scalarField >(new scalarField(size(), 0.0));
return tmp<scalarField>::New(size(), 0.0);
}

7
src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
View File

@ -155,7 +155,7 @@ Foam::fixedGradientFvPatchField<Type>::valueInternalCoeffs
const tmp<scalarField>&
) const
{
return tmp<Field<Type>>(new Field<Type>(this->size(), pTraits<Type>::one));
return tmp<Field<Type>>::New(this->size(), pTraits<Type>::one);
}
@ -174,10 +174,7 @@ template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::fixedGradientFvPatchField<Type>::gradientInternalCoeffs() const
{
return tmp<Field<Type>>
(
new Field<Type>(this->size(), Zero)
);
return tmp<Field<Type>>::New(this->size(), Zero);
}

4
src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
View File

@ -34,7 +34,7 @@ Foam::transformFvPatchField<Foam::scalar>::valueInternalCoeffs
const tmp<scalarField>&
) const
{
return tmp<scalarField>(new scalarField(size(), 1.0));
return tmp<scalarField>::New(size(), 1.0);
}
@ -42,7 +42,7 @@ template<>
Foam::tmp<Foam::scalarField>
Foam::transformFvPatchField<Foam::scalar>::gradientInternalCoeffs() const
{
return tmp<scalarField>(new scalarField(size(), 0.0));
return tmp<scalarField>::New(size(), 0.0);
}

8
src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
View File

@ -170,7 +170,7 @@ public:
const tmp<scalarField>&
) const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
//- Return the matrix source coefficients corresponding to the
@ -180,21 +180,21 @@ public:
const tmp<scalarField>&
) const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
//- Return the matrix diagonal coefficients corresponding to the
// evaluation of the gradient of this patchField
tmp<Field<Type>> gradientInternalCoeffs() const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
//- Return the matrix source coefficients corresponding to the
// evaluation of the gradient of this patchField
tmp<Field<Type>> gradientBoundaryCoeffs() const
{
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}
};

2
src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
View File

@ -32,7 +32,7 @@ template<>
Foam::tmp<Foam::scalarField>
Foam::symmetryPlaneFvPatchField<Foam::scalar>::snGrad() const
{
return tmp<scalarField >(new scalarField(size(), 0.0));
return tmp<scalarField>::New(size(), 0.0);
}

2
src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
View File

@ -36,7 +36,7 @@ namespace Foam
template<>
tmp<scalarField> wedgeFvPatchField<scalar>::snGrad() const
{
return tmp<scalarField >(new scalarField(size(), 0.0));
return tmp<scalarField>::New(size(), 0.0);
}

4
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
View File

@ -219,7 +219,7 @@ public:
//- Construct and return a clone
virtual tmp<fvPatchField<Type>> clone() const
{
return tmp<fvPatchField<Type>>(new fvPatchField<Type>(*this));
return tmp<fvPatchField<Type>>::New(*this);
}
//- Construct as copy setting internal field reference
@ -235,7 +235,7 @@ public:
const DimensionedField<Type, volMesh>& iF
) const
{
return tmp<fvPatchField<Type>>(new fvPatchField<Type>(*this, iF));
return tmp<fvPatchField<Type>>::New(*this, iF);
}

7
src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
View File

@ -185,7 +185,7 @@ public:
//- Construct and return a clone
virtual tmp<fvsPatchField<Type>> clone() const
{
return tmp<fvsPatchField<Type>>(new fvsPatchField<Type>(*this));
return tmp<fvsPatchField<Type>>::New(*this);
}
//- Construct as copy setting internal field reference
@ -201,10 +201,7 @@ public:
const DimensionedField<Type, surfaceMesh>& iF
) const
{
return tmp<fvsPatchField<Type>>
(
new fvsPatchField<Type>(*this, iF)
);
return tmp<fvsPatchField<Type>>::New(*this, iF);
}

15
src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
View File

@ -221,17 +221,14 @@ Foam::cellToCellStencil::allCoupledFacesPatch() const
}
}
return autoPtr<indirectPrimitivePatch>
return autoPtr<indirectPrimitivePatch>::New
(
new indirectPrimitivePatch
IndirectList<face>
(
IndirectList<face>
(
mesh().faces(),
coupledFaces
),
mesh().points()
)
mesh().faces(),
coupledFaces
),
mesh().points()
);
}

15
src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
View File

@ -222,17 +222,14 @@ Foam::cellToFaceStencil::allCoupledFacesPatch() const
}
}
return autoPtr<indirectPrimitivePatch>
return autoPtr<indirectPrimitivePatch>::New
(
new indirectPrimitivePatch
IndirectList<face>
(
IndirectList<face>
(
mesh().faces(),
coupledFaces
),
mesh().points()
)
mesh().faces(),
coupledFaces
),
mesh().points()
);
}

2
src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
View File

@ -57,7 +57,7 @@ Foam::tmp<Foam::labelField> Foam::regionCoupledFvPatch::internalFieldTransfer
return neighbFvPatch().patchInternalField(iF);
}
return tmp<labelField>(new labelField(iF.size(), 0));
return tmp<labelField>::New(iF.size(), 0);
}

3
src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C
View File

@ -59,7 +59,8 @@ internalFieldTransfer
return neighbFvPatch().patchInternalField(iF);
}
return tmp<labelField>(new labelField(iF.size(), 0));
return tmp<labelField>::New(iF.size(), 0);
}
// ************************************************************************* //

2
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
View File

@ -136,7 +136,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::getFieldValues
<< abort(FatalError);
}
return tmp<Field<Type>>(new Field<Type>(0));
return tmp<Field<Type>>::New();
}

4
src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
View File

@ -67,7 +67,7 @@ Foam::functionObjects::fieldValues::volFieldValue::getFieldValues
<< abort(FatalError);
}
return tmp<Field<Type>>(new Field<Type>(0.0));
return tmp<Field<Type>>::New(Zero);
}
@ -266,7 +266,7 @@ Foam::functionObjects::fieldValues::volFieldValue::filterField
}
else
{
return tmp<Field<Type>>(new Field<Type>(field, cellIDs()));
return tmp<Field<Type>>::New(field, cellIDs());
}
}

4
src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
View File

@ -54,7 +54,7 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::rho(const label patchi) const
if (rhoName_ == "rhoInf")
{
const label n = mesh_.boundary()[patchi].size();
return tmp<Field<scalar>>(new Field<scalar>(n, rhoRef_));
return tmp<Field<scalar>>::New(n, rhoRef_);
}
else if (mesh_.foundObject<volScalarField>(rhoName_, false))
{
@ -77,7 +77,7 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::Cp(const label patchi) const
if (CpName_ == "CpInf")
{
const label n = mesh_.boundary()[patchi].size();
return tmp<Field<scalar>>(new Field<scalar>(n, CpRef_));
return tmp<Field<scalar>>::New(n, CpRef_);
}
else if (mesh_.foundObject<fluidThermo>(fluidThermo::typeName))
{

15
src/functionObjects/field/streamLine/streamLineBase.C
View File

@ -111,17 +111,14 @@ Foam::functionObjects::streamLineBase::wallPatch() const
}
}
return autoPtr<indirectPrimitivePatch>
return autoPtr<indirectPrimitivePatch>::New
(
new indirectPrimitivePatch
IndirectList<face>
(
IndirectList<face>
(
mesh_.faces(),
addressing
),
mesh_.points()
)
mesh_.faces(),
addressing
),
mesh_.points()
);
}

2
src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
View File

@ -170,7 +170,7 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
}
}
return tmp<labelField>(new labelField(finalAgglom));
return tmp<labelField>::New(finalAgglom);
}

2
src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
View File

@ -62,7 +62,7 @@ Foam::motionInterpolation::motionInterpolation
Foam::autoPtr<Foam::motionInterpolation>
Foam::motionInterpolation::New(const fvMesh& mesh)
{
return autoPtr<motionInterpolation>(new motionInterpolation(mesh));
return autoPtr<motionInterpolation>::New(mesh);
}

7
src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
View File

@ -441,10 +441,7 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
case ifFixed:
case ifSurfaceNormal:
{
return tmp<vectorField>
(
new vectorField(mesh_.nCells(), inletVelocity_)
);
return tmp<vectorField>::New(mesh_.nCells(), inletVelocity_);
break;
}
@ -461,7 +458,7 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
}
}
return tmp<vectorField>(new vectorField(mesh_.nCells(), Zero));
return tmp<vectorField>::New(mesh_.nCells(), Zero);
}

4
src/lagrangian/basic/particle/particle.H
View File

@ -419,7 +419,7 @@ public:
//- Construct a clone
virtual autoPtr<particle> clone() const
{
return autoPtr<particle>(new particle(*this));
return autoPtr<particle>::New(*this);
}
//- Factory class to read-construct particles used for
@ -437,7 +437,7 @@ public:
autoPtr<particle> operator()(Istream& is) const
{
return autoPtr<particle>(new particle(mesh_, is, true));
return autoPtr<particle>::New(mesh_, is, true);
}
};

2
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
View File

@ -447,7 +447,7 @@ Foam::KinematicCloud<CloudType>::SU(volVectorField& U) const
}
}
return tmp<fvVectorMatrix>(new fvVectorMatrix(U, dimForce));
return tmp<fvVectorMatrix>::New(U, dimForce);
}

4
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
View File

@ -149,7 +149,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
}
}
return tmp<fvScalarMatrix>(new fvScalarMatrix(Yi, dimMass/dimTime));
return tmp<fvScalarMatrix>::New(Yi, dimMass/dimTime);
}
@ -285,7 +285,7 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
}
}
return tmp<fvScalarMatrix>(new fvScalarMatrix(rho, dimMass/dimTime));
return tmp<fvScalarMatrix>::New(rho, dimMass/dimTime);
}

2
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
View File

@ -255,7 +255,7 @@ Foam::ThermoCloud<CloudType>::Sh(volScalarField& hs) const
}
}
return tmp<fvScalarMatrix>(new fvScalarMatrix(hs, dimEnergy/dimTime));
return tmp<fvScalarMatrix>::New(hs, dimEnergy/dimTime);
}

2
src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
View File

@ -301,7 +301,7 @@ public:
autoPtr<molecule> operator()(Istream& is) const
{
return autoPtr<molecule>(new molecule(mesh_, is, true));
return autoPtr<molecule>::New(mesh_, is, true);
}
};

23
src/lumpedPointMotion/lumpedPointIOMovement.C
View File

@ -53,21 +53,18 @@ Foam::lumpedPointIOMovement::New
label ownerId
)
{
return autoPtr<lumpedPointIOMovement>
return autoPtr<lumpedPointIOMovement>::New
(
new lumpedPointIOMovement
IOobject
(
IOobject
(
lumpedPointMovement::dictionaryName,
obr.time().caseSystem(),
obr,
IOobject::MUST_READ,
IOobject::NO_WRITE,
true // register object
),
ownerId // tag this patch as owner too
)
lumpedPointMovement::dictionaryName,
obr.time().caseSystem(),
obr,
IOobject::MUST_READ,
IOobject::NO_WRITE,
true // register object
),
ownerId // tag this patch as owner too
);
}

25
src/lumpedPointMotion/lumpedPointTools.C
View File

@ -46,22 +46,19 @@ namespace Foam
Info<< "Reading " << GeoFieldType::typeName
<< ' ' << io->name() << endl;
return autoPtr<GeoFieldType>
return autoPtr<GeoFieldType>::New
(
new GeoFieldType
IOobject
(
IOobject
(
io->name(),
io->instance(),
io->local(),
io->db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE,
io->registerObject()
),
mesh
)
io->name(),
io->instance(),
io->local(),
io->db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE,
io->registerObject()
),
mesh
);
}

14
src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
View File

@ -92,15 +92,13 @@ Foam::autoPtr<Foam::blockVertex> Foam::blockVertex::New
return autoPtr<blockVertex>(cstrIter()(dict, index, geometry, is));
}
else
{
FatalIOErrorInFunction(is)
<< "incorrect first token, expected <word> or '(', found "
<< firstToken.info()
<< exit(FatalIOError);
return autoPtr<blockVertex>();
}
FatalIOErrorInFunction(is)
<< "incorrect first token, expected <word> or '(', found "
<< firstToken.info()
<< exit(FatalIOError);
return autoPtr<blockVertex>();
}

23
src/mesh/blockMesh/blocks/block/block.C
View File

@ -78,28 +78,15 @@ Foam::autoPtr<Foam::block> Foam::block::New
const word blockOrCellShapeType(is);
auto cstrIter = IstreamConstructorTablePtr_->cfind(blockOrCellShapeType);
auto cstr = IstreamConstructorTablePtr_->cfind(blockOrCellShapeType);
if (!cstrIter.found())
if (!cstr.found())
{
is.putBack(token(blockOrCellShapeType));
return autoPtr<block>(new block(dict, index, points, edges, faces, is));
}
else
{
return autoPtr<block>
(
cstrIter()
(
dict,
index,
points,
edges,
faces,
is
)
);
return autoPtr<block>::New(dict, index, points, edges, faces, is);
}
return autoPtr<block>(cstr()(dict, index, points, edges, faces, is));
}

2
src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
View File

@ -88,7 +88,7 @@ Foam::displacementMeshMoverMotionSolver::curPoints() const
{
// Return actual points. Cannot do a reference since complains about
// assignment to self in polyMesh::movePoints
return tmp<pointField>(new pointField(mesh().points()));
return tmp<pointField>::New(mesh().points());
}

9
src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
View File

@ -103,13 +103,10 @@ Foam::externalDisplacementMeshMover::getPatch
}
}
return autoPtr<indirectPrimitivePatch>
return autoPtr<indirectPrimitivePatch>::New
(
new indirectPrimitivePatch
(
IndirectList<face>(mesh.faces(), addressing),
mesh.points()
)
IndirectList<face>(mesh.faces(), addressing),
mesh.points()
);
}

9
src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
View File

@ -1648,13 +1648,10 @@ Foam::autoPtr<Foam::indirectPrimitivePatch> Foam::meshRefinement::makePatch
}
}
return autoPtr<indirectPrimitivePatch>
return autoPtr<indirectPrimitivePatch>::New
(
new indirectPrimitivePatch
(
IndirectList<face>(mesh.faces(), addressing),
mesh.points()
)
IndirectList<face>(mesh.faces(), addressing),
mesh.points()
);
}

2
src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H
View File

@ -137,7 +137,7 @@ public:
//- Return clone
autoPtr<surfaceZonesInfo> clone() const
{
return autoPtr<surfaceZonesInfo>(new surfaceZonesInfo(*this));
return autoPtr<surfaceZonesInfo>::New(*this);
}

7
src/mesh/snappyHexMesh/trackedParticle/trackedParticle.H
View File

@ -160,7 +160,7 @@ public:
//- Construct and return a clone
autoPtr<particle> clone() const
{
return autoPtr<particle>(new trackedParticle(*this));
return autoPtr<particle>::NewFrom<trackedParticle>(*this);
}
//- Factory class to read-construct particles used for
@ -178,10 +178,7 @@ public:
autoPtr<trackedParticle> operator()(Istream& is) const
{
return autoPtr<trackedParticle>
(
new trackedParticle(mesh_, is, true)
);
return autoPtr<trackedParticle>::New(mesh_, is, true);
}
};

2
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
View File

@ -179,7 +179,7 @@ public:
//- Construct and return a clone, resetting the boundary mesh
virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
{
return autoPtr<polyPatch>(new cyclicACMIPolyPatch(*this, bm));
return autoPtr<polyPatch>::NewFrom<cyclicACMIPolyPatch>(*this, bm);
}
//- Construct and return a clone, resetting the face list

2
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
View File

@ -220,7 +220,7 @@ public:
//- Construct and return a clone, resetting the boundary mesh
virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
{
return autoPtr<polyPatch>(new cyclicAMIPolyPatch(*this, bm));
return autoPtr<polyPatch>::NewFrom<cyclicAMIPolyPatch>(*this, bm);
}
//- Construct and return a clone, resetting the face list

10
src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
View File

@ -138,13 +138,9 @@ public:
//- Return clone
autoPtr<coordinateRotation> clone() const
{
return autoPtr<coordinateRotation>
(
new EulerCoordinateRotation
(
*this
)
);
return
autoPtr<coordinateRotation>::NewFrom
<EulerCoordinateRotation>(*this);
}

Some files were not shown because too many files have changed in this diff Show More