GIT: relocate coordSet from fileFormats to meshTools

- meshTools is the first layer in which coordSet is actually needed

STYLE: rename writer implementations in advance of upcoming changes (#2347)

- simplifies tracing of code changes (git blame)

src/fileFormats/Make/files

@@ -71,18 +71,5 @@ vtk/write/foamVtkLineWriter.C
 vtk/write/foamVtkPolyWriter.C
 vtk/write/foamVtkSurfaceWriter.C
 
-coordSet/coordSet.C
-
-setWriters = sampledSetWriters
-
-$(setWriters)/writers.C
-$(setWriters)/csv/csvSetWriterRunTime.C
-$(setWriters)/ensight/ensightSetWriterRunTime.C
-$(setWriters)/gltf/gltfSetWriterRunTime.C
-$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C
-$(setWriters)/nastran/nastranSetWriterRunTime.C
-$(setWriters)/raw/rawSetWriterRunTime.C
-$(setWriters)/vtk/vtkSetWriterRunTime.C
-$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C
 
 LIB = $(FOAM_LIBBIN)/libfileFormats

src/meshTools/Make/files

@@ -132,7 +132,22 @@ searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
 searchableSurfaces/subTriSurfaceMesh/subTriSurfaceMesh.C
 searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
 
-topoSets = sets/topoSets
+coordSet/coordSet.C
+
+setWriters = coordSet/writers
+
+$(setWriters)/common/writers.C
+$(setWriters)/csv/csvSetWriterRunTime.C
+$(setWriters)/ensight/ensightSetWriterRunTime.C
+$(setWriters)/gltf/gltfSetWriterRunTime.C
+$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C
+$(setWriters)/nastran/nastranSetWriterRunTime.C
+$(setWriters)/raw/rawSetWriterRunTime.C
+$(setWriters)/vtk/vtkSetWriterRunTime.C
+$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C
+
+
+topoSets = topoSet/topoSets
 $(topoSets)/cellBitSet.C
 $(topoSets)/cellSet.C
 $(topoSets)/cellZoneSet.C
@@ -147,9 +162,9 @@ $(topoSets)/topoBoolSet.C
 $(topoSets)/topoBitSet.C
 $(topoSets)/topoSet.C
 
-sets/topoSetSource/topoSetSource.C
+topoSet/topoSetSource/topoSetSource.C
 
-cellSources = sets/cellSources
+cellSources = topoSet/cellSources
 $(cellSources)/topoSetCellSource/topoSetCellSource.C
 $(cellSources)/boundaryToCell/boundaryToCell.C
 $(cellSources)/boxToCell/boxToCell.C
@@ -174,7 +189,7 @@ $(cellSources)/surfaceToCell/surfaceToCell.C
 $(cellSources)/targetVolumeToCell/targetVolumeToCell.C
 $(cellSources)/zoneToCell/zoneToCell.C
 
-faceSources = sets/faceSources
+faceSources = topoSet/faceSources
 $(faceSources)/topoSetFaceSource/topoSetFaceSource.C
 $(faceSources)/boundaryToFace/boundaryToFace.C
 $(faceSources)/boxToFace/boxToFace.C
@@ -191,7 +206,7 @@ $(faceSources)/searchableSurfaceToFace/searchableSurfaceToFace.C
 $(faceSources)/sphereToFace/sphereToFace.C
 $(faceSources)/zoneToFace/zoneToFace.C
 
-pointSources = sets/pointSources
+pointSources = topoSet/pointSources
 $(pointSources)/topoSetPointSource/topoSetPointSource.C
 $(pointSources)/boxToPoint/boxToPoint.C
 $(pointSources)/cellToPoint/cellToPoint.C
@@ -205,7 +220,7 @@ $(pointSources)/sphereToPoint/sphereToPoint.C
 $(pointSources)/surfaceToPoint/surfaceToPoint.C
 $(pointSources)/zoneToPoint/zoneToPoint.C
 
-faceZoneSources = sets/faceZoneSources
+faceZoneSources = topoSet/faceZoneSources
 $(faceZoneSources)/topoSetFaceZoneSource/topoSetFaceZoneSource.C
 $(faceZoneSources)/faceZoneToFaceZone/faceZoneToFaceZone.C
 $(faceZoneSources)/setsToFaceZone/setsToFaceZone.C
@@ -214,11 +229,11 @@ $(faceZoneSources)/setAndNormalToFaceZone/setAndNormalToFaceZone.C
 $(faceZoneSources)/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C
 $(faceZoneSources)/planeToFaceZone/planeToFaceZone.C
 
-cellZoneSources = sets/cellZoneSources
+cellZoneSources = topoSet/cellZoneSources
 $(cellZoneSources)/topoSetCellZoneSource/topoSetCellZoneSource.C
 $(cellZoneSources)/setToCellZone/setToCellZone.C
 
-pointZoneSources = sets/pointZoneSources
+pointZoneSources = topoSet/pointZoneSources
 $(pointZoneSources)/topoSetPointZoneSource/topoSetPointZoneSource.C
 $(pointZoneSources)/setToPointZone/setToPointZone.C
 

src/meshTools/coordSet/writers/csv/csvSetWriter.H

@@ -31,12 +31,12 @@ Description
     Write set in csv format
 
 SourceFiles
-    csvSetWriter.C
+    csvCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef csvSetWriter_H
+#ifndef Foam_coordSetWriters_csvWriter_H
-#define csvSetWriter_H
+#define Foam_coordSetWriters_csvWriter_H
 
 #include "writer.H"
 
@@ -121,7 +121,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "csvSetWriter.C"
+    #include "csvCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/coordSet/writers/ensight/ensightSetWriter.H

@@ -30,12 +30,12 @@ Class
 Description
 
 SourceFiles
-    ensightSetWriter.C
+    ensightCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ensightSetWriter_H
+#ifndef Foam_coordSetWriters_ensightWriter_H
-#define ensightSetWriter_H
+#define Foam_coordSetWriters_ensightWriter_H
 
 #include "writer.H"
 
@@ -108,7 +108,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "ensightSetWriter.C"
+    #include "ensightCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/coordSet/writers/gltf/gltfSetWriter.H

@@ -122,12 +122,12 @@ Note
     https://www.khronos.org/registry/glTF/
 
 SourceFiles
-    gltfSetWriter.C
+    gltfCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writers_gltfSetWriter_H
+#ifndef Foam_coordSetWriters_gltfWriter_H
-#define writers_gltfSetWriter_H
+#define Foam_coordSetWriters_gltfWriter_H
 
 #include "writer.H"
 #include "colourTable.H"
@@ -302,7 +302,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "gltfSetWriter.C"
+    #include "gltfCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/coordSet/writers/gnuplot/gnuplotSetWriter.H

@@ -30,12 +30,12 @@ Class
 Description
 
 SourceFiles
-    gnuplotSetWriter.C
+    gnuplotCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef gnuplotSetWriter_H
+#ifndef Foam_coordSetWriters_gnuplotWriter_H
-#define gnuplotSetWriter_H
+#define Foam_coordSetWriters_gnuplotWriter_H
 
 #include "writer.H"
 
@@ -107,7 +107,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "gnuplotSetWriter.C"
+    #include "gnuplotCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/coordSet/writers/nastran/nastranSetWriter.H

@@ -32,12 +32,12 @@ Description
     Does not do field data.
 
 SourceFiles
-    nastranSetWriter.C
+    nastranCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nastranSetWriter_H
+#ifndef Foam_coordSetWriters_nastranWriter_H
-#define nastranSetWriter_H
+#define Foam_coordSetWriters_nastranWriter_H
 
 #include "writer.H"
 #include "NASCore.H"
@@ -124,7 +124,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "nastranSetWriter.C"
+    #include "nastranCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/coordSet/writers/raw/rawSetWriter.H

@@ -30,12 +30,12 @@ Class
 Description
 
 SourceFiles
-    rawSetWriter.C
+    rawCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef rawSetWriter_H
+#ifndef Foam_coordSetWriters_rawWriter_H
-#define rawSetWriter_H
+#define Foam_coordSetWriters_rawWriter_H
 
 #include "writer.H"
 
@@ -107,7 +107,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "rawSetWriter.C"
+    #include "rawCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/coordSet/writers/vtk/vtkSetWriter.H

@@ -33,12 +33,12 @@ Note
     The output order of symmTensor is incorrect.
 
 SourceFiles
-    vtkSetWriter.C
+    vtkCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vtkSetWriter_H
+#ifndef Foam_coordSetWriters_vtkWriter_H
-#define vtkSetWriter_H
+#define Foam_coordSetWriters_vtkWriter_H
 
 #include "writer.H"
 
@@ -110,7 +110,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "vtkSetWriter.C"
+    #include "vtkCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/meshTools/coordSet/writers/xmgrace/xmgraceSetWriter.H

@@ -30,12 +30,12 @@ Class
 Description
 
 SourceFiles
-    xmgraceSetWriter.C
+    xmgraceCoordSetWriter.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef xmgraceSetWriter_H
+#ifndef Foam_coordSetWriters_xmgraceWriter_H
-#define xmgraceSetWriter_H
+#define Foam_coordSetWriters_xmgraceWriter_H
 
 #include "writer.H"
 
@@ -107,7 +107,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "xmgraceSetWriter.C"
+    #include "xmgraceCoordSetWriter.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //