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

sampledSurface/writers: Removed unnecessary "verbose" argument

Browse Source
This commit is contained in:
Henry Weller
2020-01-28 22:46:00 +00:00
parent ac22da9499
commit 3631f13a98
21 changed files with 103 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -294,7 +294,6 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
faces, faces,
"cellSize", "cellSize",
pointCellSize, pointCellSize,
true,
true true
); );
} }

18
applications/utilities/surface/surfaceFeatures/surfaceFeatures.C
View File

@ -471,8 +471,7 @@ namespace Foam
faces, faces,
"internalCloseness", // fieldName "internalCloseness", // fieldName
closenessFields.first(), closenessFields.first(),
false, // isNodeValues false // isNodeValues
true // verbose
); );
vtkSurfaceWriter().write vtkSurfaceWriter().write
@ -483,8 +482,7 @@ namespace Foam
faces, faces,
"externalCloseness", // fieldName "externalCloseness", // fieldName
closenessFields.second(), closenessFields.second(),
false, // isNodeValues false // isNodeValues
true // verbose
); );
} }
} }
@ -535,8 +533,7 @@ namespace Foam
faces, faces,
"internalPointCloseness", // fieldName "internalPointCloseness", // fieldName
internalCloseness, internalCloseness,
true, // isNodeValues true // isNodeValues
true // verbose
); );
vtkSurfaceWriter().write vtkSurfaceWriter().write
@ -547,8 +544,7 @@ namespace Foam
faces, faces,
"externalPointCloseness", // fieldName "externalPointCloseness", // fieldName
externalCloseness, externalCloseness,
true, // isNodeValues true // isNodeValues
true // verbose
); );
} }
} }
@ -586,8 +582,7 @@ namespace Foam
faces, faces,
"curvature", // fieldName "curvature", // fieldName
k, k,
true, // isNodeValues true // isNodeValues
true // verbose
); );
} }
} }
@ -659,8 +654,7 @@ namespace Foam
faces, faces,
"featureProximity", // fieldName "featureProximity", // fieldName
featureProximity, featureProximity,
false, // isNodeValues false // isNodeValues
true // verbose
); );
} }
} }

5
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -766,8 +766,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
outputDir(), outputDir(),
regionTypeNames_[regionType_] + ("_" + regionName_), regionTypeNames_[regionType_] + ("_" + regionName_),
points, points,
faces, faces
false
); );
} }
} }

10
src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
View File

@ -51,8 +51,7 @@ void Foam::ensightSurfaceWriter::write
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const ) const
{ {
if (!isDir(outputDir/fieldName)) if (!isDir(outputDir/fieldName))
@ -75,7 +74,7 @@ void Foam::ensightSurfaceWriter::write
writeFormat_ writeFormat_
); );
if (verbose) if (debug)
{ {
Info<< "Writing case file to " << osCase.name() << endl; Info<< "Writing case file to " << osCase.name() << endl;
} }
@ -146,8 +145,7 @@ void Foam::ensightSurfaceWriter::write
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -165,7 +163,7 @@ void Foam::ensightSurfaceWriter::write
writeFormat_ writeFormat_
); );
if (verbose) if (debug)
{ {
Info<< "Writing case file to " << osCase.name() << endl; Info<< "Writing case file to " << osCase.name() << endl;
} }

22
src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H
View File

@ -68,8 +68,7 @@ class ensightSurfaceWriter
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const; ) const;
@ -108,8 +107,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const; ) const;
@ -123,8 +121,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write vectorField for a single surface to file. //- Write vectorField for a single surface to file.
@ -137,8 +134,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write sphericalTensorField for a single surface to file. //- Write sphericalTensorField for a single surface to file.
@ -151,8 +147,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write symmTensorField for a single surface to file. //- Write symmTensorField for a single surface to file.
@ -165,8 +160,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write tensorField for a single surface to file. //- Write tensorField for a single surface to file.
@ -179,10 +173,8 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
}; };

10
src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C
View File

