STYLE: surface/volume writing function objects

- further hide implementation (cxx ending)

STYLE: better distinction between code/templates for fileFormats/conversion

- for ensight and vtk, a large part of the code is header only.
  Make this easier to identify

src/conversion/Make/files

@@ -16,6 +16,6 @@ starcd/STARCDMeshWriter.C
 
 polyDualMesh/polyDualMesh.C
 
-vtk/output/foamVtkSurfaceFieldWriter.C
+vtk/output/foamVtkSurfaceFieldWriter.cxx
 
 LIB = $(FOAM_LIBBIN)/libconversion

src/conversion/ensight/output/ensightOutputAreaField.H

@@ -98,7 +98,7 @@ bool writeAreaField
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightOutputAreaFieldTemplates.C"
+    #include "ensightOutputAreaField.txx"
 #endif
 
 #endif

src/conversion/ensight/output/ensightOutputVolField.H

@@ -177,7 +177,7 @@ bool writePointField
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightOutputVolFieldTemplates.C"
+    #include "ensightOutputVolField.txx"
 #endif
 
 #endif

src/conversion/vtk/adaptor/foamVtkTools.H

@@ -39,7 +39,7 @@ Note
 
 SourceFiles
     foamVtkToolsI.H
-    foamVtkToolsTemplates.C
+    foamVtkTools.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -358,7 +358,7 @@ void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(double data[])
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkToolsTemplates.C"
+    #include "foamVtkTools.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/conversion/vtk/adaptor/foamVtkVtuAdaptor.H

@@ -39,7 +39,7 @@ Note
 
 SourceFiles
     foamVtkVtuAdaptorI.H
-    foamVtkVtuAdaptorTemplates.C
+    foamVtkVtuAdaptor.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -156,7 +156,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkVtuAdaptorTemplates.C"
+    #include "foamVtkVtuAdaptor.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.H

@@ -32,7 +32,7 @@ Description
     Caution, currently only works properly for indirect patches.
 
 SourceFiles
-    foamVtkGenericPatchGeoFieldsWriter.C
+    foamVtkGenericPatchGeoFieldsWriter.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -117,7 +117,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkGenericPatchGeoFieldsWriter.C"
+    #include "foamVtkGenericPatchGeoFieldsWriter.txx"
 #endif
 
 

src/conversion/vtk/output/foamVtkInternalWriter.H

@@ -44,7 +44,7 @@ See Also
     Foam::vtk::internalMeshWriter
 
 SourceFiles
-    foamVtkInternalWriterTemplates.C
+    foamVtkInternalWriter.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -183,7 +183,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkInternalWriterTemplates.C"
+    #include "foamVtkInternalWriter.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/conversion/vtk/output/foamVtkPatchWriter.H

@@ -43,7 +43,7 @@ See Also
     Foam::vtk::patchMeshWriter
 
 SourceFiles
-    foamVtkPatchWriterTemplates.C
+    foamVtkPatchWriter.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -202,7 +202,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkPatchWriterTemplates.C"
+    #include "foamVtkPatchWriter.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/conversion/vtk/output/foamVtkSurfaceFieldWriter.H

@@ -47,7 +47,7 @@ Note
     may be addressed using ghost points.
 
 SourceFiles
-    surfaceFieldWriter.C
+    foamVtkSurfaceFieldWriter.cxx
 
 \*---------------------------------------------------------------------------*/
 

src/fileFormats/ensight/file/ensightCase.H

@@ -34,7 +34,7 @@ SourceFiles
     ensightCase.C
     ensightCaseI.H
     ensightCaseOptions.C
-    ensightCaseTemplates.C
+    ensightCase.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -548,7 +548,7 @@ public:
 #include "ensightCaseI.H"
 
 #ifdef NoRepository
-    #include "ensightCaseTemplates.C"
+    #include "ensightCase.txx"
 #endif
 
 #endif

src/fileFormats/ensight/file/ensightFile.H

@@ -394,7 +394,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightFileTemplates.C"
+    #include "ensightFile.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/fileFormats/ensight/output/ensightOutput.H

