zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sampling: Renamed and moved classes from fileFormats

Browse Source 
The writer class has been renamed setWriter in order to clarify its
usage. The coordSet and setWriter classes have been moved into the
sampling library, as this fits their usage.
This commit is contained in:
Will Bainbridge
2021-06-17 11:48:09 +01:00
parent 77f3c014bc
commit f4a65fbada
50 changed files with 164 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
View File

@ -10,7 +10,7 @@
#include "polyMeshTetDecomposition.H"
#include "vtkSurfaceWriter.H"
#include "writer.H"
#include "setWriter.H"
#include "checkTools.H"
#include "cyclicAMIPolyPatch.H"
@ -581,7 +581,7 @@ Foam::label Foam::checkGeometry
const polyMesh& mesh,
const bool allGeometry,
const autoPtr<surfaceWriter>& surfWriter,
const autoPtr<writer<scalar>>& setWriter
const autoPtr<Foam::setWriter<scalar>>& setWriter
)
{
label noFailedChecks = 0;

4
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
View File

@ -1,7 +1,7 @@
#include "label.H"
#include "HashSet.H"
#include "labelVector.H"
#include "writer.H"
#include "setWriter.H"
namespace Foam
{
@ -40,6 +40,6 @@ namespace Foam
const polyMesh& mesh,
const bool allGeometry,
const autoPtr<surfaceWriter>&,
const autoPtr<writer<scalar>>&
const autoPtr<setWriter<scalar>>&
);
}

9
applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -160,7 +160,7 @@ int main(int argc, char *argv[])
autoPtr<surfaceWriter> surfWriter;
autoPtr<writer<scalar>> setWriter;
autoPtr<Foam::setWriter<scalar>> setWriter;
if (writeSets)
{
surfWriter = surfaceWriter::New
@ -168,7 +168,10 @@ int main(int argc, char *argv[])
surfaceFormat,
mesh.time().writeFormat()
);
setWriter = writer<scalar>::New(vtkSetWriter<scalar>::typeName);
setWriter = Foam::setWriter<scalar>::New
(
vtkSetWriter<scalar>::typeName
);
}

2
applications/utilities/mesh/manipulation/checkMesh/checkTools.C
View File

@ -378,7 +378,7 @@ void Foam::mergeAndWrite
void Foam::mergeAndWrite
(
const writer<scalar>& writer,
const setWriter<scalar>& writer,
const pointSet& set
)
{

6
applications/utilities/mesh/manipulation/checkMesh/checkTools.H
View File

@ -1,6 +1,6 @@
#include "scalar.H"
#include "indirectPrimitivePatch.H"
#include "writer.H"
#include "setWriter.H"
namespace Foam
{
@ -19,7 +19,7 @@ namespace Foam
void mergeAndWrite
(
const polyMesh& mesh,
const surfaceWriter& writer,
const surfaceWriter& setWriter,
const word& name,
const indirectPrimitivePatch setPatch,
const fileName& outputDir
@ -35,7 +35,7 @@ namespace Foam
//- Write vtk representation of (assembled) pointSet to 'set' file in
// postProcessing/ directory
void mergeAndWrite(const writer<scalar>&, const pointSet&);
void mergeAndWrite(const setWriter<scalar>&, const pointSet&);
}

4
applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,7 +44,7 @@ Foam::label Foam::checkTopology
const bool allTopology,
const bool allGeometry,
const autoPtr<surfaceWriter>& surfWriter,
const autoPtr<writer<scalar>>& setWriter
const autoPtr<Foam::setWriter<scalar>>& setWriter
)
{
label noFailedChecks = 0;

4
applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
View File

@ -1,6 +1,6 @@
#include "label.H"
#include "autoPtr.H"
#include "writer.H"
#include "setWriter.H"
namespace Foam
{
@ -13,6 +13,6 @@ namespace Foam
const bool,
const bool,
const autoPtr<surfaceWriter>&,
const autoPtr<writer<scalar>>&
const autoPtr<setWriter<scalar>>&
);
}