diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C index cebe442ca0..3698b2e954 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C @@ -164,7 +164,7 @@ Note // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -void print(const char* msg, Ostream& os, const PtrList& flds) +void print(const char* msg, Ostream& os, const PtrList& 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 vsf; - PtrList vvf; - PtrList vSpheretf; - PtrList vSymmtf; - PtrList vtf; + PtrList vsf; + PtrList vvf; + PtrList vSpheretf; + PtrList vSymmtf; + PtrList vtf; if (!specifiedFields || selectedFields.size()) { @@ -612,11 +613,11 @@ int main(int argc, char *argv[]) << " (\"-noPointValues\" (at your option)\n"; } - PtrList psf; - PtrList pvf; - PtrList pSpheretf; - PtrList pSymmtf; - PtrList ptf; + PtrList psf; + PtrList pvf; + PtrList pSpheretf; + PtrList pSymmtf; + PtrList ptf; if (!noPointValues && !(specifiedFields && selectedFields.empty())) { @@ -747,7 +748,7 @@ int main(int argc, char *argv[]) if (args.optionFound("surfaceFields")) { - PtrList ssf; + PtrList ssf; readFields ( vMesh, @@ -758,7 +759,7 @@ int main(int argc, char *argv[]) ); print(" surfScalarFields :", Info, ssf); - PtrList svf; + PtrList 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 ssf; + PtrList ssf; readFields ( vMesh, @@ -1001,7 +1003,7 @@ int main(int argc, char *argv[]) ); print(" surfScalarFields :", Info, ssf); - PtrList svf; + PtrList svf; readFields ( vMesh, diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H index 4da03b6d73..54ec3168f7 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H @@ -91,7 +91,7 @@ public: template class PatchField, class GeoMesh> void write ( - const PtrList>& + const UPtrList>& ); //- Interpolate and write volFields @@ -99,7 +99,7 @@ public: void write ( const volPointInterpolation&, - const PtrList>& + const UPtrList>& ); }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C index cdc7ad9720..a90eaaa712 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C @@ -31,7 +31,7 @@ License template class PatchField, class GeoMesh> void Foam::internalWriter::write ( - const PtrList>& flds + const UPtrList>& flds ) { forAll(flds, i) @@ -45,7 +45,7 @@ template void Foam::internalWriter::write ( const volPointInterpolation& pInterp, - const PtrList>& flds + const UPtrList>& flds ) { forAll(flds, i) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H index f0880c9903..e25bbb1122 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H @@ -114,14 +114,17 @@ public: template void write ( - const PtrList>& + const UPtrList>& ); //- Write pointFields template void write ( - const PtrList>& + const UPtrList + < + const GeometricField + >& ); //- Interpolate and write volFields @@ -129,7 +132,7 @@ public: void write ( const PrimitivePatchInterpolation&, - const PtrList>& + const UPtrList>& ); }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C index 192f7ca2c1..e67aa4c835 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C @@ -31,14 +31,14 @@ License template void Foam::patchWriter::write ( - const PtrList>& flds + const UPtrList>& flds ) { forAll(flds, fieldi) { const GeometricField& fld = flds[fieldi]; - os_ << fld.name() << ' ' << pTraits::nComponents << ' ' + os_ << fld.name() << ' ' << int(pTraits::nComponents) << ' ' << nFaces_ << " float" << std::endl; DynamicList fField(pTraits::nComponents*nFaces_); @@ -66,7 +66,7 @@ void Foam::patchWriter::write template void Foam::patchWriter::write ( - const PtrList>& flds + const UPtrList>& flds ) { forAll(flds, fieldi) @@ -74,7 +74,7 @@ void Foam::patchWriter::write const GeometricField& fld = flds[fieldi]; - os_ << fld.name() << ' ' << pTraits::nComponents << ' ' + os_ << fld.name() << ' ' << int(pTraits::nComponents) << ' ' << nPoints_ << " float" << std::endl; DynamicList fField(pTraits::nComponents*nPoints_); @@ -96,14 +96,14 @@ template void Foam::patchWriter::write ( const PrimitivePatchInterpolation& pInter, - const PtrList>& flds + const UPtrList>& flds ) { forAll(flds, fieldi) { const GeometricField& fld = flds[fieldi]; - os_ << fld.name() << ' ' << pTraits::nComponents << ' ' + os_ << fld.name() << ' ' << int(pTraits::nComponents) << ' ' << nPoints_ << " float" << std::endl; DynamicList fField(pTraits::nComponents*nPoints_); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C index 6c27883787..8d515ab056 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C @@ -40,7 +40,7 @@ void readFields const typename GeoField::Mesh& mesh, const IOobjectList& objects, const HashSet& selectedFields, - PtrList& fields + PtrList& fields ) { // Search list of objects for volScalarFields @@ -64,7 +64,7 @@ void readFields *iter(), mesh ) - ) + ).ptr() ); nFields++; } diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H index 118801a309..31b7e2632c 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H @@ -52,7 +52,7 @@ void readFields const typename GeoField::Mesh& mesh, const IOobjectList& objects, const HashSet& selectedFields, - PtrList& fields + PtrList& fields ); } // End namespace Foam diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H index 2520badad0..f06da45c3f 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H @@ -99,7 +99,10 @@ public: template void write ( - const PtrList>& + const UPtrList + < + const GeometricField + >& ); }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C index b36d401ac4..b7e96e3970 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C @@ -63,7 +63,10 @@ Foam::tmp> Foam::surfaceMeshWriter::getFaceField template void Foam::surfaceMeshWriter::write ( - const PtrList>& sflds + const UPtrList + < + const GeometricField + >& sflds ) { forAll(sflds, fieldi) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C index 4dcf09ae2c..137dc10e9a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C @@ -74,7 +74,7 @@ void Foam::writeFuns::write label nValues = mesh.nCells() + superCells.size(); - os << vvf.name() << ' ' << pTraits::nComponents << ' ' + os << vvf.name() << ' ' << int(pTraits::nComponents) << ' ' << nValues << " float" << std::endl; DynamicList fField(pTraits::nComponents*nValues); @@ -106,7 +106,7 @@ void Foam::writeFuns::write const labelList& addPointCellLabels = topo.addPointCellLabels(); const label nTotPoints = mesh.nPoints() + addPointCellLabels.size(); - os << pvf.name() << ' ' << pTraits::nComponents << ' ' + os << pvf.name() << ' ' << int(pTraits::nComponents) << ' ' << nTotPoints << " float" << std::endl; DynamicList fField(pTraits::nComponents*nTotPoints); @@ -139,7 +139,7 @@ void Foam::writeFuns::write const labelList& addPointCellLabels = topo.addPointCellLabels(); const label nTotPoints = mesh.nPoints() + addPointCellLabels.size(); - os << vvf.name() << ' ' << pTraits::nComponents << ' ' + os << vvf.name() << ' ' << int(pTraits::nComponents) << ' ' << nTotPoints << " float" << std::endl; DynamicList fField(pTraits::nComponents*nTotPoints); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C index 62381e65d2..4144a579a5 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C @@ -30,19 +30,14 @@ License #include "emptyFvsPatchFields.H" #include "fvsPatchFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // -void writeSurfFields +void Foam::writeSurfFields ( const bool binary, const vtkMesh& vMesh, const fileName& fileName, - const PtrList& surfVectorFields + const UPtrList& surfVectorFields ) { const fvMesh& mesh = vMesh.mesh(); @@ -117,8 +112,4 @@ void writeSurfFields } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H index 0d1f5ecd4c..798e335fd3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H @@ -50,7 +50,7 @@ void writeSurfFields const bool binary, const vtkMesh& vMesh, const fileName& fileName, - const PtrList& surfVectorFields + const UPtrList& surfVectorFields ); } // End namespace Foam