From 9223d238bd04997bf13f16e49466e03db86917b4 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 13 Aug 2025 17:59:20 +0200 Subject: [PATCH] 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 | 2 +- .../ensight/output/ensightOutputAreaField.H | 2 +- ...Templates.C => ensightOutputAreaField.txx} | 0 .../ensight/output/ensightOutputVolField.H | 2 +- ...dTemplates.C => ensightOutputVolField.txx} | 0 src/conversion/vtk/adaptor/foamVtkTools.H | 4 +-- ...amVtkToolsTemplates.C => foamVtkTools.txx} | 0 .../vtk/adaptor/foamVtkVtuAdaptor.H | 4 +-- ...aptorTemplates.C => foamVtkVtuAdaptor.txx} | 0 .../foamVtkGenericPatchGeoFieldsWriter.H | 4 +-- ...=> foamVtkGenericPatchGeoFieldsWriter.txx} | 0 .../vtk/output/foamVtkInternalWriter.H | 4 +-- ...rTemplates.C => foamVtkInternalWriter.txx} | 0 .../vtk/output/foamVtkPatchWriter.H | 4 +-- ...iterTemplates.C => foamVtkPatchWriter.txx} | 0 .../vtk/output/foamVtkSurfaceFieldWriter.H | 2 +- ...Writer.C => foamVtkSurfaceFieldWriter.cxx} | 0 src/fileFormats/ensight/file/ensightCase.H | 4 +-- ...ensightCaseTemplates.C => ensightCase.txx} | 0 src/fileFormats/ensight/file/ensightFile.H | 2 +- ...ensightFileTemplates.C => ensightFile.txx} | 0 .../ensight/output/ensightOutput.H | 4 +-- ...ghtOutputTemplates.C => ensightOutput.txx} | 0 .../part/surface/ensightOutputSurface.H | 4 +-- ...ceTemplates.C => ensightOutputSurface.txx} | 0 src/fileFormats/vtk/file/foamVtkFileWriter.H | 4 +-- ...riterTemplates.C => foamVtkFileWriter.txx} | 0 src/fileFormats/vtk/format/foamVtkFormatter.H | 5 +-- ...matterTemplates.C => foamVtkFormatter.txx} | 0 src/fileFormats/vtk/output/foamVtkOutput.H | 5 +-- ...VtkOutputTemplates.C => foamVtkOutput.txx} | 0 .../vtk/read/vtkUnstructuredReader.H | 2 +- ...rTemplates.C => vtkUnstructuredReader.txx} | 0 src/fileFormats/vtk/write/foamVtkPolyWriter.H | 4 +-- ...riterTemplates.C => foamVtkPolyWriter.txx} | 0 src/functionObjects/lagrangian/Make/files | 2 +- .../lagrangian/vtkCloud/vtkCloud.H | 10 ++---- .../vtkCloud/{vtkCloud.C => vtkCloud.cxx} | 6 ++++ .../{vtkCloudTemplates.C => vtkCloudImpl.cxx} | 0 src/functionObjects/utilities/Make/files | 10 +++--- .../utilities/areaWrite/areaWrite.H | 36 ++++++++++--------- .../areaWrite/{areaWrite.C => areaWrite.cxx} | 31 ++++++++-------- .../{areaWriteImpl.C => areaWriteImpl.cxx} | 4 --- .../utilities/ensightWrite/ensightWrite.H | 35 +++++++----------- .../{ensightWrite.C => ensightWrite.cxx} | 11 ++---- ...nsightWriteImpl.C => ensightWriteImpl.cxx} | 0 ...htWriteUpdate.C => ensightWriteUpdate.cxx} | 0 .../utilities/vtkWrite/vtkWrite.H | 20 +++++------ .../vtkWrite/{vtkWrite.C => vtkWrite.cxx} | 16 ++------- .../{vtkWriteImpl.C => vtkWriteImpl.cxx} | 0 .../{vtkWriteUpdate.C => vtkWriteUpdate.cxx} | 0 src/lagrangian/intermediate/Make/files | 4 +-- .../conversion/ensight/ensightOutputCloud.H | 6 ++-- ...htOutputCloud.C => ensightOutputCloud.cxx} | 0 ...loudTemplates.C => ensightOutputCloud.txx} | 0 .../conversion/vtk/foamVtkLagrangianWriter.H | 6 ++-- ...anWriter.C => foamVtkLagrangianWriter.cxx} | 0 ...emplates.C => foamVtkLagrangianWriter.txx} | 0 src/meshTools/Make/files | 4 +-- .../vtk/mesh/foamVtkInternalMeshWriter.H | 6 ++-- ...Writer.C => foamVtkInternalMeshWriter.cxx} | 0 ...plates.C => foamVtkInternalMeshWriter.txx} | 0 .../output/vtk/patch/foamVtkPatchMeshWriter.H | 6 ++-- ...eshWriter.C => foamVtkPatchMeshWriter.cxx} | 0 ...Templates.C => foamVtkPatchMeshWriter.txx} | 0 .../boundary/boundaryDataSurfaceReader.H | 4 +-- ...plates.C => boundaryDataSurfaceReader.txx} | 0 .../readers/ensight/ensightSurfaceReader.H | 4 +-- ...erTemplates.C => ensightSurfaceReader.txx} | 0 69 files changed, 127 insertions(+), 156 deletions(-) rename src/conversion/ensight/output/{ensightOutputAreaFieldTemplates.C => ensightOutputAreaField.txx} (100%) rename src/conversion/ensight/output/{ensightOutputVolFieldTemplates.C => ensightOutputVolField.txx} (100%) rename src/conversion/vtk/adaptor/{foamVtkToolsTemplates.C => foamVtkTools.txx} (100%) rename src/conversion/vtk/adaptor/{foamVtkVtuAdaptorTemplates.C => foamVtkVtuAdaptor.txx} (100%) rename src/conversion/vtk/output/{foamVtkGenericPatchGeoFieldsWriter.C => foamVtkGenericPatchGeoFieldsWriter.txx} (100%) rename src/conversion/vtk/output/{foamVtkInternalWriterTemplates.C => foamVtkInternalWriter.txx} (100%) rename src/conversion/vtk/output/{foamVtkPatchWriterTemplates.C => foamVtkPatchWriter.txx} (100%) rename src/conversion/vtk/output/{foamVtkSurfaceFieldWriter.C => foamVtkSurfaceFieldWriter.cxx} (100%) rename src/fileFormats/ensight/file/{ensightCaseTemplates.C => ensightCase.txx} (100%) rename src/fileFormats/ensight/file/{ensightFileTemplates.C => ensightFile.txx} (100%) rename src/fileFormats/ensight/output/{ensightOutputTemplates.C => ensightOutput.txx} (100%) rename src/fileFormats/ensight/part/surface/{ensightOutputSurfaceTemplates.C => ensightOutputSurface.txx} (100%) rename src/fileFormats/vtk/file/{foamVtkFileWriterTemplates.C => foamVtkFileWriter.txx} (100%) rename src/fileFormats/vtk/format/{foamVtkFormatterTemplates.C => foamVtkFormatter.txx} (100%) rename src/fileFormats/vtk/output/{foamVtkOutputTemplates.C => foamVtkOutput.txx} (100%) rename src/fileFormats/vtk/read/{vtkUnstructuredReaderTemplates.C => vtkUnstructuredReader.txx} (100%) rename src/fileFormats/vtk/write/{foamVtkPolyWriterTemplates.C => foamVtkPolyWriter.txx} (100%) rename src/functionObjects/lagrangian/vtkCloud/{vtkCloud.C => vtkCloud.cxx} (99%) rename src/functionObjects/lagrangian/vtkCloud/{vtkCloudTemplates.C => vtkCloudImpl.cxx} (100%) rename src/functionObjects/utilities/areaWrite/{areaWrite.C => areaWrite.cxx} (95%) rename src/functionObjects/utilities/areaWrite/{areaWriteImpl.C => areaWriteImpl.cxx} (97%) rename src/functionObjects/utilities/ensightWrite/{ensightWrite.C => ensightWrite.cxx} (97%) rename src/functionObjects/utilities/ensightWrite/{ensightWriteImpl.C => ensightWriteImpl.cxx} (100%) rename src/functionObjects/utilities/ensightWrite/{ensightWriteUpdate.C => ensightWriteUpdate.cxx} (100%) rename src/functionObjects/utilities/vtkWrite/{vtkWrite.C => vtkWrite.cxx} (98%) rename src/functionObjects/utilities/vtkWrite/{vtkWriteImpl.C => vtkWriteImpl.cxx} (100%) rename src/functionObjects/utilities/vtkWrite/{vtkWriteUpdate.C => vtkWriteUpdate.cxx} (100%) rename src/lagrangian/intermediate/conversion/ensight/{ensightOutputCloud.C => ensightOutputCloud.cxx} (100%) rename src/lagrangian/intermediate/conversion/ensight/{ensightOutputCloudTemplates.C => ensightOutputCloud.txx} (100%) rename src/lagrangian/intermediate/conversion/vtk/{foamVtkLagrangianWriter.C => foamVtkLagrangianWriter.cxx} (100%) rename src/lagrangian/intermediate/conversion/vtk/{foamVtkLagrangianWriterTemplates.C => foamVtkLagrangianWriter.txx} (100%) rename src/meshTools/output/vtk/mesh/{foamVtkInternalMeshWriter.C => foamVtkInternalMeshWriter.cxx} (100%) rename src/meshTools/output/vtk/mesh/{foamVtkInternalMeshWriterTemplates.C => foamVtkInternalMeshWriter.txx} (100%) rename src/meshTools/output/vtk/patch/{foamVtkPatchMeshWriter.C => foamVtkPatchMeshWriter.cxx} (100%) rename src/meshTools/output/vtk/patch/{foamVtkPatchMeshWriterTemplates.C => foamVtkPatchMeshWriter.txx} (100%) rename src/surfMesh/readers/boundary/{boundaryDataSurfaceReaderTemplates.C => boundaryDataSurfaceReader.txx} (100%) rename src/surfMesh/readers/ensight/{ensightSurfaceReaderTemplates.C => ensightSurfaceReader.txx} (100%) diff --git a/src/conversion/Make/files b/src/conversion/Make/files index b3d457edd5..b730f0187e 100644 --- a/src/conversion/Make/files +++ b/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 diff --git a/src/conversion/ensight/output/ensightOutputAreaField.H b/src/conversion/ensight/output/ensightOutputAreaField.H index 416c764ca3..ac42bdb760 100644 --- a/src/conversion/ensight/output/ensightOutputAreaField.H +++ b/src/conversion/ensight/output/ensightOutputAreaField.H @@ -98,7 +98,7 @@ bool writeAreaField // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "ensightOutputAreaFieldTemplates.C" + #include "ensightOutputAreaField.txx" #endif #endif diff --git a/src/conversion/ensight/output/ensightOutputAreaFieldTemplates.C b/src/conversion/ensight/output/ensightOutputAreaField.txx similarity index 100% rename from src/conversion/ensight/output/ensightOutputAreaFieldTemplates.C rename to src/conversion/ensight/output/ensightOutputAreaField.txx diff --git a/src/conversion/ensight/output/ensightOutputVolField.H b/src/conversion/ensight/output/ensightOutputVolField.H index 1c489e11c5..69671fe812 100644 --- a/src/conversion/ensight/output/ensightOutputVolField.H +++ b/src/conversion/ensight/output/ensightOutputVolField.H @@ -177,7 +177,7 @@ bool writePointField // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "ensightOutputVolFieldTemplates.C" + #include "ensightOutputVolField.txx" #endif #endif diff --git a/src/conversion/ensight/output/ensightOutputVolFieldTemplates.C b/src/conversion/ensight/output/ensightOutputVolField.txx similarity index 100% rename from src/conversion/ensight/output/ensightOutputVolFieldTemplates.C rename to src/conversion/ensight/output/ensightOutputVolField.txx diff --git a/src/conversion/vtk/adaptor/foamVtkTools.H b/src/conversion/vtk/adaptor/foamVtkTools.H index 4a1a1b3641..6b83e33c9f 100644 --- a/src/conversion/vtk/adaptor/foamVtkTools.H +++ b/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(double data[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "foamVtkToolsTemplates.C" + #include "foamVtkTools.txx" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/conversion/vtk/adaptor/foamVtkToolsTemplates.C b/src/conversion/vtk/adaptor/foamVtkTools.txx similarity index 100% rename from src/conversion/vtk/adaptor/foamVtkToolsTemplates.C rename to src/conversion/vtk/adaptor/foamVtkTools.txx diff --git a/src/conversion/vtk/adaptor/foamVtkVtuAdaptor.H b/src/conversion/vtk/adaptor/foamVtkVtuAdaptor.H index 8af6644317..54c67ddfa7 100644 --- a/src/conversion/vtk/adaptor/foamVtkVtuAdaptor.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/conversion/vtk/adaptor/foamVtkVtuAdaptorTemplates.C b/src/conversion/vtk/adaptor/foamVtkVtuAdaptor.txx similarity index 100% rename from src/conversion/vtk/adaptor/foamVtkVtuAdaptorTemplates.C rename to src/conversion/vtk/adaptor/foamVtkVtuAdaptor.txx diff --git a/src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.H b/src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.H index b76971eec8..d85291a35d 100644 --- a/src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.H +++ b/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 diff --git a/src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.C b/src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.txx similarity index 100% rename from src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.C rename to src/conversion/vtk/output/foamVtkGenericPatchGeoFieldsWriter.txx diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.H b/src/conversion/vtk/output/foamVtkInternalWriter.H index 5e29d2be47..a931280adf 100644 --- a/src/conversion/vtk/output/foamVtkInternalWriter.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/conversion/vtk/output/foamVtkInternalWriterTemplates.C b/src/conversion/vtk/output/foamVtkInternalWriter.txx similarity index 100% rename from src/conversion/vtk/output/foamVtkInternalWriterTemplates.C rename to src/conversion/vtk/output/foamVtkInternalWriter.txx diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H index 429c212b1c..4df5686a27 100644 --- a/src/conversion/vtk/output/foamVtkPatchWriter.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/conversion/vtk/output/foamVtkPatchWriterTemplates.C b/src/conversion/vtk/output/foamVtkPatchWriter.txx similarity index 100% rename from src/conversion/vtk/output/foamVtkPatchWriterTemplates.C rename to src/conversion/vtk/output/foamVtkPatchWriter.txx diff --git a/src/conversion/vtk/output/foamVtkSurfaceFieldWriter.H b/src/conversion/vtk/output/foamVtkSurfaceFieldWriter.H index 420fb0fca6..412f554f4a 100644 --- a/src/conversion/vtk/output/foamVtkSurfaceFieldWriter.H +++ b/src/conversion/vtk/output/foamVtkSurfaceFieldWriter.H @@ -47,7 +47,7 @@ Note may be addressed using ghost points. SourceFiles - surfaceFieldWriter.C + foamVtkSurfaceFieldWriter.cxx \*---------------------------------------------------------------------------*/ diff --git a/src/conversion/vtk/output/foamVtkSurfaceFieldWriter.C b/src/conversion/vtk/output/foamVtkSurfaceFieldWriter.cxx similarity index 100% rename from src/conversion/vtk/output/foamVtkSurfaceFieldWriter.C rename to src/conversion/vtk/output/foamVtkSurfaceFieldWriter.cxx diff --git a/src/fileFormats/ensight/file/ensightCase.H b/src/fileFormats/ensight/file/ensightCase.H index e07601d954..27449ce04d 100644 --- a/src/fileFormats/ensight/file/ensightCase.H +++ b/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 diff --git a/src/fileFormats/ensight/file/ensightCaseTemplates.C b/src/fileFormats/ensight/file/ensightCase.txx similarity index 100% rename from src/fileFormats/ensight/file/ensightCaseTemplates.C rename to src/fileFormats/ensight/file/ensightCase.txx diff --git a/src/fileFormats/ensight/file/ensightFile.H b/src/fileFormats/ensight/file/ensightFile.H index a0231593c1..03b9b66c4f 100644 --- a/src/fileFormats/ensight/file/ensightFile.H +++ b/src/fileFormats/ensight/file/ensightFile.H @@ -394,7 +394,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "ensightFileTemplates.C" + #include "ensightFile.txx" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/ensight/file/ensightFileTemplates.C b/src/fileFormats/ensight/file/ensightFile.txx similarity index 100% rename from src/fileFormats/ensight/file/ensightFileTemplates.C rename to src/fileFormats/ensight/file/ensightFile.txx diff --git a/src/fileFormats/ensight/output/ensightOutput.H b/src/fileFormats/ensight/output/ensightOutput.H index 4c26ff69dc..cf11bc2490 100644 --- a/src/fileFormats/ensight/output/ensightOutput.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/ensight/output/ensightOutputTemplates.C b/src/fileFormats/ensight/output/ensightOutput.txx similarity index 100% rename from src/fileFormats/ensight/output/ensightOutputTemplates.C rename to src/fileFormats/ensight/output/ensightOutput.txx diff --git a/src/fileFormats/ensight/part/surface/ensightOutputSurface.H b/src/fileFormats/ensight/part/surface/ensightOutputSurface.H index 90b9ed1808..493c6c0115 100644 --- a/src/fileFormats/ensight/part/surface/ensightOutputSurface.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/ensight/part/surface/ensightOutputSurfaceTemplates.C b/src/fileFormats/ensight/part/surface/ensightOutputSurface.txx similarity index 100% rename from src/fileFormats/ensight/part/surface/ensightOutputSurfaceTemplates.C rename to src/fileFormats/ensight/part/surface/ensightOutputSurface.txx diff --git a/src/fileFormats/vtk/file/foamVtkFileWriter.H b/src/fileFormats/vtk/file/foamVtkFileWriter.H index abf068a42f..8ec75beb44 100644 --- a/src/fileFormats/vtk/file/foamVtkFileWriter.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/vtk/file/foamVtkFileWriterTemplates.C b/src/fileFormats/vtk/file/foamVtkFileWriter.txx similarity index 100% rename from src/fileFormats/vtk/file/foamVtkFileWriterTemplates.C rename to src/fileFormats/vtk/file/foamVtkFileWriter.txx diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H index b8f83229fc..015d2f3d11 100644 --- a/src/fileFormats/vtk/format/foamVtkFormatter.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C b/src/fileFormats/vtk/format/foamVtkFormatter.txx similarity index 100% rename from src/fileFormats/vtk/format/foamVtkFormatterTemplates.C rename to src/fileFormats/vtk/format/foamVtkFormatter.txx diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H index 0f67899c29..21fcbca136 100644 --- a/src/fileFormats/vtk/output/foamVtkOutput.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutput.txx similarity index 100% rename from src/fileFormats/vtk/output/foamVtkOutputTemplates.C rename to src/fileFormats/vtk/output/foamVtkOutput.txx diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.H b/src/fileFormats/vtk/read/vtkUnstructuredReader.H index 99bc480078..1fec1a95c8 100644 --- a/src/fileFormats/vtk/read/vtkUnstructuredReader.H +++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.H @@ -358,7 +358,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "vtkUnstructuredReaderTemplates.C" + #include "vtkUnstructuredReader.txx" #endif diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReaderTemplates.C b/src/fileFormats/vtk/read/vtkUnstructuredReader.txx similarity index 100% rename from src/fileFormats/vtk/read/vtkUnstructuredReaderTemplates.C rename to src/fileFormats/vtk/read/vtkUnstructuredReader.txx diff --git a/src/fileFormats/vtk/write/foamVtkPolyWriter.H b/src/fileFormats/vtk/write/foamVtkPolyWriter.H index 73acd63281..7c9d385bcd 100644 --- a/src/fileFormats/vtk/write/foamVtkPolyWriter.H +++ b/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 diff --git a/src/fileFormats/vtk/write/foamVtkPolyWriterTemplates.C b/src/fileFormats/vtk/write/foamVtkPolyWriter.txx similarity index 100% rename from src/fileFormats/vtk/write/foamVtkPolyWriterTemplates.C rename to src/fileFormats/vtk/write/foamVtkPolyWriter.txx diff --git a/src/functionObjects/lagrangian/Make/files b/src/functionObjects/lagrangian/Make/files index 51e5c3b112..40712a62e2 100644 --- a/src/functionObjects/lagrangian/Make/files +++ b/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 diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.H b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.H index b8f0b413fd..72d9ab9a55 100644 --- a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.H +++ b/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 // ************************************************************************* // diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.cxx similarity index 99% rename from src/functionObjects/lagrangian/vtkCloud/vtkCloud.C rename to src/functionObjects/lagrangian/vtkCloud/vtkCloud.cxx index 223fa2feab..013447e2a4 100644 --- a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C +++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.cxx @@ -47,6 +47,12 @@ namespace functionObjects } +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// Implementation +#include "vtkCloudImpl.cxx" + + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void Foam::functionObjects::vtkCloud::writeVerts diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloudImpl.cxx similarity index 100% rename from src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C rename to src/functionObjects/lagrangian/vtkCloud/vtkCloudImpl.cxx diff --git a/src/functionObjects/utilities/Make/files b/src/functionObjects/utilities/Make/files index 9da1341dfa..6730f52128 100644 --- a/src/functionObjects/utilities/Make/files +++ b/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 diff --git a/src/functionObjects/utilities/areaWrite/areaWrite.H b/src/functionObjects/utilities/areaWrite/areaWrite.H index 7790265c86..2cff33acf8 100644 --- a/src/functionObjects/utilities/areaWrite/areaWrite.H +++ b/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 surfaces_; + std::unique_ptr 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; }; diff --git a/src/functionObjects/utilities/areaWrite/areaWrite.C b/src/functionObjects/utilities/areaWrite/areaWrite.cxx similarity index 95% rename from src/functionObjects/utilities/areaWrite/areaWrite.C rename to src/functionObjects/utilities/areaWrite/areaWrite.cxx index e245381dcf..2d8a10911d 100644 --- a/src/functionObjects/utilities/areaWrite/areaWrite.C +++ b/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; diff --git a/src/functionObjects/utilities/areaWrite/areaWriteImpl.C b/src/functionObjects/utilities/areaWrite/areaWriteImpl.cxx similarity index 97% rename from src/functionObjects/utilities/areaWrite/areaWriteImpl.C rename to src/functionObjects/utilities/areaWrite/areaWriteImpl.cxx index 86aae84602..be6095c504 100644 --- a/src/functionObjects/utilities/areaWrite/areaWriteImpl.C +++ b/src/functionObjects/utilities/areaWrite/areaWriteImpl.cxx @@ -25,10 +25,6 @@ License \*---------------------------------------------------------------------------*/ -#include "areaWrite.H" -#include "areaFields.H" -#include "faMesh.H" - // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.H b/src/functionObjects/utilities/ensightWrite/ensightWrite.H index 3ba712be80..6284d62150 100644 --- a/src/functionObjects/utilities/ensightWrite/ensightWrite.H +++ b/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; diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.C b/src/functionObjects/utilities/ensightWrite/ensightWrite.cxx similarity index 97% rename from src/functionObjects/utilities/ensightWrite/ensightWrite.C rename to src/functionObjects/utilities/ensightWrite/ensightWrite.cxx index 85ef3c6be6..0cc5c6b56a 100644 --- a/src/functionObjects/utilities/ensightWrite/ensightWrite.C +++ b/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) diff --git a/src/functionObjects/utilities/ensightWrite/ensightWriteImpl.C b/src/functionObjects/utilities/ensightWrite/ensightWriteImpl.cxx similarity index 100% rename from src/functionObjects/utilities/ensightWrite/ensightWriteImpl.C rename to src/functionObjects/utilities/ensightWrite/ensightWriteImpl.cxx diff --git a/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C b/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.cxx similarity index 100% rename from src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C rename to src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.cxx diff --git a/src/functionObjects/utilities/vtkWrite/vtkWrite.H b/src/functionObjects/utilities/vtkWrite/vtkWrite.H index 3f22b7c963..6a4e5c8eb2 100644 --- a/src/functionObjects/utilities/vtkWrite/vtkWrite.H +++ b/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; diff --git a/src/functionObjects/utilities/vtkWrite/vtkWrite.C b/src/functionObjects/utilities/vtkWrite/vtkWrite.cxx similarity index 98% rename from src/functionObjects/utilities/vtkWrite/vtkWrite.C rename to src/functionObjects/utilities/vtkWrite/vtkWrite.cxx index 3ccc27c01f..161d9d8de9 100644 --- a/src/functionObjects/utilities/vtkWrite/vtkWrite.C +++ b/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) diff --git a/src/functionObjects/utilities/vtkWrite/vtkWriteImpl.C b/src/functionObjects/utilities/vtkWrite/vtkWriteImpl.cxx similarity index 100% rename from src/functionObjects/utilities/vtkWrite/vtkWriteImpl.C rename to src/functionObjects/utilities/vtkWrite/vtkWriteImpl.cxx diff --git a/src/functionObjects/utilities/vtkWrite/vtkWriteUpdate.C b/src/functionObjects/utilities/vtkWrite/vtkWriteUpdate.cxx similarity index 100% rename from src/functionObjects/utilities/vtkWrite/vtkWriteUpdate.C rename to src/functionObjects/utilities/vtkWrite/vtkWriteUpdate.cxx diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files index 445cbc2a20..c005bf2abc 100644 --- a/src/lagrangian/intermediate/Make/files +++ b/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 diff --git a/src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.H b/src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.H index 323296eb26..0aa40eb05d 100644 --- a/src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.C b/src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.cxx similarity index 100% rename from src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.C rename to src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.cxx diff --git a/src/lagrangian/intermediate/conversion/ensight/ensightOutputCloudTemplates.C b/src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.txx similarity index 100% rename from src/lagrangian/intermediate/conversion/ensight/ensightOutputCloudTemplates.C rename to src/lagrangian/intermediate/conversion/ensight/ensightOutputCloud.txx diff --git a/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.H b/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.H index 36e0024622..eed2779258 100644 --- a/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.H +++ b/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 diff --git a/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.C b/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.cxx similarity index 100% rename from src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.C rename to src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.cxx diff --git a/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriterTemplates.C b/src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.txx similarity index 100% rename from src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriterTemplates.C rename to src/lagrangian/intermediate/conversion/vtk/foamVtkLagrangianWriter.txx diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index eb64fa51a0..1e6d481bd0 100644 --- a/src/meshTools/Make/files +++ b/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 diff --git a/src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.H b/src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.H index 00da9739a7..67e3609a59 100644 --- a/src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.C b/src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.cxx similarity index 100% rename from src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.C rename to src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.cxx diff --git a/src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriterTemplates.C b/src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.txx similarity index 100% rename from src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriterTemplates.C rename to src/meshTools/output/vtk/mesh/foamVtkInternalMeshWriter.txx diff --git a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H b/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H index de259f740d..a0fe5dcbd8 100644 --- a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H +++ b/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 diff --git a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.C b/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.cxx similarity index 100% rename from src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.C rename to src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.cxx diff --git a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriterTemplates.C b/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.txx similarity index 100% rename from src/meshTools/output/vtk/patch/foamVtkPatchMeshWriterTemplates.C rename to src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.txx diff --git a/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.H b/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.H index 102f2ccc25..b57d461d95 100644 --- a/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C b/src/surfMesh/readers/boundary/boundaryDataSurfaceReader.txx similarity index 100% rename from src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C rename to src/surfMesh/readers/boundary/boundaryDataSurfaceReader.txx diff --git a/src/surfMesh/readers/ensight/ensightSurfaceReader.H b/src/surfMesh/readers/ensight/ensightSurfaceReader.H index e8921db814..7aae755b39 100644 --- a/src/surfMesh/readers/ensight/ensightSurfaceReader.H +++ b/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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/surfMesh/readers/ensight/ensightSurfaceReaderTemplates.C b/src/surfMesh/readers/ensight/ensightSurfaceReader.txx similarity index 100% rename from src/surfMesh/readers/ensight/ensightSurfaceReaderTemplates.C rename to src/surfMesh/readers/ensight/ensightSurfaceReader.txx