@ -47,8 +47,7 @@ void Foam::foamSurfaceWriter::write
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const ) const
{ {
fileName surfaceDir(outputDir/surfaceName); fileName surfaceDir(outputDir/surfaceName);
@ -58,7 +57,7 @@ void Foam::foamSurfaceWriter::write
mkDir(surfaceDir); mkDir(surfaceDir);
} }
if (verbose) if (debug)
{ {
Info<< "Writing field " << fieldName << " to " << surfaceDir << endl; Info<< "Writing field " << fieldName << " to " << surfaceDir << endl;
} }
@ -100,8 +99,7 @@ void Foam::foamSurfaceWriter::write
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose
) const ) const
{ {
fileName surfaceDir(outputDir/surfaceName); fileName surfaceDir(outputDir/surfaceName);
@ -111,7 +109,7 @@ void Foam::foamSurfaceWriter::write
mkDir(surfaceDir); mkDir(surfaceDir);
} }
if (verbose) if (debug)
{ {
Info<< "Writing geometry to " << surfaceDir << endl; Info<< "Writing geometry to " << surfaceDir << endl;
} }

21
src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H
View File

@ -62,8 +62,7 @@ class foamSurfaceWriter
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const; ) const;
@ -98,8 +97,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const; ) const;
@ -113,8 +111,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write vectorField for a single surface to file. //- Write vectorField for a single surface to file.
@ -127,8 +124,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write sphericalTensorField for a single surface to file. //- Write sphericalTensorField for a single surface to file.
@ -141,8 +137,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write symmTensorField for a single surface to file. //- Write symmTensorField for a single surface to file.
@ -155,8 +150,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write tensorField for a single surface to file. //- Write tensorField for a single surface to file.
@ -169,8 +163,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
}; };

6
src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
View File

@ -55,8 +55,7 @@ namespace Foam
const faceList& faces, \ const faceList& faces, \
const word& fieldName, \ const word& fieldName, \
const Field<FieldType>& values, \ const Field<FieldType>& values, \
const bool isNodeValues, \ const bool isNodeValues \
const bool verbose \
) const \ ) const \
{ \ { \
write \ write \
@ -67,8 +66,7 @@ namespace Foam
faces, \ faces, \
fieldName, \ fieldName, \
values, \ values, \
isNodeValues, \ isNodeValues \
verbose \
); \ ); \
} }

7
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -359,8 +359,7 @@ void Foam::nastranSurfaceWriter::write
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -371,7 +370,7 @@ void Foam::nastranSurfaceWriter::write
OFstream os(outputDir/surfaceName + ".dat"); OFstream os(outputDir/surfaceName + ".dat");
formatOS(os); formatOS(os);
if (verbose) if (debug)
{ {
Info<< "Writing nastran file to " << os.name() << endl; Info<< "Writing nastran file to " << os.name() << endl;
} }

21
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
View File

@ -143,8 +143,7 @@ private:
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const; ) const;
@ -182,8 +181,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const; ) const;
//- Write scalarField for a single surface to file. //- Write scalarField for a single surface to file.
@ -196,8 +194,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write vectorField for a single surface to file. //- Write vectorField for a single surface to file.
@ -210,8 +207,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write sphericalTensorField for a single surface to file. //- Write sphericalTensorField for a single surface to file.
@ -224,8 +220,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write symmTensorField for a single surface to file. //- Write symmTensorField for a single surface to file.
@ -238,8 +233,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write tensorField for a single surface to file. //- Write tensorField for a single surface to file.
@ -252,8 +246,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
}; };

5
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
View File

@ -123,8 +123,7 @@ void Foam::nastranSurfaceWriter::write
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const ) const
{ {
if (!fieldMap_.found(fieldName)) if (!fieldMap_.found(fieldName))
@ -151,7 +150,7 @@ void Foam::nastranSurfaceWriter::write
OFstream os(outputDir/fieldName/surfaceName + ".dat"); OFstream os(outputDir/fieldName/surfaceName + ".dat");
formatOS(os); formatOS(os);
if (verbose) if (debug)
{ {
Info<< "Writing nastran file to " << os.name() << endl; Info<< "Writing nastran file to " << os.name() << endl;
} }

20
src/sampling/sampledSurface/writers/none/noSurfaceWriter.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,8 +75,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const ) const
{} {}
@ -90,8 +89,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -105,8 +103,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -120,8 +117,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -135,8 +131,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -150,8 +145,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
}; };

