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

C++11: Replaced the C NULL with the safer C++11 nullptr

Browse Source 
Requires gcc version 4.7 or higher
This commit is contained in:
Henry Weller
2016-08-05 17:19:38 +01:00
parent 7996a9138f
commit 58f905ff70
363 changed files with 1468 additions and 1416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H
View File

@ -85,7 +85,7 @@ public:
}
}
if ((singlePatchProc_ == -1) != (distMapPtr_ != NULL))
if ((singlePatchProc_ == -1) != (distMapPtr_ != nullptr))
{
FatalErrorIn
(
@ -94,7 +94,7 @@ public:
) << "Supply a mapDistributeBase if and only if "
<< "singlePatchProc is -1"
<< " singlePatchProc_:" << singlePatchProc_
<< " distMapPtr_:" << (distMapPtr_ != NULL)
<< " distMapPtr_:" << (distMapPtr_ != nullptr)
<< exit(FatalError);
}
}

16
src/sampling/meshToMesh/meshToMesh.C
View File

@ -653,8 +653,8 @@ Foam::meshToMesh::meshToMesh
tgtToSrcCellWght_(),
V_(0.0),
singleMeshProc_(-1),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
constructNoCuttingPatches
(
@ -689,8 +689,8 @@ Foam::meshToMesh::meshToMesh
tgtToSrcCellWght_(),
V_(0.0),
singleMeshProc_(-1),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
constructNoCuttingPatches(methodName, AMIMethodName, interpAllPatches);
}
@ -717,8 +717,8 @@ Foam::meshToMesh::meshToMesh
tgtToSrcCellWght_(),
V_(0.0),
singleMeshProc_(-1),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
constructFromCuttingPatches
(
@ -755,8 +755,8 @@ Foam::meshToMesh::meshToMesh
tgtToSrcCellWght_(),
V_(0.0),
singleMeshProc_(-1),
srcMapPtr_(NULL),
tgtMapPtr_(NULL)
srcMapPtr_(nullptr),
tgtMapPtr_(nullptr)
{
constructFromCuttingPatches
(

4
src/sampling/meshToMesh/meshToMeshTemplates.C
View File

@ -375,7 +375,7 @@ void Foam::meshToMesh::mapSrcToTgt
(
AMIList[i].singlePatchProc() == -1
? &AMIList[i].srcMap()
: NULL
: nullptr
),
AMIList[i].tgtAddress(),
AMIList[i].tgtWeights()
@ -581,7 +581,7 @@ void Foam::meshToMesh::mapTgtToSrc
(
AMIList[i].singlePatchProc() == -1
? &AMIList[i].tgtMap()
: NULL
: nullptr
),
AMIList[i].srcAddress(),
AMIList[i].srcWeights()

14
src/sampling/meshToMesh0/meshToMesh0.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -52,9 +52,9 @@ Foam::meshToMesh0::meshToMesh0
patchMap_(patchMap),
cellAddressing_(toMesh_.nCells()),
boundaryAddressing_(toMesh_.boundaryMesh().size()),
inverseDistanceWeightsPtr_(NULL),
inverseVolumeWeightsPtr_(NULL),
cellToCellAddressingPtr_(NULL),
inverseDistanceWeightsPtr_(nullptr),
inverseVolumeWeightsPtr_(nullptr),
cellToCellAddressingPtr_(nullptr),
V_(0.0)
{
forAll(fromMesh_.boundaryMesh(), patchi)
@ -120,9 +120,9 @@ Foam::meshToMesh0::meshToMesh0
toMesh_(meshTo),
cellAddressing_(toMesh_.nCells()),
boundaryAddressing_(toMesh_.boundaryMesh().size()),
inverseDistanceWeightsPtr_(NULL),
inverseVolumeWeightsPtr_(NULL),
cellToCellAddressingPtr_(NULL),
inverseDistanceWeightsPtr_(nullptr),
inverseVolumeWeightsPtr_(nullptr),
cellToCellAddressingPtr_(nullptr),
V_(0.0)
{
// check whether both meshes have got the same number

2
src/sampling/sampledSet/sampledSet/sampledSet.H
View File

@ -217,7 +217,7 @@ public:
autoPtr<sampledSet> clone() const
{
NotImplemented;
return autoPtr<sampledSet>(NULL);
return autoPtr<sampledSet>(nullptr);
}

2
src/sampling/sampledSet/sampledSets/sampledSets.H
View File

@ -82,7 +82,7 @@ class sampledSets
fieldGroup()
:
DynamicList<word>(0),
formatter(NULL)
formatter(nullptr)
{}
//- Construct for a particular format

12
src/sampling/sampledSurface/distanceSurface/distanceSurface.C
View File

@ -335,9 +335,9 @@ Foam::distanceSurface::distanceSurface
average_(dict.lookupOrDefault("average", false)),
zoneKey_(keyType::null),
needsUpdate_(true),
isoSurfCellPtr_(NULL),
isoSurfPtr_(NULL),
facesPtr_(NULL)
isoSurfCellPtr_(nullptr),
isoSurfPtr_(nullptr),
facesPtr_(nullptr)
{
// dict.readIfPresent("zone", zoneKey_);
//
@ -389,9 +389,9 @@ Foam::distanceSurface::distanceSurface
average_(average),
zoneKey_(keyType::null),
needsUpdate_(true),
isoSurfCellPtr_(NULL),
isoSurfPtr_(NULL),
facesPtr_(NULL)
isoSurfCellPtr_(nullptr),
isoSurfPtr_(nullptr),
facesPtr_(nullptr)
{}

2
src/sampling/sampledSurface/isoSurface/isoSurface.C
View File

@ -1259,7 +1259,7 @@ Foam::isoSurface::isoSurface
bType& bfld = const_cast<bType&>(meshC.boundaryField());
// Clear old value. Cannot resize it since is a slice.
bfld.set(patchi, NULL);
bfld.set(patchi, nullptr);
// Set new value we can change
bfld.set

2
src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
View File

@ -90,7 +90,7 @@ Foam::isoSurface::adaptPatchFields
)
{
// Clear old value. Cannot resize it since is a slice.
sliceFldBf.set(patchi, NULL);
sliceFldBf.set(patchi, nullptr);
// Set new value we can change
sliceFldBf.set

10
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
View File

@ -449,12 +449,12 @@ Foam::sampledIsoSurface::sampledIsoSurface
average_(dict.lookupOrDefault("average", false)),
zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),
exposedPatchName_(word::null),
surfPtr_(NULL),
facesPtr_(NULL),
surfPtr_(nullptr),
facesPtr_(nullptr),
prevTimeIndex_(-1),
storedVolFieldPtr_(NULL),
volFieldPtr_(NULL),
pointFieldPtr_(NULL)
storedVolFieldPtr_(nullptr),
volFieldPtr_(nullptr),
pointFieldPtr_(nullptr)
{
if (!sampledSurface::interpolate())
{

4
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
View File

@ -70,7 +70,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
// 1. see if field in database
// 2. see if field can be read
const volScalarField* cellFldPtr = NULL;
const volScalarField* cellFldPtr = nullptr;
if (fvm.foundObject<volScalarField>(isoField_))
{
if (debug)
@ -209,7 +209,7 @@ Foam::sampledIsoSurfaceCell::sampledIsoSurfaceCell
regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", true)),
zoneKey_(keyType::null),
facesPtr_(NULL),
facesPtr_(nullptr),
prevTimeIndex_(-1),
meshCells_(0)
{}

8
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
View File

@ -269,10 +269,10 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),
exposedPatchName_(word::null),
needsUpdate_(true),
subMeshPtr_(NULL),
cellDistancePtr_(NULL),
isoSurfPtr_(NULL),
facesPtr_(NULL)
subMeshPtr_(nullptr),
cellDistancePtr_(nullptr),
isoSurfPtr_(nullptr),
facesPtr_(nullptr)
{
if (zoneID_.index() != -1)
{

22
src/sampling/sampledSurface/sampledSurface/sampledSurface.C
View File

@ -156,9 +156,9 @@ Foam::sampledSurface::sampledSurface
name_(name),
mesh_(mesh),
interpolate_(interpolate),
SfPtr_(NULL),
magSfPtr_(NULL),
CfPtr_(NULL),
SfPtr_(nullptr),
magSfPtr_(nullptr),
CfPtr_(nullptr),
area_(-1)
{}
@ -173,9 +173,9 @@ Foam::sampledSurface::sampledSurface
name_(name),
mesh_(mesh),
interpolate_(dict.lookupOrDefault("interpolate", false)),
SfPtr_(NULL),
magSfPtr_(NULL),
CfPtr_(NULL),
SfPtr_(nullptr),
magSfPtr_(nullptr),
CfPtr_(nullptr),
area_(-1)
{
dict.readIfPresent("name", name_);
@ -243,7 +243,7 @@ Foam::tmp<Foam::scalarField> Foam::sampledSurface::sample
) const
{
NotImplemented;
return tmp<scalarField>(NULL);
return tmp<scalarField>(nullptr);
}
@ -253,7 +253,7 @@ Foam::tmp<Foam::vectorField> Foam::sampledSurface::sample
) const
{
NotImplemented;
return tmp<vectorField>(NULL);
return tmp<vectorField>(nullptr);
}
@ -263,7 +263,7 @@ Foam::tmp<Foam::sphericalTensorField> Foam::sampledSurface::sample
) const
{
NotImplemented;
return tmp<sphericalTensorField>(NULL);
return tmp<sphericalTensorField>(nullptr);
}
@ -273,7 +273,7 @@ Foam::tmp<Foam::symmTensorField> Foam::sampledSurface::sample
) const
{
NotImplemented;
return tmp<symmTensorField>(NULL);
return tmp<symmTensorField>(nullptr);
}
@ -283,7 +283,7 @@ Foam::tmp<Foam::tensorField> Foam::sampledSurface::sample
) const
{
NotImplemented;
return tmp<tensorField>(NULL);
return tmp<tensorField>(nullptr);
}

2
src/sampling/sampledSurface/sampledSurface/sampledSurface.H
View File

@ -225,7 +225,7 @@ public:
autoPtr<sampledSurface> clone() const
{
NotImplemented;
return autoPtr<sampledSurface>(NULL);
return autoPtr<sampledSurface>(nullptr);
}

4
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View File

@ -117,7 +117,7 @@ Foam::sampledSurfaces::sampledSurfaces
fieldSelection_(),
interpolationScheme_(word::null),
mergeList_(),
formatter_(NULL)
formatter_(nullptr)
{
if (Pstream::parRun())
{
@ -148,7 +148,7 @@ Foam::sampledSurfaces::sampledSurfaces
fieldSelection_(),
interpolationScheme_(word::null),
mergeList_(),
formatter_(NULL)
formatter_(nullptr)
{
if (Pstream::parRun())
{

2
src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
View File

@ -64,7 +64,7 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
// 1. see if field in database
// 2. see if field can be read
const volScalarField* cellFldPtr = NULL;
const volScalarField* cellFldPtr = nullptr;
if (fvm.foundObject<volScalarField>(fieldName_))
{
if (debug)