COMP: combine uindirectPrimitivePatch.H into indirectPrimitivePatch.H

- similarly combine typedef headers for primitiveFacePatch,
  foamVtkUIndPatchWriter, foamVtkUIndPatchGeoFieldsWriter etc
  (reduce file clutter)

applications/test/primitivePatch/Test-PrimitivePatch.C

@@ -32,7 +32,6 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "polyMesh.H"
-#include "primitiveFacePatch.H"
 #include "primitivePatch.H"
 #include "IndirectList.H"
 #include "Fstream.H"

applications/utilities/finiteArea/checkFaMesh/checkFaMesh.C

@@ -45,7 +45,7 @@ Original Authors
 #include "areaFields.H"
 #include "edgeFields.H"
 #include "processorFaPatch.H"
-#include "foamVtkUIndPatchWriter.H"
+#include "foamVtkIndPatchWriter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C

@@ -49,7 +49,7 @@ Original Authors
 #include "faFieldDecomposer.H"
 #include "faMeshReconstructor.H"
 #include "PtrListOps.H"
-#include "foamVtkUIndPatchWriter.H"
+#include "foamVtkIndPatchWriter.H"
 #include "OBJstream.H"
 
 using namespace Foam;

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

@@ -55,7 +55,7 @@ Description
 #include "faceSet.H"
 #include "motionSmoother.H"
 #include "polyTopoChange.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "surfZoneIdentifierList.H"
 #include "UnsortedMeshedSurface.H"
 #include "MeshedSurface.H"

applications/utilities/mesh/manipulation/splitMesh/splitMesh.C

@@ -58,7 +58,7 @@ Description
 #include "attachDetach.H"
 #include "attachPolyTopoChanger.H"
 #include "regionSide.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 #include "processorMeshes.H"
 
 using namespace Foam;

applications/utilities/postProcessing/dataConversion/foamToVTK/writeAreaFields.H

@@ -39,7 +39,7 @@ SourceFiles
 #define writeAreaFields_H
 
 #include "readFields.H"
-#include "foamVtkUIndPatchGeoFieldsWriter.H"
+#include "foamVtkIndPatchGeoFieldsWriter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfaceFields.H

@@ -38,7 +38,7 @@ SourceFiles
 #define writeSurfaceFields_H
 
 #include "readFields.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 #include "foamVtkGenericPatchGeoFieldsWriter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C

@@ -57,7 +57,7 @@ Description
 #include "distributedTriSurfaceMesh.H"
 #include "meshTools.H"
 
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "DynamicField.H"
 #include "unitConversion.H"
 

applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C

@@ -51,7 +51,7 @@ Description
 #include "emptyPolyPatch.H"
 #include "processorPolyPatch.H"
 #include "ListListOps.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "globalMeshData.H"
 #include "globalIndex.H"
 #include "timeSelector.H"

src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C

@@ -30,7 +30,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "pointMesh.H"
 #include "faceList.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 #include "emptyPolyPatch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H

@@ -40,12 +40,12 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceZone_H
-#define faceZone_H
+#ifndef Foam_faceZone_H
+#define Foam_faceZone_H
 
 #include "zone.H"
 #include "faceZoneMeshFwd.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,13 +28,20 @@ Typedef
     Foam::indirectPrimitivePatch
 
 Description
-    A PrimitivePatch with an IndirectList for the faces, const reference
-    for the point field.
+    A PrimitivePatch with an IndirectList for the faces,
+    const reference for the point field.
+
+Typedef
+    Foam::uindirectPrimitivePatch
+
+Description
+    A PrimitivePatch with UIndirectList for the faces,
+    const reference for the point field.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef indirectPrimitivePatch_H
-#define indirectPrimitivePatch_H
+#ifndef Foam_indirectPrimitivePatch_H
+#define Foam_indirectPrimitivePatch_H
 
 #include "PrimitivePatch.H"
 #include "face.H"