7
src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -57,8 +57,7 @@ void Foam::proxySurfaceWriter::write
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose
) const ) const
{ {
// avoid bad values // avoid bad values
@ -74,7 +73,7 @@ void Foam::proxySurfaceWriter::write
fileName outName(outputDir/surfaceName + "." + ext_); fileName outName(outputDir/surfaceName + "." + ext_);
if (verbose) if (debug)
{ {
Info<< "Writing geometry to " << outName << endl; Info<< "Writing geometry to " << outName << endl;
} }

20
src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -90,8 +90,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const; ) const;
//- Write scalarField for a single surface to file. //- Write scalarField for a single surface to file.
@ -104,8 +103,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -119,8 +117,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -134,8 +131,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -149,8 +145,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -164,8 +159,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
}; };

10
src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
View File

@ -215,8 +215,7 @@ void Foam::rawSurfaceWriter::write
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -232,7 +231,7 @@ void Foam::rawSurfaceWriter::write
writeCompression_ writeCompression_
); );
if (verbose) if (debug)
{ {
Info<< "Writing field " << fieldName << " to " << os.name() << endl; Info<< "Writing field " << fieldName << " to " << os.name() << endl;
} }
@ -307,8 +306,7 @@ void Foam::rawSurfaceWriter::write
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -324,7 +322,7 @@ void Foam::rawSurfaceWriter::write
writeCompression_ writeCompression_
); );
if (verbose) if (debug)
{ {
Info<< "Writing geometry to " << os.name() << endl; Info<< "Writing geometry to " << os.name() << endl;
} }

21
src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
View File

@ -96,8 +96,7 @@ class rawSurfaceWriter
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const; ) const;
@ -128,8 +127,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const; ) const;
@ -143,8 +141,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write vectorField for a single surface to file. //- Write vectorField for a single surface to file.
@ -157,8 +154,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write sphericalTensorField for a single surface to file. //- Write sphericalTensorField for a single surface to file.
@ -171,8 +167,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write symmTensorField for a single surface to file. //- Write symmTensorField for a single surface to file.
@ -185,8 +180,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write tensorField for a single surface to file. //- Write tensorField for a single surface to file.
@ -199,8 +193,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
}; };

10
src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C
View File

@ -92,8 +92,7 @@ void Foam::starcdSurfaceWriter::write
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -103,7 +102,7 @@ void Foam::starcdSurfaceWriter::write
OFstream os(outputDir/fieldName + '_' + surfaceName + ".usr"); OFstream os(outputDir/fieldName + '_' + surfaceName + ".usr");
if (verbose) if (debug)
{ {
Info<< "Writing field " << fieldName << " to " << os.name() << endl; Info<< "Writing field " << fieldName << " to " << os.name() << endl;
} }
@ -139,8 +138,7 @@ void Foam::starcdSurfaceWriter::write
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -150,7 +148,7 @@ void Foam::starcdSurfaceWriter::write
fileName outName(outputDir/surfaceName + ".inp"); fileName outName(outputDir/surfaceName + ".inp");
if (verbose) if (debug)
{ {
Info<< "Writing geometry to " << outName << endl; Info<< "Writing geometry to " << outName << endl;
} }

21
src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H
View File

@ -85,8 +85,7 @@ class starcdSurfaceWriter
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const; ) const;
@ -121,8 +120,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const; ) const;
//- Write scalarField for a single surface to file. //- Write scalarField for a single surface to file.
@ -135,8 +133,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write vectorField for a single surface to file. //- Write vectorField for a single surface to file.
@ -149,8 +146,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write sphericalTensorField for a single surface to file. //- Write sphericalTensorField for a single surface to file.
@ -163,8 +159,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write symmTensorField for a single surface to file. //- Write symmTensorField for a single surface to file.
@ -177,8 +172,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
@ -192,8 +186,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const ) const
{} {}
}; };