@@ -31,7 +31,7 @@ Description
 
 SourceFiles
     ensightOutput.C
-    ensightOutputTemplates.C
+    ensightOutput.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -557,7 +557,7 @@ bool writeFaceLocalField
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightOutputTemplates.C"
+    #include "ensightOutput.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/fileFormats/ensight/part/surface/ensightOutputSurface.H

@@ -38,7 +38,7 @@ Note
 
 SourceFiles
     ensightOutputSurface.C
-    ensightOutputSurfaceTemplates.C
+    ensightOutputSurface.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -136,7 +136,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightOutputSurfaceTemplates.C"
+    #include "ensightOutputSurface.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/fileFormats/vtk/file/foamVtkFileWriter.H

@@ -42,8 +42,8 @@ Description
 
 SourceFiles
     foamVtkFileWriter.C
+    foamVtkFileWriter.txx
     foamVtkFileWriterI.H
-    foamVtkFileWriterTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -350,7 +350,7 @@ public:
 #include "foamVtkFileWriterI.H"
 
 #ifdef NoRepository
-    #include "foamVtkFileWriterTemplates.C"
+    #include "foamVtkFileWriter.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/fileFormats/vtk/format/foamVtkFormatter.H

@@ -34,7 +34,8 @@ Description
 
 SourceFiles
     foamVtkFormatter.C
-    foamVtkFormatterTemplates.C
+    foamVtkFormatter.txx
+    foamVtkFormatterI.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -560,7 +561,7 @@ inline uint64_t sizeofData(label count)
 #include "foamVtkFormatterI.H"
 
 #ifdef NoRepository
-    #include "foamVtkFormatterTemplates.C"
+    #include "foamVtkFormatter.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/fileFormats/vtk/output/foamVtkOutput.H

@@ -38,7 +38,8 @@ Description
 
 SourceFiles
     foamVtkOutput.C
-    foamVtkOutputTemplates.C
+    foamVtkOutput.txx
+    foamVtkOutputI.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -352,7 +353,7 @@ namespace legacy
 #include "foamVtkOutputI.H"
 
 #ifdef NoRepository
-    #include "foamVtkOutputTemplates.C"
+    #include "foamVtkOutput.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/fileFormats/vtk/read/vtkUnstructuredReader.H

@@ -358,7 +358,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "vtkUnstructuredReaderTemplates.C"
+    #include "vtkUnstructuredReader.txx"
 #endif
 
 

src/fileFormats/vtk/write/foamVtkPolyWriter.H

@@ -42,7 +42,7 @@ Note
 
 SourceFiles
     foamVtkPolyWriter.C
-    foamVtkPolyWriterTemplates.C
+    foamVtkPolyWriter.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -253,7 +253,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkPolyWriterTemplates.C"
+    #include "foamVtkPolyWriter.txx"
 #endif
 
 

src/functionObjects/lagrangian/Make/files

@@ -4,7 +4,7 @@ cloudInfo/cloudInfo.C
 icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C
 dsmcFields/dsmcFields.C
 
-vtkCloud/vtkCloud.C
+vtkCloud/vtkCloud.cxx
 ensightCloud/ensightCloudWriteObject.cxx
 
 LIB = $(FOAM_LIBBIN)/liblagrangianFunctionObjects

src/functionObjects/lagrangian/vtkCloud/vtkCloud.H

@@ -129,8 +129,8 @@ See also
     Foam::functionObjects::timeControl
 
 SourceFiles
-    vtkCloud.C
-    vtkCloudTemplates.C
+    vtkCloud.cxx
+    vtkCloudImpl.cxx
 
 \*---------------------------------------------------------------------------*/
 
@@ -262,12 +262,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "vtkCloudTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //

src/functionObjects/lagrangian/vtkCloud/vtkCloud.cxx

@@ -47,6 +47,12 @@ namespace functionObjects
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Implementation
+#include "vtkCloudImpl.cxx"
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::functionObjects::vtkCloud::writeVerts

src/functionObjects/utilities/Make/files

@@ -4,10 +4,10 @@ caseInfo/caseInfo.C
 
 codedFunctionObject/codedFunctionObject.C
 