@@ -45,8 +52,15 @@ Description
 
 namespace Foam
 {
-    typedef PrimitivePatch<IndirectList<face>, const pointField&>
-        indirectPrimitivePatch;
+
+typedef
+    PrimitivePatch<IndirectList<face>, const pointField&>
+    indirectPrimitivePatch;
+
+typedef
+    PrimitivePatch<UIndirectList<face>, const pointField&>
+    uindirectPrimitivePatch;
+
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitiveFacePatch.H

@@ -1,57 +1,16 @@
 /*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Typedef
-    Foam::primitiveFacePatch
-
 Description
-    A PrimitivePatch with List storage for the faces,
-    const reference for the point field.
+    Compatibility include
 
-    Can be used to store faces.
+    primitiveFacePatch.H combined into primitivePatch.H
+    (MAY-2022)
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef primitiveFacePatch_H
-#define primitiveFacePatch_H
+#ifndef Foam_primitiveFacePatch_H
+#define Foam_primitiveFacePatch_H
 
-#include "PrimitivePatch.H"
-#include "face.H"
-#include "List.H"
-#include "pointField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef PrimitivePatch<List<face>, const pointField&>
-        primitiveFacePatch;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "indirectPrimitivePatch.H"
 
 #endif
 

src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,27 +28,43 @@ Typedef
     Foam::primitivePatch
 
 Description
-    A PrimitivePatch with a SubList addressing for the faces,
+    A PrimitivePatch with a SubList \em addressing for the faces,
     const reference for the point field.
 
     Can be used as addressing for a faceList slice.
 
+Typedef
+    Foam::primitiveFacePatch
+
+Description
+    A PrimitivePatch with List \em storage for the faces,
+    const reference for the point field.
+
+    Can be used to store faces.
+
 \*---------------------------------------------------------------------------*/
 
-#ifndef primitivePatch_H
-#define primitivePatch_H
+#ifndef Foam_primitivePatch_H
+#define Foam_primitivePatch_H
 
 #include "PrimitivePatch.H"
 #include "face.H"
 #include "SubList.H"
+#include "List.H"
 #include "pointField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef PrimitivePatch<SubList<face>, const pointField&>
-        primitivePatch;
+
+typedef
+    PrimitivePatch<SubList<face>, const pointField&>
+    primitivePatch;
+
+typedef
+    PrimitivePatch<List<face>, const pointField&>
+    primitiveFacePatch;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/meshes/primitiveMesh/primitivePatch/uindirectPrimitivePatch.H

@@ -1,55 +1,16 @@
 /*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Typedef
-    Foam::uindirectPrimitivePatch
-
 Description
-    A PrimitivePatch with UIndirectList for the faces, const reference
-    for the point field.
+    Compatibility include
+
+    uindirectPrimitivePatch.H combined into uindirectPrimitivePatch.H
+    (MAY-2022)
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uindirectPrimitivePatch_H
-#define uindirectPrimitivePatch_H
+#ifndef Foam_uindirectPrimitivePatch_H
+#define Foam_uindirectPrimitivePatch_H
 
-#include "PrimitivePatch.H"
-#include "face.H"
-#include "UIndirectList.H"
-#include "pointField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef PrimitivePatch<UIndirectList<face>, const pointField&>
-        uindirectPrimitivePatch;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "indirectPrimitivePatch.H"
 
 #endif
 

src/conversion/ccm/reader/ccmReaderMesh.C

@@ -34,7 +34,7 @@ License
 #include "IOdictionary.H"
 
 #include "ccmBoundaryInfo.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "SortableList.H"
 #include "mergePoints.H"
 #include "bitSet.H"

src/conversion/vtk/output/foamVtkIndPatchGeoFieldsWriter.H

@@ -31,6 +31,14 @@ Description
     as a vtp file or a legacy vtk file
     with support for geometric fields.
 
+Typedef
+    Foam::vtk::uindirectPatchGeoFieldsWriter
+
+Description
+    Write uindirectPrimitivePatch faces/points
+    as a vtp file or a legacy vtk file
+    with support for geometric fields.
+
 See Also
     Foam::vtk::GenericPatchWriter
 
@@ -55,6 +63,10 @@ typedef
     GenericPatchGeoFieldsWriter<indirectPrimitivePatch>
     indirectPatchGeoFieldsWriter;
 
+typedef
+    GenericPatchGeoFieldsWriter<uindirectPrimitivePatch>
+    uindirectPatchGeoFieldsWriter;
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/conversion/vtk/output/foamVtkUIndPatchGeoFieldsWriter.H

@@ -1,67 +1,17 @@
 /*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Typedef
-    Foam::vtk::uindirectPatchGeoFieldsWriter
-
 Description
-    Write uindirectPrimitivePatch faces/points
-    as a vtp file or a legacy vtk file
-    with support for geometric fields.
+    Compatibility include
 
-See Also
-    Foam::vtk::GenericPatchWriter
+    foamVtkUIndPatchGeoFieldsWriter.H
+    combined into foamVtkIndPatchGeoFieldsWriter.H
+    (MAY-2022)
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_vtk_UIndPatchGeoFieldsWriter_H
 #define Foam_vtk_UIndPatchGeoFieldsWriter_H
 
-#include "foamVtkGenericPatchGeoFieldsWriter.H"
-#include "uindirectPrimitivePatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace vtk
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef
-    GenericPatchGeoFieldsWriter<uindirectPrimitivePatch>
-    uindirectPatchGeoFieldsWriter;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace vtk
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "foamVtkIndPatchGeoFieldsWriter.H"
 
 #endif
 

src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C

@@ -48,7 +48,7 @@ License
 #include "turbulentTransportModel.H"
 #include "demandDrivenData.H"
 #include "unitConversion.H"
-#include "foamVtkUIndPatchWriter.H"
+#include "foamVtkIndPatchWriter.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C

@@ -29,7 +29,7 @@ License
 #include "attachDetach.H"
 #include "polyMesh.H"
 #include "primitiveMesh.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 #include "polyTopoChanger.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/dynamicMesh/boundaryMesh/boundaryMesh.C

@@ -36,8 +36,8 @@ License
 #include "triSurface.H"
 #include "SortableList.H"
 #include "OFstream.H"
-#include "primitiveFacePatch.H"
-#include "uindirectPrimitivePatch.H"
+#include "primitivePatch.H"
+#include "indirectPrimitivePatch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/dynamicMesh/createShellMesh/createShellMesh.H

@@ -38,12 +38,12 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createShellMesh_H
-#define createShellMesh_H
+#ifndef Foam_createShellMesh_H
+#define Foam_createShellMesh_H
 
-#include "primitiveFacePatch.H"
 #include "bitSet.H"
 #include "labelPair.H"
+#include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H

@@ -37,11 +37,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef layerAdditionRemoval_H
-#define layerAdditionRemoval_H
+#ifndef Foam_layerAdditionRemoval_H
+#define Foam_layerAdditionRemoval_H
 
 #include "polyMeshModifier.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 #include "ZoneIDs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H

@@ -133,12 +133,12 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceCoupleInfo_H
-#define faceCoupleInfo_H
+#ifndef Foam_faceCoupleInfo_H
+#define Foam_faceCoupleInfo_H
 
 #include "pointField.H"
 #include "indirectPrimitivePatch.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -147,7 +147,6 @@ namespace Foam
 
 typedef HashTable<labelList, edge, Hash<edge>> edgeLookup;
 
-
 // Forward Declarations
 class face;
 class primitiveMesh;

src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H

@@ -51,12 +51,12 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef enrichedPatch_H
-#define enrichedPatch_H
+#ifndef Foam_enrichedPatch_H
+#define Foam_enrichedPatch_H
 
-#include "primitiveFacePatch.H"
 #include "Map.H"
 #include "point.H"
+#include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/dynamicMesh/slidingInterface/slidingInterface.H

@@ -52,11 +52,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef slidingInterface_H
-#define slidingInterface_H
+#ifndef Foam_slidingInterface_H
+#define Foam_slidingInterface_H
 
 #include "polyMeshModifier.H"
-#include "primitiveFacePatch.H"
+#include "primitivePatch.H"
 #include "polyPatchID.H"
 #include "ZoneIDs.H"
 #include "intersection.H"

src/fileFormats/ensight/part/faces/ensightFacesAddr.C

@@ -31,7 +31,7 @@ License
 #include "polyMesh.H"
 #include "globalIndex.H"
 #include "globalMeshData.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/fileFormats/ensight/part/faces/ensightFacesIO.C

@@ -31,7 +31,7 @@ License
 #include "polyMesh.H"
 #include "globalIndex.H"
 #include "globalMeshData.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/finiteArea/faMesh/faMesh.H

@@ -66,7 +66,7 @@ Author
 #include "DimensionedField.H"
 #include "areaFieldsFwd.H"
 #include "edgeFieldsFwd.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "edgeInterpolation.H"
 #include "labelIOList.H"
 #include "FieldFields.H"

src/finiteArea/faMesh/faMeshDemandDrivenData.C

@@ -30,7 +30,6 @@ License
 #include "faMeshLduAddressing.H"
 #include "areaFields.H"
 #include "edgeFields.H"
-#include "primitiveFacePatch.H"
 #include "fac.H"
 #include "processorFaPatch.H"
 #include "wedgeFaPatch.H"

src/finiteArea/faMesh/faMeshTopology.C

@@ -32,7 +32,6 @@ License
 #include "edgeHashes.H"
 #include "foamVtkLineWriter.H"
 #include "foamVtkIndPatchWriter.H"
-#include "foamVtkUIndPatchWriter.H"
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 

src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C

@@ -28,7 +28,7 @@ License
 
 #include "singleCellFvMesh.H"
 #include "syncTools.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H

@@ -44,15 +44,14 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshRefinement_H
-#define meshRefinement_H
+#ifndef Foam_meshRefinement_H
+#define Foam_meshRefinement_H
 
 #include "hexRef8.H"
 #include "mapPolyMesh.H"
 #include "autoPtr.H"
 #include "labelPairHashes.H"
 #include "indirectPrimitivePatch.H"
-#include "uindirectPrimitivePatch.H"
 #include "pointFieldsFwd.H"
 #include "Tuple2.H"
 #include "pointIndexHit.H"

src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C

@@ -49,7 +49,7 @@ License
 
 #include "holeToFace.H"
 #include "refinementParameters.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "OBJstream.H"
 #include "PatchTools.H"
 

src/meshTools/meshStructure/meshStructure.H

@@ -39,11 +39,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshStructure_H
-#define meshStructure_H
+#ifndef Foam_meshStructure_H
+#define Foam_meshStructure_H
 
 #include "labelList.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "className.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,7 +51,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declaration
 class polyMesh;
 class globalIndex;
 

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

@@ -30,6 +30,13 @@ Description
     Write indirectPrimitivePatch faces/points (optionally with fields)
     as a vtp file or a legacy vtk file.
 
+Typedef
+    Foam::vtk::uindirectPatchWriter
+
+Description
+    Write uindirectPrimitivePatch faces/points (optionally with fields)
+    as a vtp file or a legacy vtk file.
+
 See Also
     Foam::vtk::GenericPatchWriter
 
@@ -54,6 +61,10 @@ typedef
     GenericPatchWriter<indirectPrimitivePatch>
     indirectPatchWriter;
 
+typedef
+    GenericPatchWriter<uindirectPrimitivePatch>
+    uindirectPatchWriter;
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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

@@ -1,66 +1,15 @@
 /*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Typedef
-    Foam::vtk::uindirectPatchWriter
-
 Description
-    Write uindirectPrimitivePatch faces/points (optionally with fields)
-    as a vtp file or a legacy vtk file.
+    Compatibility include
 
-See Also
-    Foam::vtk::GenericPatchWriter
+    foamVtkUIndPatchWriter.H combined into foamVtkIndPatchWriter.H (MAY-2022)
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_vtk_UIndPatchWriter_H
 #define Foam_vtk_UIndPatchWriter_H
 
-#include "foamVtkGenericPatchWriter.H"
-#include "uindirectPrimitivePatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace vtk
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef
-    GenericPatchWriter<uindirectPrimitivePatch>
-    uindirectPatchWriter;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace vtk
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "foamVtkIndPatchWriter.H"
 
 #endif
 

src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.C

@@ -29,7 +29,7 @@ License
 #include "planeToFaceZone.H"
 #include "polyMesh.H"
 #include "faceZoneSet.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "PatchTools.H"
 #include "syncTools.H"
 #include "addToRunTimeSelectionTable.H"

src/sampling/sampledSet/shortestPath/shortestPathSet.C

@@ -37,7 +37,7 @@ License
 #include "OBJstream.H"
 #include "PatchTools.H"
 #include "foamVtkSurfaceWriter.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/sampling/sampledSurface/sampledFaceZone/sampledFaceZone.C

@@ -32,7 +32,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "volPointInterpolation.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 
 #include "addToRunTimeSelectionTable.H"
 

src/sampling/sampledSurface/sampledPatch/sampledPatch.C

@@ -32,7 +32,7 @@ License
 #include "polyPatch.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 
 #include "addToRunTimeSelectionTable.H"
 

src/sampling/surface/isoSurface/isoSurfaceTopo.C

@@ -34,7 +34,7 @@ License
 #include "tetPointRef.H"
 #include "DynamicField.H"
 #include "syncTools.H"
-#include "uindirectPrimitivePatch.H"
+#include "indirectPrimitivePatch.H"
 #include "polyMeshTetDecomposition.H"
 #include "foamVtkInternalMeshWriter.H"
 #include "foamVtkLineWriter.H"