diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C index b480512dd6..3277594b2d 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -294,7 +294,6 @@ Foam::tmp Foam::automatic::load() faces, "cellSize", pointCellSize, - true, true ); } diff --git a/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C b/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C index 07377945d5..d1ecfc3935 100644 --- a/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C +++ b/applications/utilities/surface/surfaceFeatures/surfaceFeatures.C @@ -471,8 +471,7 @@ namespace Foam faces, "internalCloseness", // fieldName closenessFields.first(), - false, // isNodeValues - true // verbose + false // isNodeValues ); vtkSurfaceWriter().write @@ -483,8 +482,7 @@ namespace Foam faces, "externalCloseness", // fieldName closenessFields.second(), - false, // isNodeValues - true // verbose + false // isNodeValues ); } } @@ -535,8 +533,7 @@ namespace Foam faces, "internalPointCloseness", // fieldName internalCloseness, - true, // isNodeValues - true // verbose + true // isNodeValues ); vtkSurfaceWriter().write @@ -547,8 +544,7 @@ namespace Foam faces, "externalPointCloseness", // fieldName externalCloseness, - true, // isNodeValues - true // verbose + true // isNodeValues ); } } @@ -586,8 +582,7 @@ namespace Foam faces, "curvature", // fieldName k, - true, // isNodeValues - true // verbose + true // isNodeValues ); } } @@ -659,8 +654,7 @@ namespace Foam faces, "featureProximity", // fieldName featureProximity, - false, // isNodeValues - true // verbose + false // isNodeValues ); } } diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C index b8dd67c08e..27b1821b46 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C @@ -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-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -766,8 +766,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write() outputDir(), regionTypeNames_[regionType_] + ("_" + regionName_), points, - faces, - false + faces ); } } diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C index 54f19a34a8..4f727ba25e 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C @@ -51,8 +51,7 @@ void Foam::ensightSurfaceWriter::write const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const { if (!isDir(outputDir/fieldName)) @@ -75,7 +74,7 @@ void Foam::ensightSurfaceWriter::write writeFormat_ ); - if (verbose) + if (debug) { Info<< "Writing case file to " << osCase.name() << endl; } @@ -146,8 +145,7 @@ void Foam::ensightSurfaceWriter::write const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose + const faceList& faces ) const { if (!isDir(outputDir)) @@ -165,7 +163,7 @@ void Foam::ensightSurfaceWriter::write writeFormat_ ); - if (verbose) + if (debug) { Info<< "Writing case file to " << osCase.name() << endl; } diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H index 6583b50973..dcf6e4062d 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H @@ -68,8 +68,7 @@ class ensightSurfaceWriter const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const; @@ -108,8 +107,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const; @@ -123,8 +121,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write vectorField for a single surface to file. @@ -137,8 +134,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write sphericalTensorField for a single surface to file. @@ -151,8 +147,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write symmTensorField for a single surface to file. @@ -165,8 +160,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write tensorField for a single surface to file. @@ -179,10 +173,8 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; - }; diff --git a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C index 59e1bb9685..a19cd49f97 100644 --- a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C @@ -47,8 +47,7 @@ void Foam::foamSurfaceWriter::write const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const { fileName surfaceDir(outputDir/surfaceName); @@ -58,7 +57,7 @@ void Foam::foamSurfaceWriter::write mkDir(surfaceDir); } - if (verbose) + if (debug) { Info<< "Writing field " << fieldName << " to " << surfaceDir << endl; } @@ -100,8 +99,7 @@ void Foam::foamSurfaceWriter::write const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose + const faceList& faces ) const { fileName surfaceDir(outputDir/surfaceName); @@ -111,7 +109,7 @@ void Foam::foamSurfaceWriter::write mkDir(surfaceDir); } - if (verbose) + if (debug) { Info<< "Writing geometry to " << surfaceDir << endl; } diff --git a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H index 972b07dc5e..8571fec38d 100644 --- a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H @@ -62,8 +62,7 @@ class foamSurfaceWriter const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const; @@ -98,8 +97,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const; @@ -113,8 +111,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write vectorField for a single surface to file. @@ -127,8 +124,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write sphericalTensorField for a single surface to file. @@ -141,8 +137,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write symmTensorField for a single surface to file. @@ -155,8 +150,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write tensorField for a single surface to file. @@ -169,8 +163,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; }; diff --git a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H index a87d10d78c..120f126fa9 100644 --- a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H +++ b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H @@ -55,11 +55,10 @@ namespace Foam const faceList& faces, \ const word& fieldName, \ const Field& values, \ - const bool isNodeValues, \ - const bool verbose \ + const bool isNodeValues \ ) const \ { \ - write \ + write \ ( \ outputDir, \ surfaceName, \ @@ -67,8 +66,7 @@ namespace Foam faces, \ fieldName, \ values, \ - isNodeValues, \ - verbose \ + isNodeValues \ ); \ } diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C index c046f1ac32..d6b6ce9174 100644 --- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -359,8 +359,7 @@ void Foam::nastranSurfaceWriter::write const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose + const faceList& faces ) const { if (!isDir(outputDir)) @@ -371,7 +370,7 @@ void Foam::nastranSurfaceWriter::write OFstream os(outputDir/surfaceName + ".dat"); formatOS(os); - if (verbose) + if (debug) { Info<< "Writing nastran file to " << os.name() << endl; } diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H index 29bf10a522..4f320b7ce0 100644 --- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H @@ -143,8 +143,7 @@ private: const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const; @@ -182,8 +181,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const; //- Write scalarField for a single surface to file. @@ -196,8 +194,7 @@ public: const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write vectorField for a single surface to file. @@ -210,8 +207,7 @@ public: const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write sphericalTensorField for a single surface to file. @@ -224,8 +220,7 @@ public: const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write symmTensorField for a single surface to file. @@ -238,8 +233,7 @@ public: const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write tensorField for a single surface to file. @@ -252,8 +246,7 @@ public: const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; }; diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C index 4d83c4e8aa..9f7cd5d393 100644 --- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C +++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C @@ -123,8 +123,7 @@ void Foam::nastranSurfaceWriter::write const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const { if (!fieldMap_.found(fieldName)) @@ -151,7 +150,7 @@ void Foam::nastranSurfaceWriter::write OFstream os(outputDir/fieldName/surfaceName + ".dat"); formatOS(os); - if (verbose) + if (debug) { Info<< "Writing nastran file to " << os.name() << endl; } diff --git a/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H b/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H index 5bb82a3290..af391946b7 100644 --- a/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,8 +75,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const {} @@ -90,8 +89,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -105,8 +103,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -120,8 +117,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -135,8 +131,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -150,8 +145,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} }; diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C index c322fced29..cd67795c8a 100644 --- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,8 +57,7 @@ void Foam::proxySurfaceWriter::write const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose + const faceList& faces ) const { // avoid bad values @@ -74,7 +73,7 @@ void Foam::proxySurfaceWriter::write fileName outName(outputDir/surfaceName + "." + ext_); - if (verbose) + if (debug) { Info<< "Writing geometry to " << outName << endl; } diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H index 21850f1939..ae3f51b717 100644 --- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,8 +90,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const; //- Write scalarField for a single surface to file. @@ -104,8 +103,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -119,8 +117,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -134,8 +131,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -149,8 +145,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -164,8 +159,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} }; diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C index 0b8390554e..258c3e1131 100644 --- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C @@ -215,8 +215,7 @@ void Foam::rawSurfaceWriter::write const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const { if (!isDir(outputDir)) @@ -232,7 +231,7 @@ void Foam::rawSurfaceWriter::write writeCompression_ ); - if (verbose) + if (debug) { Info<< "Writing field " << fieldName << " to " << os.name() << endl; } @@ -307,8 +306,7 @@ void Foam::rawSurfaceWriter::write const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose + const faceList& faces ) const { if (!isDir(outputDir)) @@ -324,7 +322,7 @@ void Foam::rawSurfaceWriter::write writeCompression_ ); - if (verbose) + if (debug) { Info<< "Writing geometry to " << os.name() << endl; } diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H index 20a91364af..2698062084 100644 --- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H @@ -96,8 +96,7 @@ class rawSurfaceWriter const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const; @@ -128,8 +127,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const; @@ -143,8 +141,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write vectorField for a single surface to file. @@ -157,8 +154,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write sphericalTensorField for a single surface to file. @@ -171,8 +167,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write symmTensorField for a single surface to file. @@ -185,8 +180,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write tensorField for a single surface to file. @@ -199,8 +193,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; }; diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C index 0fc17629b9..128a2504c9 100644 --- a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C @@ -92,8 +92,7 @@ void Foam::starcdSurfaceWriter::write const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const { if (!isDir(outputDir)) @@ -103,7 +102,7 @@ void Foam::starcdSurfaceWriter::write OFstream os(outputDir/fieldName + '_' + surfaceName + ".usr"); - if (verbose) + if (debug) { Info<< "Writing field " << fieldName << " to " << os.name() << endl; } @@ -139,8 +138,7 @@ void Foam::starcdSurfaceWriter::write const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose + const faceList& faces ) const { if (!isDir(outputDir)) @@ -150,7 +148,7 @@ void Foam::starcdSurfaceWriter::write fileName outName(outputDir/surfaceName + ".inp"); - if (verbose) + if (debug) { Info<< "Writing geometry to " << outName << endl; } diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H index 8eed8b8a81..bae244c9e2 100644 --- a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H @@ -85,8 +85,7 @@ class starcdSurfaceWriter const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const; @@ -121,8 +120,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const; //- Write scalarField for a single surface to file. @@ -135,8 +133,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write vectorField for a single surface to file. @@ -149,8 +146,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write sphericalTensorField for a single surface to file. @@ -163,8 +159,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write symmTensorField for a single surface to file. @@ -177,8 +172,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} @@ -192,8 +186,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const {} }; diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H index 0d301da33a..2dd9ce7bbc 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.H +++ b/src/sampling/sampledSurface/writers/surfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -121,8 +121,7 @@ public: const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const = 0; //- Write scalarField for a single surface to file. @@ -135,8 +134,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const = 0; //- Write vectorField for a single surface to file. @@ -149,8 +147,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const = 0; //- Write sphericalTensorField for a single surface to file. @@ -163,8 +160,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const = 0; //- Write symmTensorField for a single surface to file. @@ -177,8 +173,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const = 0; //- Write tensorField for a single surface to file. @@ -191,8 +186,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const = 0; }; diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C index 0ef70c8c82..703d1c08de 100644 --- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C @@ -100,8 +100,7 @@ void Foam::vtkSurfaceWriter::write const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const { if (!isDir(outputDir)) @@ -113,7 +112,7 @@ void Foam::vtkSurfaceWriter::write ofstream os(filePath, std::ios::binary); - if (verbose) + if (debug) { Info<< "Writing field " << fieldName << " to " << filePath << endl; } @@ -173,8 +172,7 @@ void Foam::vtkSurfaceWriter::write const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose + const faceList& faces ) const { if (!isDir(outputDir)) @@ -185,7 +183,7 @@ void Foam::vtkSurfaceWriter::write word filePath = outputDir/surfaceName + ".vtk"; ofstream os(filePath, std::ios::binary); - if (verbose) + if (debug) { Info<< "Writing geometry to " << filePath << endl; } diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H index 7a86c1640f..4b623d3589 100644 --- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H @@ -69,8 +69,7 @@ class vtkSurfaceWriter const faceList& faces, const word& fieldName, const Field& values, - const bool isNodeValues, - const bool verbose + const bool isNodeValues ) const; @@ -98,8 +97,7 @@ public: const fileName& outputDir, const fileName& surfaceName, const pointField& points, - const faceList& faces, - const bool verbose = false + const faceList& faces ) const; @@ -113,8 +111,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write vectorField for a single surface to file. @@ -127,8 +124,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write sphericalTensorField for a single surface to file. @@ -141,8 +137,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write symmTensorField for a single surface to file. @@ -155,8 +150,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; //- Write tensorField for a single surface to file. @@ -169,8 +163,7 @@ public: const faceList& faces, const word& fieldName, // name of field const Field& values, - const bool isNodeValues, - const bool verbose = false + const bool isNodeValues ) const; };