-areaWrite/areaWrite.C
+areaWrite/areaWrite.cxx
 
-ensightWrite/ensightWrite.C
-ensightWrite/ensightWriteUpdate.C
+ensightWrite/ensightWrite.cxx
+ensightWrite/ensightWriteUpdate.cxx
 
 foamReport/foamReport.C
 foamReport/substitutionModels/substitutionModel/substitutionModel.C
@@ -20,8 +20,8 @@ foamReport/substitutionModels/userValue/userValue.C
 
 graphFunctionObject/graphFunctionObject.C
 
-vtkWrite/vtkWrite.C
-vtkWrite/vtkWriteUpdate.C
+vtkWrite/vtkWrite.cxx
+vtkWrite/vtkWriteUpdate.cxx
 
 multiRegion/multiRegion.C
 

src/functionObjects/utilities/areaWrite/areaWrite.H

@@ -72,8 +72,8 @@ Usage
       libs     | Library name: utilityFunctionObjects | word | yes | -
       fields   | Name of operand fields             | wordRes | yes | -
       surfaceFormat | Output surface format         | word | yes | -
-      areas   | Names of multiple areas             | wordRes | no  | -
-      area    | Name of the selected area           | word | no  | -
+      areas   | Names of finite-area regions        | wordRes | no  | -
+      area    | Name of finite-area region          | word | no  | -
       formatOptions | Dictionary of format options  | dict | no  | -
     \endtable
 
@@ -82,8 +82,8 @@ Usage
       - \link surfaceWriter.H \endlink
 
 SourceFiles
-    areaWrite.C
-    areaWriteTemplates.C
+    areaWrite.cxx
+    areaWriteImpl.cxx
 
 \*---------------------------------------------------------------------------*/
 
@@ -95,7 +95,6 @@ SourceFiles
 #include "areaFieldsFwd.H"
 #include "surfaceWriter.H"
 #include "HashPtrTable.H"
-#include "IOobjectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -105,6 +104,7 @@ namespace Foam
 // Forward Declarations
 class faMesh;
 class polySurface;
