Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
58f905ff
Commit
58f905ff
authored
Aug 05, 2016
by
Henry Weller
Browse files
C++11: Replaced the C NULL with the safer C++11 nullptr
Requires gcc version 4.7 or higher
parent
7996a913
Changes
363
Hide whitespace changes
Inline
Side-by-side
applications/solvers/electromagnetics/mhdFoam/createPhiB.H
View file @
58f905ff
...
...
@@ -7,7 +7,7 @@ IOobject phiBHeader
);
surfaceScalarField
*
phiBPtr
=
NULL
;
surfaceScalarField
*
phiBPtr
=
nullptr
;
if
(
phiBHeader
.
headerOk
())
{
...
...
applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
View file @
58f905ff
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -45,8 +45,8 @@ Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo
:
psiThermo
(
mesh
,
word
::
null
),
twoPhaseMixture
(
mesh
,
*
this
),
thermo1_
(
NULL
),
thermo2_
(
NULL
)
thermo1_
(
nullptr
),
thermo2_
(
nullptr
)
{
{
volScalarField
T1
(
IOobject
::
groupName
(
"T"
,
phase1Name
()),
T_
);
...
...
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
View file @
58f905ff
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -49,7 +49,7 @@ Foam::phaseModel::phaseModel
name_
(
phaseName
),
p_
(
p
),
T_
(
T
),
thermo_
(
NULL
),
thermo_
(
nullptr
),
dgdt_
(
IOobject
...
...
@@ -81,7 +81,7 @@ Foam::phaseModel::phaseModel
Foam
::
autoPtr
<
Foam
::
phaseModel
>
Foam
::
phaseModel
::
clone
()
const
{
NotImplemented
;
return
autoPtr
<
phaseModel
>
(
NULL
);
return
autoPtr
<
phaseModel
>
(
nullptr
);
}
...
...
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
View file @
58f905ff
...
...
@@ -203,7 +203,7 @@ Foam::phaseModel::~phaseModel()
Foam
::
autoPtr
<
Foam
::
phaseModel
>
Foam
::
phaseModel
::
clone
()
const
{
NotImplemented
;
return
autoPtr
<
phaseModel
>
(
NULL
);
return
autoPtr
<
phaseModel
>
(
nullptr
);
}
...
...
applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
View file @
58f905ff
...
...
@@ -123,7 +123,7 @@
++
dmIter
,
++
dcIter
)
{
const
phaseModel
*
phase2Ptr
=
NULL
;
const
phaseModel
*
phase2Ptr
=
nullptr
;
if
(
&
phase
==
&
dmIter
()
->
phase1
())
{
...
...
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
View file @
58f905ff
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -68,7 +68,7 @@ Foam::phase::phase
Foam
::
autoPtr
<
Foam
::
phase
>
Foam
::
phase
::
clone
()
const
{
NotImplemented
;
return
autoPtr
<
phase
>
(
NULL
);
return
autoPtr
<
phase
>
(
nullptr
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
View file @
58f905ff
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -102,7 +102,7 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::dmdt
const
Foam
::
phaseModel
&
phase
)
const
{
return
tmp
<
volScalarField
>
(
NULL
);
return
tmp
<
volScalarField
>
(
nullptr
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
View file @
58f905ff
...
...
@@ -175,7 +175,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
fluid
.
mesh
(),
dimensionedVector
(
"0"
,
dimAcceleration
,
Zero
)
),
divU_
(
NULL
),
divU_
(
nullptr
),
turbulence_
(
phaseCompressibleTurbulenceModel
::
New
...
...
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
View file @
58f905ff
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -77,7 +77,7 @@ Foam::phaseModel::phaseModel
Foam
::
autoPtr
<
Foam
::
phaseModel
>
Foam
::
phaseModel
::
clone
()
const
{
NotImplemented
;
return
autoPtr
<
phaseModel
>
(
NULL
);
return
autoPtr
<
phaseModel
>
(
nullptr
);
}
...
...
@@ -168,7 +168,7 @@ bool Foam::phaseModel::compressible() const
const
Foam
::
tmp
<
Foam
::
volScalarField
>&
Foam
::
phaseModel
::
divU
()
const
{
NotImplemented
;
static
tmp
<
Foam
::
volScalarField
>
divU_
(
NULL
);
static
tmp
<
Foam
::
volScalarField
>
divU_
(
nullptr
);
return
divU_
;
}
...
...
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
View file @
58f905ff
...
...
@@ -102,7 +102,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
:
blendingMethods_
[
"default"
]
);
autoPtr
<
modelType
>
noModel
(
NULL
);
autoPtr
<
modelType
>
noModel
(
nullptr
);
forAllConstIter
(
typename
modelTypeTable
,
tempModels
,
iter
)
{
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
View file @
58f905ff
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -115,7 +115,7 @@ public:
autoPtr
<
IATEsource
>
clone
()
const
{
NotImplemented
;
return
autoPtr
<
IATEsource
>
(
NULL
);
return
autoPtr
<
IATEsource
>
(
nullptr
);
}
...
...
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
View file @
58f905ff
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -114,7 +114,7 @@ public:
autoPtr
<
IATEsource
>
clone
()
const
{
NotImplemented
;
return
autoPtr
<
IATEsource
>
(
NULL
);
return
autoPtr
<
IATEsource
>
(
nullptr
);
}
...
...
applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
View file @
58f905ff
...
...
@@ -16,7 +16,7 @@ volVectorField D
);
autoPtr
<
volScalarField
>
Tptr
(
NULL
);
autoPtr
<
volScalarField
>
Tptr
(
nullptr
);
if
(
thermalStress
)
{
...
...
applications/test/HashingSpeed/Test-HashingSpeed.C
View file @
58f905ff
...
...
@@ -943,7 +943,7 @@ uint32_t SuperFastHash (const char * data, int len)
{
uint32_t
hash
=
0
;
if
(
len
<=
0
||
data
==
NULL
)
return
0
;
if
(
len
<=
0
||
data
==
nullptr
)
return
0
;
unsigned
rem
=
len
&
3
;
len
>>=
2
;
...
...
@@ -1060,14 +1060,14 @@ struct tagtest {
{
0
.
0
,
"hashLookup3
\t
"
,
hashLookup3
},
{
0
.
0
,
"hashLookup3Orig
\t
"
,
hashLookup3Orig
},
{
0
.
0
,
"SuperFastHash
\t
"
,
SuperFastHash
},
{
0
.
0
,
NULL
,
NULL
}
{
0
.
0
,
nullptr
,
nullptr
}
};
int
main
()
{
int
i
,
j
;
GenerateCRC32Table
();
for
(
j
=
0
;
tests
[
j
].
name
!=
NULL
;
j
++
)
{
for
(
j
=
0
;
tests
[
j
].
name
!=
nullptr
;
j
++
)
{
for
(
i
=
0
;
i
<
3
;
i
++
)
{
double
res
=
test
(
tests
[
j
].
hash
);
if
(
tests
[
j
].
res
==
0
.
0
||
tests
[
j
].
res
>
res
)
tests
[
j
].
res
=
res
;
...
...
applications/test/regex/Test-regex.C
View file @
58f905ff
...
...
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
string
me
(
"Mark"
);
// Handling of null strings
if
(
regExp
(
NULL
).
match
(
me
))
if
(
regExp
(
nullptr
).
match
(
me
))
{
Info
<<
"fail - matched: "
<<
me
<<
endl
;
}
...
...
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View file @
58f905ff
...
...
@@ -648,7 +648,7 @@ int main(int argc, char *argv[])
);
// corrector for mesh motion
twoDPointCorrector
*
correct2DPtr
=
NULL
;
twoDPointCorrector
*
correct2DPtr
=
nullptr
;
if
(
motionObj
.
headerOk
())
{
...
...
applications/utilities/mesh/advanced/selectCells/selectCells.C
View file @
58f905ff
...
...
@@ -414,9 +414,9 @@ int main(int argc, char *argv[])
// Surface
autoPtr
<
triSurface
>
surf
(
NULL
);
autoPtr
<
triSurface
>
surf
(
nullptr
);
// Search engine on surface.
autoPtr
<
triSurfaceSearch
>
querySurf
(
NULL
);
autoPtr
<
triSurfaceSearch
>
querySurf
(
nullptr
);
if
(
useSurface
)
{
...
...
applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
View file @
58f905ff
...
...
@@ -186,7 +186,7 @@ void ReadVertices
// any chunk. Normally this would be in a for loop.
CCMIOSize
nVertices
;
CCMIOEntitySize
(
&
err
,
vertices
,
&
nVertices
,
NULL
);
CCMIOEntitySize
(
&
err
,
vertices
,
&
nVertices
,
nullptr
);
List
<
int
>
mapData
(
nVertices
,
0
);
List
<
float
>
verts
(
3
*
nVertices
,
0
);
...
...
@@ -205,9 +205,9 @@ void ReadVertices
CCMIOReadMap
(
&
err
,
mapID
,
mapData
.
begin
(),
offset
,
offsetPlusSize
);
//CCMIOSize size;
//CCMIOEntityDescription(&err, vertices, &size,
NULL
);
//CCMIOEntityDescription(&err, vertices, &size,
nullptr
);
//char *desc = new char[size + 1];
//CCMIOEntityDescription(&err, vertices,
NULL
, desc);
//CCMIOEntityDescription(&err, vertices,
nullptr
, desc);
//Pout<< "label: '" << desc << "'" << endl;
//delete [] desc;
...
...
@@ -243,7 +243,7 @@ void ReadProblem
int
i
=
0
;
while
(
CCMIONextEntity
(
NULL
,
problem
,
kCCMIOCellType
,
&
i
,
&
next
)
CCMIONextEntity
(
nullptr
,
problem
,
kCCMIOCellType
,
&
i
,
&
next
)
==
kCCMIONoErr
)
{
...
...
@@ -255,10 +255,10 @@ void ReadProblem
// an array to get the name because we do not know how long the
// string is yet. Many parameters to CCMIO functions that
// return
// data can be
NULL
if that data is not needed.)
// data can be
nullptr
if that data is not needed.)
if
(
CCMIOReadOptstr
(
NULL
,
next
,
"MaterialType"
,
&
size
,
NULL
)
CCMIOReadOptstr
(
nullptr
,
next
,
"MaterialType"
,
&
size
,
nullptr
)
==
kCCMIONoErr
)
{
...
...
@@ -280,7 +280,7 @@ void ReadProblem
int
k
=
0
;
while
(
CCMIONextEntity
(
NULL
,
problem
,
kCCMIOBoundaryRegion
,
&
k
,
&
boundary
)
CCMIONextEntity
(
nullptr
,
problem
,
kCCMIOBoundaryRegion
,
&
k
,
&
boundary
)
==
kCCMIONoErr
)
{
...
...
@@ -292,7 +292,7 @@ void ReadProblem
int
prostarI
=
-
1
;
if
(
CCMIOReadOpti
(
NULL
,
boundary
,
"ProstarRegionNumber"
,
&
prostarI
)
CCMIOReadOpti
(
nullptr
,
boundary
,
"ProstarRegionNumber"
,
&
prostarI
)
==
kCCMIONoErr
)
{
...
...
@@ -318,12 +318,18 @@ void ReadProblem
int
size
;
if
(
CCMIOReadOptstr
(
NULL
,
boundary
,
"BoundaryType"
,
&
size
,
NULL
)
==
kCCMIONoErr
CCMIOReadOptstr
(
nullptr
,
boundary
,
"BoundaryType"
,
&
size
,
nullptr
)
==
kCCMIONoErr
)
{
char
*
s
=
new
char
[
size
+
1
];
CCMIOReadOptstr
(
NULL
,
boundary
,
"BoundaryType"
,
&
size
,
s
);
CCMIOReadOptstr
(
nullptr
,
boundary
,
"BoundaryType"
,
&
size
,
s
);
s
[
size
]
=
'\0'
;
foamPatchTypes
[
foamPatchi
]
=
string
::
validate
<
word
>
(
string
(
s
));
delete
[]
s
;
...
...
@@ -340,12 +346,18 @@ void ReadProblem
if
(
CCMIOReadOptstr
(
NULL
,
boundary
,
"BoundaryName"
,
&
size
,
NULL
)
==
kCCMIONoErr
CCMIOReadOptstr
(
nullptr
,
boundary
,
"BoundaryName"
,
&
size
,
nullptr
)
==
kCCMIONoErr
)
{
char
*
name
=
new
char
[
size
+
1
];
CCMIOReadOptstr
(
NULL
,
boundary
,
"BoundaryName"
,
&
size
,
name
);
CCMIOReadOptstr
(
nullptr
,
boundary
,
"BoundaryName"
,
&
size
,
name
);
name
[
size
]
=
'\0'
;
foamPatchNames
[
foamPatchi
]
=
string
::
validate
<
word
>
(
string
(
name
));
...
...
@@ -353,12 +365,12 @@ void ReadProblem
}
else
if
(
CCMIOReadOptstr
(
NULL
,
boundary
,
"Label"
,
&
size
,
NULL
)
CCMIOReadOptstr
(
nullptr
,
boundary
,
"Label"
,
&
size
,
nullptr
)
==
kCCMIONoErr
)
{
char
*
name
=
new
char
[
size
+
1
];
CCMIOReadOptstr
(
NULL
,
boundary
,
"Label"
,
&
size
,
name
);
CCMIOReadOptstr
(
nullptr
,
boundary
,
"Label"
,
&
size
,
name
);
name
[
size
]
=
'\0'
;
foamPatchNames
[
foamPatchi
]
=
string
::
validate
<
word
>
(
string
(
name
));
...
...
@@ -407,7 +419,7 @@ void ReadCells
CCMIOID
id
;
CCMIOGetEntity
(
&
err
,
topology
,
kCCMIOCells
,
0
,
&
id
);
CCMIOSize
nCells
;
CCMIOEntitySize
(
&
err
,
id
,
&
nCells
,
NULL
);
CCMIOEntitySize
(
&
err
,
id
,
&
nCells
,
nullptr
);
std
::
vector
<
int
>
mapData
(
nCells
);
std
::
vector
<
int
>
cellType
(
nCells
);
...
...
@@ -431,7 +443,7 @@ void ReadCells
CCMIOGetEntity
(
&
err
,
topology
,
kCCMIOInternalFaces
,
0
,
&
id
);
CCMIOSize
nInternalFaces
;
CCMIOEntitySize
(
&
err
,
id
,
&
nInternalFaces
,
NULL
);
CCMIOEntitySize
(
&
err
,
id
,
&
nInternalFaces
,
nullptr
);
Pout
<<
"nInternalFaces:"
<<
nInternalFaces
<<
endl
;
// Determine patch sizes before reading internal faces
...
...
@@ -439,12 +451,12 @@ void ReadCells
int
index
=
0
;
while
(
CCMIONextEntity
(
NULL
,
topology
,
kCCMIOBoundaryFaces
,
&
index
,
&
id
)
CCMIONextEntity
(
nullptr
,
topology
,
kCCMIOBoundaryFaces
,
&
index
,
&
id
)
==
kCCMIONoErr
)
{
CCMIOSize
size
;
CCMIOEntitySize
(
&
err
,
id
,
&
size
,
NULL
);
CCMIOEntitySize
(
&
err
,
id
,
&
size
,
nullptr
);
Pout
<<
"Read kCCMIOBoundaryFaces entry with "
<<
size
<<
" faces."
<<
endl
;
...
...
@@ -463,10 +475,10 @@ void ReadCells
mapData
.
resize
(
nInternalFaces
);
CCMIOGetEntity
(
&
err
,
topology
,
kCCMIOInternalFaces
,
0
,
&
id
);
CCMIOSize
size
;
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOInternalFaces
,
NULL
,
&
size
,
NULL
,
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOInternalFaces
,
nullptr
,
&
size
,
nullptr
,
kCCMIOStart
,
kCCMIOEnd
);
std
::
vector
<
int
>
faces
(
size
);
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOInternalFaces
,
&
mapID
,
NULL
,
&
faces
[
0
],
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOInternalFaces
,
&
mapID
,
nullptr
,
&
faces
[
0
],
kCCMIOStart
,
kCCMIOEnd
);
std
::
vector
<
int
>
faceCells
(
2
*
nInternalFaces
);
CCMIOReadFaceCells
(
&
err
,
id
,
kCCMIOInternalFaces
,
&
faceCells
[
0
],
...
...
@@ -503,22 +515,38 @@ void ReadCells
label
regionI
=
0
;
while
(
CCMIONextEntity
(
NULL
,
topology
,
kCCMIOBoundaryFaces
,
&
index
,
&
id
)
CCMIONextEntity
(
nullptr
,
topology
,
kCCMIOBoundaryFaces
,
&
index
,
&
id
)
==
kCCMIONoErr
)
{
CCMIOSize
nFaces
;
CCMIOEntitySize
(
&
err
,
id
,
&
nFaces
,
NULL
);
CCMIOEntitySize
(
&
err
,
id
,
&
nFaces
,
nullptr
);
mapData
.
resize
(
nFaces
);
faceCells
.
resize
(
nFaces
);
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOBoundaryFaces
,
NULL
,
&
size
,
NULL
,
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOBoundaryFaces
,
nullptr
,
&
size
,
nullptr
,
kCCMIOStart
,
kCCMIOEnd
);
faces
.
resize
(
size
);
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOBoundaryFaces
,
&
mapID
,
NULL
,
&
faces
[
0
],
kCCMIOStart
,
kCCMIOEnd
);
CCMIOReadFaceCells
(
&
err
,
id
,
kCCMIOBoundaryFaces
,
&
faceCells
[
0
],
kCCMIOStart
,
kCCMIOEnd
);
CCMIOReadFaces
(
&
err
,
id
,
kCCMIOBoundaryFaces
,
&
mapID
,
nullptr
,
&
faces
[
0
],
kCCMIOStart
,
kCCMIOEnd
);
CCMIOReadFaceCells
(
&
err
,
id
,
kCCMIOBoundaryFaces
,
&
faceCells
[
0
],
kCCMIOStart
,
kCCMIOEnd
);
CCMIOReadMap
(
&
err
,
mapID
,
&
mapData
[
0
],
kCCMIOStart
,
kCCMIOEnd
);
CheckError
(
err
,
"Error reading boundary faces"
);
...
...
@@ -526,7 +554,7 @@ void ReadCells
int
prostarI
;
if
(
CCMIOReadOpti
(
NULL
,
id
,
"ProstarRegionNumber"
,
&
prostarI
)
CCMIOReadOpti
(
nullptr
,
id
,
"ProstarRegionNumber"
,
&
prostarI
)
==
kCCMIONoErr
)
{
...
...
@@ -639,12 +667,12 @@ int main(int argc, char *argv[])
}
// Open the file. Because we did not initialize 'err' we need to pass
// in
NULL
(which always means kCCMIONoErr) and then assign the
return
// value to 'err'.).
// in
nullptr
(which always means kCCMIONoErr) and then assign the
//
return
value to 'err'.).
CCMIOID
root
;
CCMIOError
err
=
CCMIOOpenFile
(
NULL
,
nullptr
,
ccmFile
.
c_str
(),
kCCMIORead
,
&
root
...
...
@@ -659,9 +687,9 @@ int main(int argc, char *argv[])
CheckError
(
err
,
"Error opening state"
);
unsigned
int
size
;
CCMIOEntityDescription
(
&
err
,
state
,
&
size
,
NULL
);
CCMIOEntityDescription
(
&
err
,
state
,
&
size
,
nullptr
);
char
*
desc
=
new
char
[
size
+
1
];
CCMIOEntityDescription
(
&
err
,
state
,
NULL
,
desc
);
CCMIOEntityDescription
(
&
err
,
state
,
nullptr
,
desc
);
Pout
<<
"Reading state '"
<<
kDefaultState
<<
"' ("
<<
desc
<<
")"
<<
endl
;
delete
[]
desc
;
...
...
@@ -678,7 +706,7 @@ int main(int argc, char *argv[])
processor
,
&
vertices
,
&
topology
,
NULL
,
nullptr
,
&
solution
);
...
...
@@ -692,8 +720,8 @@ int main(int argc, char *argv[])
processor
,
&
vertices
,
&
topology
,
NULL
,
NULL
nullptr
,
nullptr
);
if
(
err
!=
kCCMIONoErr
)
{
...
...
applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C
View file @
58f905ff
...
...
@@ -47,7 +47,7 @@ cellShape extrudedQuadCellShape
faceList
&
frontAndBackFaces
)
{
static
const
cellModel
*
hexModelPtr_
=
NULL
;
static
const
cellModel
*
hexModelPtr_
=
nullptr
;
if
(
!
hexModelPtr_
)
{
...
...
applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C
View file @
58f905ff
...
...
@@ -48,7 +48,7 @@ cellShape extrudedTriangleCellShape
faceList
&
frontAndBackFaces
)
{
static
const
cellModel
*
prismModelPtr_
=
NULL
;
static
const
cellModel
*
prismModelPtr_
=
nullptr
;
if
(
!
prismModelPtr_
)
{
...
...
Prev
1
2
3
4
5
…
19
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment