zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

foamToVTK: Use UPtrList rather than PtrList

Browse Source
This commit is contained in:
Henry Weller
2016-05-06 14:11:38 +01:00
parent 5f95885a1a
commit 28c753f52e
12 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -164,7 +164,7 @@ Note
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class GeoField>
void print(const char* msg, Ostream& os, const PtrList<GeoField>& flds)
void print(const char* msg, Ostream& os, const PtrList<const GeoField>& flds)
{
if (flds.size())
{
@ -396,6 +396,7 @@ int main(int argc, char *argv[])
// VTK/ directory in the case
fileName fvPath(runTime.path()/"VTK");
// Directory of mesh (region0 gets filtered out)
fileName regionPrefix = "";
@ -556,11 +557,11 @@ int main(int argc, char *argv[])
// Construct the vol fields (on the original mesh if subsetted)
PtrList<volScalarField> vsf;
PtrList<volVectorField> vvf;
PtrList<volSphericalTensorField> vSpheretf;
PtrList<volSymmTensorField> vSymmtf;
PtrList<volTensorField> vtf;
PtrList<const volScalarField> vsf;
PtrList<const volVectorField> vvf;
PtrList<const volSphericalTensorField> vSpheretf;
PtrList<const volSymmTensorField> vSymmtf;
PtrList<const volTensorField> vtf;
if (!specifiedFields || selectedFields.size())
{
@ -612,11 +613,11 @@ int main(int argc, char *argv[])
<< " (\"-noPointValues\" (at your option)\n";
}
PtrList<pointScalarField> psf;
PtrList<pointVectorField> pvf;
PtrList<pointSphericalTensorField> pSpheretf;
PtrList<pointSymmTensorField> pSymmtf;
PtrList<pointTensorField> ptf;
PtrList<const pointScalarField> psf;
PtrList<const pointVectorField> pvf;
PtrList<const pointSphericalTensorField> pSpheretf;
PtrList<const pointSymmTensorField> pSymmtf;
PtrList<const pointTensorField> ptf;
if (!noPointValues && !(specifiedFields && selectedFields.empty()))
{
@ -747,7 +748,7 @@ int main(int argc, char *argv[])
if (args.optionFound("surfaceFields"))
{
PtrList<surfaceScalarField> ssf;
PtrList<const surfaceScalarField> ssf;
readFields
(
vMesh,
@ -758,7 +759,7 @@ int main(int argc, char *argv[])
);
print(" surfScalarFields :", Info, ssf);
PtrList<surfaceVectorField> svf;
PtrList<const surfaceVectorField> svf;
readFields
(
vMesh,
@ -780,8 +781,9 @@ int main(int argc, char *argv[])
forAll(ssf, i)
{
svf.set(sz+i, ssf[i]*n);
svf[sz+i].rename(ssf[i].name());
surfaceVectorField* ssfiPtr = (ssf[i]*n).ptr();
ssfiPtr->rename(ssf[i].name());
svf.set(sz+i, ssfiPtr);
}
ssf.clear();
@ -990,7 +992,7 @@ int main(int argc, char *argv[])
if (doFaceZones)
{
PtrList<surfaceScalarField> ssf;
PtrList<const surfaceScalarField> ssf;
readFields
(
vMesh,
@ -1001,7 +1003,7 @@ int main(int argc, char *argv[])
);
print(" surfScalarFields :", Info, ssf);
PtrList<surfaceVectorField> svf;
PtrList<const surfaceVectorField> svf;
readFields
(
vMesh,