+class IOobjectList;
 
 /*---------------------------------------------------------------------------*\
                           Class areaWrite Declaration
@@ -145,7 +145,7 @@ class areaWrite
 
         //- Hold intermediate surfaces.
         //  The faMesh has an indirect face list but we require real ones.
-        autoPtr<objectRegistry> surfaces_;
+        std::unique_ptr<objectRegistry> surfaces_;
 
 
     // Output control
@@ -156,6 +156,9 @@ class areaWrite
 
     // Private Member Functions
 
+        //- Mark intermediate surfaces and writers as needing an update.
+        void expire();
+
         //- Write fieldName on surface and on outputDir path.
         //  Can have a field nullptr for partially missing fields,
         //  but the caller should generally filter out completely
@@ -177,8 +180,13 @@ class areaWrite
             const IOobjectList& objects
         );
 
-        //- Mark intermediate surfaces and writers as needing an update.
-        void expire();
+public:
+
+    //- Runtime type information
+    TypeName("areaWrite");
+
+
+    // Generated Methods
 
         //- No copy construct
         areaWrite(const areaWrite&) = delete;
@@ -187,12 +195,6 @@ class areaWrite
         void operator=(const areaWrite&) = delete;
 
 
-public:
-
-    //- Runtime type information
-    TypeName("areaWrite");
-
-
     // Constructors
 
         //- Construct from name, Time and dictionary
@@ -215,14 +217,14 @@ public:
 
 
     //- Destructor
-    virtual ~areaWrite() = default;
+    virtual ~areaWrite();
 
 
     // Member Functions
 
         //- Enable/disable verbose output
         //  \return old value
-        bool verbose(const bool on) noexcept;
+        bool verbose(bool on) noexcept;
 
         //- Read the function-object dictionary
         virtual bool read(const dictionary& dict);
@@ -246,7 +248,7 @@ public:
         static scalar mergeTol() noexcept;
 
         //- Set merge tolerance and return old value
-        static scalar mergeTol(const scalar tol) noexcept;
+        static scalar mergeTol(scalar tol) noexcept;
 };
 
 

src/functionObjects/utilities/areaWrite/areaWrite.cxx

@@ -28,11 +28,13 @@ License
 #include "areaWrite.H"
 #include "polySurface.H"
 
+#include "faMesh.H"
 #include "fvMesh.H"
 #include "mapPolyMesh.H"
 #include "areaFields.H"
 #include "HashOps.H"
 #include "ListOps.H"
+#include "IOobjectList.H"
 #include "Time.H"
 #include "IndirectList.H"
 #include "addToRunTimeSelectionTable.H"
@@ -55,7 +57,7 @@ Foam::scalar Foam::areaWrite::mergeTol_ = 1e-10;
 
 
 // Implementation
-#include "areaWriteImpl.C"
+#include "areaWriteImpl.cxx"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -72,12 +74,7 @@ Foam::areaWrite::areaWrite
     outputPath_
     (
         time_.globalPath()/functionObject::outputPrefix/name
-    ),
-    selectAreas_(),
-    fieldSelection_(),
-    meshes_(),
-    surfaces_(nullptr),
-    writers_()
+    )
 {
     outputPath_.clean();  // Remove unneeded ".."
 
@@ -99,12 +96,7 @@ Foam::areaWrite::areaWrite
     outputPath_
     (
         time_.globalPath()/functionObject::outputPrefix/name
-    ),
-    selectAreas_(),
-    fieldSelection_(),
-    meshes_(),
-    surfaces_(nullptr),
-    writers_()
+    )
 {
     outputPath_.clean();  // Remove unneeded ".."
 
@@ -112,9 +104,15 @@ Foam::areaWrite::areaWrite
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::areaWrite::~areaWrite()
+{}  // Define here: header had forward declared classes
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::areaWrite::verbose(const bool on) noexcept
+bool Foam::areaWrite::verbose(bool on) noexcept
 {
     bool old(verbose_);
     verbose_ = on;
@@ -393,6 +391,7 @@ bool Foam::areaWrite::write()
 
 void Foam::areaWrite::expire()
 {
+    // Clear the registry contents
     surfaces_->clear();
 
     // Dimension as fraction of mesh bounding box
@@ -434,13 +433,15 @@ void Foam::areaWrite::readUpdate(const polyMesh::readUpdateState state)
 }
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
 Foam::scalar Foam::areaWrite::mergeTol() noexcept
 {
     return mergeTol_;
 }
 
 
-Foam::scalar Foam::areaWrite::mergeTol(const scalar tol) noexcept
+Foam::scalar Foam::areaWrite::mergeTol(scalar tol) noexcept
 {
     scalar old(mergeTol_);
     mergeTol_ = tol;

src/functionObjects/utilities/areaWrite/areaWriteImpl.cxx

@@ -25,10 +25,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "areaWrite.H"
-#include "areaFields.H"
-#include "faMesh.H"
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>

src/functionObjects/utilities/ensightWrite/ensightWrite.H

@@ -135,8 +135,8 @@ See also
 
 SourceFiles
     ensightWrite.C
-    ensightWriteImpl.C
-    ensightWriteUpdate.C
+    ensightWriteImpl.cxx
+    ensightWriteUpdate.cxx
 
 \*---------------------------------------------------------------------------*/
 