20
src/sampling/sampledSurface/writers/surfaceWriter.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -121,8 +121,7 @@ public:
const fileName& outputDir, // <case>/surface/TIME const fileName& outputDir, // <case>/surface/TIME
const fileName& surfaceName, // name of surface const fileName& surfaceName, // name of surface
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const = 0; ) const = 0;
//- Write scalarField for a single surface to file. //- Write scalarField for a single surface to file.
@ -135,8 +134,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const = 0; ) const = 0;
//- Write vectorField for a single surface to file. //- Write vectorField for a single surface to file.
@ -149,8 +147,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const = 0; ) const = 0;
//- Write sphericalTensorField for a single surface to file. //- Write sphericalTensorField for a single surface to file.
@ -163,8 +160,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const = 0; ) const = 0;
//- Write symmTensorField for a single surface to file. //- Write symmTensorField for a single surface to file.
@ -177,8 +173,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const = 0; ) const = 0;
//- Write tensorField for a single surface to file. //- Write tensorField for a single surface to file.
@ -191,8 +186,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const = 0; ) const = 0;
}; };

10
src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
View File

@ -100,8 +100,7 @@ void Foam::vtkSurfaceWriter::write
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -113,7 +112,7 @@ void Foam::vtkSurfaceWriter::write
ofstream os(filePath, std::ios::binary); ofstream os(filePath, std::ios::binary);
if (verbose) if (debug)
{ {
Info<< "Writing field " << fieldName << " to " << filePath << endl; Info<< "Writing field " << fieldName << " to " << filePath << endl;
} }
@ -173,8 +172,7 @@ void Foam::vtkSurfaceWriter::write
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose
) const ) const
{ {
if (!isDir(outputDir)) if (!isDir(outputDir))
@ -185,7 +183,7 @@ void Foam::vtkSurfaceWriter::write
word filePath = outputDir/surfaceName + ".vtk"; word filePath = outputDir/surfaceName + ".vtk";
ofstream os(filePath, std::ios::binary); ofstream os(filePath, std::ios::binary);
if (verbose) if (debug)
{ {
Info<< "Writing geometry to " << filePath << endl; Info<< "Writing geometry to " << filePath << endl;
} }

21
src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
View File

@ -69,8 +69,7 @@ class vtkSurfaceWriter
const faceList& faces, const faceList& faces,
const word& fieldName, const word& fieldName,
const Field<Type>& values, const Field<Type>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose
) const; ) const;
@ -98,8 +97,7 @@ public:
const fileName& outputDir, const fileName& outputDir,
const fileName& surfaceName, const fileName& surfaceName,
const pointField& points, const pointField& points,
const faceList& faces, const faceList& faces
const bool verbose = false
) const; ) const;
@ -113,8 +111,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<scalar>& values, const Field<scalar>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write vectorField for a single surface to file. //- Write vectorField for a single surface to file.
@ -127,8 +124,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<vector>& values, const Field<vector>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write sphericalTensorField for a single surface to file. //- Write sphericalTensorField for a single surface to file.
@ -141,8 +137,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<sphericalTensor>& values, const Field<sphericalTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write symmTensorField for a single surface to file. //- Write symmTensorField for a single surface to file.
@ -155,8 +150,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<symmTensor>& values, const Field<symmTensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
//- Write tensorField for a single surface to file. //- Write tensorField for a single surface to file.
@ -169,8 +163,7 @@ public:
const faceList& faces, const faceList& faces,
const word& fieldName, // name of field const word& fieldName, // name of field
const Field<tensor>& values, const Field<tensor>& values,
const bool isNodeValues, const bool isNodeValues
const bool verbose = false
) const; ) const;
}; };