@@ -158,10 +158,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward Declarations
-class dictionary;
-
 namespace functionObjects
 {
 
@@ -173,7 +169,7 @@ class ensightWrite
 :
     public fvMeshFunctionObject
 {
-    // Private data
+    // Private Data
 
         //- Ensight writer options
         ensightMesh::options writeOpts_;
@@ -188,7 +184,7 @@ class ensightWrite
         bool consecutive_;
 
         //- Track changes in mesh geometry
-        enum polyMesh::readUpdateState meshState_;
+        polyMesh::readUpdateState meshState_;
 
         //- Requested selection of fields to process
         wordRes selectFields_;
@@ -212,16 +208,10 @@ class ensightWrite
     // Private Member Functions
 
         //- Ensight case handler
-        ensightCase& ensCase()
-        {
-            return *ensCase_;
-        }
+        ensightCase& ensCase() { return *ensCase_; }
 
         //- Ensight mesh handler
-        ensightMesh& ensMesh()
-        {
-            return *ensMesh_;
-        }
+        ensightMesh& ensMesh() { return *ensMesh_; }
 
 
         //- Update mesh subset according to zones, geometry, bounds
@@ -252,13 +242,6 @@ class ensightWrite
             const wordHashSet& candidateNames
         );
 
-        //- No copy construct
-        ensightWrite(const ensightWrite&) = delete;
-
-        //- No copy assignment
-        void operator=(const ensightWrite&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -275,6 +258,12 @@ public:
             const dictionary& dict
         );
 
+        //- No copy construct
+        ensightWrite(const ensightWrite&) = delete;
+
+        //- No copy assignment
+        void operator=(const ensightWrite&) = delete;
+
 
     //- Destructor
     virtual ~ensightWrite() = default;

src/functionObjects/utilities/ensightWrite/ensightWrite.cxx

@@ -49,7 +49,7 @@ namespace functionObjects
 }
 
 // Implementation
-#include "ensightWriteImpl.C"
+#include "ensightWriteImpl.cxx"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -96,17 +96,10 @@ Foam::functionObjects::ensightWrite::ensightWrite
 )
 :
     fvMeshFunctionObject(name, runTime, dict),
-    writeOpts_(),
     caseOpts_("format", dict, IOstreamOption::BINARY),
-    outputDir_(),
     consecutive_(false),
     meshState_(polyMesh::TOPO_CHANGE),
-    selectFields_(),
-    blockFields_(),
-    selection_(),
-    meshSubset_(mesh_),
-    ensCase_(nullptr),
-    ensMesh_(nullptr)
+    meshSubset_(mesh_)
 {
     // May still want this? (OCT-2018)
     // if (postProcess)

src/functionObjects/utilities/vtkWrite/vtkWrite.H

@@ -130,8 +130,9 @@ See also
     Foam::cellBitSet::select
 
 SourceFiles
-    vtkWrite.C
-    vtkWriteImpl.C
+    vtkWrite.cxx
+    vtkWriteImpl.cxx
+    vtkWriteUpdate.cxx
 
 \*---------------------------------------------------------------------------*/
 
@@ -193,7 +194,7 @@ class vtkWrite
         bool writeIds_;
 
         //- Track changes in mesh geometry
-        enum polyMesh::readUpdateState meshState_;
+        polyMesh::readUpdateState meshState_;
 
         //- Requested names of regions to process
         wordRes selectRegions_;
@@ -294,13 +295,6 @@ class vtkWrite
         ) const;
 
 
-        //- No copy construct
-        vtkWrite(const vtkWrite&) = delete;
-
-        //- No copy assignment
-        void operator=(const vtkWrite&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -317,6 +311,12 @@ public:
             const dictionary& dict
         );
 
+        //- No copy construct
+        vtkWrite(const vtkWrite&) = delete;
+
+        //- No copy assignment
+        void operator=(const vtkWrite&) = delete;
+
 
     //- Destructor
     virtual ~vtkWrite() = default;

src/functionObjects/utilities/vtkWrite/vtkWrite.cxx

@@ -49,7 +49,7 @@ namespace functionObjects
 
 
 // Implementation
-#include "vtkWriteImpl.C"
+#include "vtkWriteImpl.cxx"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -134,8 +134,6 @@ Foam::functionObjects::vtkWrite::vtkWrite
 )
 :
     timeFunctionObject(name, runTime),
-    outputDir_(),
-    printf_(),
     writeOpts_(vtk::formatType::INLINE_BASE64),
     verbose_(true),
     doInternal_(true),
@@ -144,17 +142,7 @@ Foam::functionObjects::vtkWrite::vtkWrite
     interpolate_(false),
     decompose_(false),
     writeIds_(false),
-    meshState_(polyMesh::TOPO_CHANGE),
-    selectRegions_(),
-    selectPatches_(),
-    blockPatches_(),
-    selectFields_(),
-    blockFields_(),
-    selection_(),
-    meshes_(),
-    meshSubsets_(),
-    vtuMappings_(),
-    series_()
+    meshState_(polyMesh::TOPO_CHANGE)
 {
     // May still want this? (OCT-2018)
     // if (postProcess)

src/lagrangian/intermediate/Make/files

@@ -126,8 +126,8 @@ submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.C
 submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
 
 /* conversion methods */
-conversion/ensight/ensightOutputCloud.C
-conversion/vtk/foamVtkLagrangianWriter.C
+conversion/ensight/ensightOutputCloud.cxx
+conversion/vtk/foamVtkLagrangianWriter.cxx
 
 
 LIB = $(FOAM_LIBBIN)/liblagrangianIntermediate

src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.H

@@ -30,8 +30,8 @@ Description
     A collection of functions for writing clouds as ensight file content.
 
 SourceFiles
-    ensightOutputCloud.C
-    ensightOutputCloudTemplates.C
+    ensightOutputCloud.cxx
+    ensightOutputCloud.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -181,7 +181,7 @@ label writeCloudFieldContent
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightOutputCloudTemplates.C"
+    #include "ensightOutputCloud.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.H

@@ -40,8 +40,8 @@ Note
     must be decided at construction time.
 
 SourceFiles
-    lagrangianWriter.C
-    lagrangianWriterTemplates.C
+    foamVtkLagrangianWriter.cxx
+    foamVtkLagrangianWriter.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -229,7 +229,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkLagrangianWriterTemplates.C"
+    #include "foamVtkLagrangianWriter.txx"
 #endif
 
 

src/meshTools/Make/files

@@ -344,8 +344,8 @@ meshStructure/meshStructure.C
 coupling/externalFileCoupler.C
 
 vtk = output/vtk
-$(vtk)/mesh/foamVtkInternalMeshWriter.C
-$(vtk)/patch/foamVtkPatchMeshWriter.C
+$(vtk)/mesh/foamVtkInternalMeshWriter.cxx
+$(vtk)/patch/foamVtkPatchMeshWriter.cxx
 $(vtk)/topoSet/foamVtkWriteTopoSet.C
 $(vtk)/topoSet/foamVtkWriteFaceSet.C
 $(vtk)/topoSet/foamVtkWritePointSet.C

src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.H

@@ -44,8 +44,8 @@ See Also
     Foam::vtk::internalWriter
 
 SourceFiles
-    foamVtkInternalMeshWriter.C
-    foamVtkInternalMeshWriterTemplates.C
+    foamVtkInternalMeshWriter.cxx
+    foamVtkInternalMeshWriter.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -240,7 +240,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkInternalMeshWriterTemplates.C"
+    #include "foamVtkInternalMeshWriter.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H

@@ -43,8 +43,8 @@ See Also
     Foam::vtk::patchWriter
 
 SourceFiles
-    foamVtkPatchMeshWriter.C
-    foamVtkPatchMeshWriterTemplates.C
+    foamVtkPatchMeshWriter.cxx
+    foamVtkPatchMeshWriter.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -234,7 +234,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "foamVtkPatchMeshWriterTemplates.C"
+    #include "foamVtkPatchMeshWriter.txx"
 #endif
 
 

src/surfMesh/readers/boundary/boundaryDataSurfaceReader.H

@@ -55,7 +55,7 @@ Description
 
 SourceFiles
     boundaryDataSurfaceReader.C
-    boundaryDataSurfaceReaderTemplates.C
+    boundaryDataSurfaceReader.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -242,7 +242,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "boundaryDataSurfaceReaderTemplates.C"
+    #include "boundaryDataSurfaceReader.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/surfMesh/readers/ensight/ensightSurfaceReader.H

@@ -49,7 +49,7 @@ Description
 
 SourceFiles
     ensightSurfaceReader.C
-    ensightSurfaceReaderTemplates.C
+    ensightSurfaceReader.txx
 
 \*---------------------------------------------------------------------------*/
 
@@ -285,7 +285,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightSurfaceReaderTemplates.C"
+    #include "ensightSurfaceReader.txx"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //