diff --git a/applications/test/foamToEnsight-check/foamToEnsight-check.C b/applications/test/foamToEnsight-check/foamToEnsight-check.C index 8759fcf8db..18b0dbb131 100644 --- a/applications/test/foamToEnsight-check/foamToEnsight-check.C +++ b/applications/test/foamToEnsight-check/foamToEnsight-check.C @@ -200,7 +200,7 @@ int main(int argc, char *argv[]) // Less frequently used - reduce some clutter argList::setAdvanced("decomposeParDict"); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); #include "addAllRegionOptions.H" diff --git a/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C b/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C index 523f892b3d..371cc46d6a 100644 --- a/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C +++ b/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C @@ -78,10 +78,7 @@ int main(int argc, char *argv[]) "detail", "Additional detail" ); - argList::addVerboseOption - ( - "Additional verbosity" - ); + argList::addVerboseOption(); argList::addArgument("lib..."); argList::noMandatoryArgs(); // Arguments are optional diff --git a/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C b/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C index 124b549f79..862329b6cd 100644 --- a/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C +++ b/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C @@ -235,10 +235,7 @@ int main(int argc, char *argv[]) ( "Report action without moving/renaming" ); - argList::addVerboseOption - ( - "Additional verbosity" - ); + argList::addVerboseOption(); // Arguments are optional (non-mandatory) argList::noMandatoryArgs(); diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C index 8916b01f6f..bd77c4096c 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C +++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C @@ -334,7 +334,7 @@ int main(int argc, char *argv[]) "Test without writing the decomposition. " "Changes -cellDist to only write VTK output." ); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); argList::addOption ( "domains", diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C index 2ab54d02bd..bae8f635a5 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C +++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) #include "addAllRegionOptions.H" - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); argList::addOption ( "fields", diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C index 4f87ea6d94..feb14f0c40 100644 --- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C +++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C @@ -594,7 +594,7 @@ int main(int argc, char *argv[]) argList::noParallel(); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); argList::addBoolOption ( "addressing-only", diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index c29210a46f..b1ee6a5d71 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -1020,7 +1020,7 @@ int main(int argc, char *argv[]) #include "addOverwriteOption.H" argList::addBoolOption("decompose", "Decompose case"); argList::addBoolOption("reconstruct", "Reconstruct case"); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); argList::addDryRunOption ( "Test without writing the decomposition. " diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C index f666628618..6f0cdc0dfc 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C @@ -169,7 +169,7 @@ int main(int argc, char *argv[]) // Less frequently used - reduce some clutter argList::setAdvanced("decomposeParDict"); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); #include "addAllRegionOptions.H" diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C index 0e0b1b4f67..779d0de545 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) // Less frequently used - reduce some clutter argList::setAdvanced("decomposeParDict"); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); argList::addBoolOption ( diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C index 9d38c16dcc..6270c10a84 100644 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) "The writer format " "(default: vtk or 'setFormat' from dictionary)" ); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); #include "setRootCase.H" #include "createTime.H" diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C index 26af769a45..ba7aa1c56f 100644 --- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C +++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) "file", "Alternative particleTrackDict dictionary" ); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); #include "setRootCase.H" #include "createTime.H" diff --git a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C index d5cc691d79..09088046b3 100644 --- a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C +++ b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C @@ -72,10 +72,7 @@ int main(int argc, char *argv[]) "Suppress calculation/display of point interpolators" ); - argList::addVerboseOption - ( - "Additional verbosity" - ); + argList::addVerboseOption(); #include "addRegionOption.H" #include "setRootCase.H" diff --git a/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C b/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C index 7ca090ed43..2e615ee8d8 100644 --- a/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C +++ b/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) ); argList::noCheckProcessorDirectories(); - argList::addVerboseOption("Additional verbosity"); + argList::addVerboseOption(); argList::addArgument("input", "The input surface file"); diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C index 0db4feefd1..be8a3dd413 100644 --- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C +++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2016-2021 OpenCFD Ltd. + Copyright (C) 2016-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -80,6 +80,7 @@ int main(int argc, char *argv[]) "factor", "Geometry scaling factor on input surfaces" ); + argList::addVerboseOption(); argList args(argc, argv); @@ -87,6 +88,7 @@ int main(int argc, char *argv[]) const auto inFileName2 = args.get(2); const auto outFileName = args.get(3); + const int optVerbose = args.verbose(); const bool addPoint = args.found("points"); const bool mergeRegions = args.found("mergeRegions"); @@ -284,7 +286,7 @@ int main(int argc, char *argv[]) } // Merge all common points and do some checks - combinedSurf.cleanup(true); + combinedSurf.cleanup(optVerbose); Info<< "Merged surface:" << endl; diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C index 278b84825a..fd6e5dbbca 100644 --- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C +++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C @@ -308,10 +308,7 @@ int main(int argc, char *argv[]) "Split surface along non-manifold edges " "(default split is fully disconnected)" ); - argList::addVerboseOption - ( - "Additional verbosity" - ); + argList::addVerboseOption(); argList::addBoolOption ( "blockMesh", diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C index f1e6264231..8af8a1780c 100644 --- a/applications/utilities/surface/surfaceClean/surfaceClean.C +++ b/applications/utilities/surface/surfaceClean/surfaceClean.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2013 OpenFOAM Foundation - Copyright (C) 2020-2021 OpenCFD Ltd. + Copyright (C) 2020-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -73,6 +73,7 @@ int main(int argc, char *argv[]) "Suppress surface checking/cleanup on the input surface" ); argList::addOptionCompat("no-clean", {"noClean", -2006}); + argList::addVerboseOption(); argList::addOption ( @@ -87,6 +88,8 @@ int main(int argc, char *argv[]) const auto minQuality = args.get(3); const auto outFileName = args.get(4); + const int optVerbose = args.verbose(); + Info<< "Reading surface " << inFileName << nl << "Collapsing all triangles with" << nl << " edges or heights < " << minLen << nl @@ -106,7 +109,7 @@ int main(int argc, char *argv[]) if (!args.found("no-clean")) { Info<< "Removing duplicate and illegal triangles ..." << nl << endl; - surf.cleanup(true); + surf.cleanup(optVerbose); } Info<< "Collapsing triangles to edges ..." << nl << endl; diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C index e9851a432f..58ccc167fb 100644 --- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C +++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2020-2022 OpenCFD Ltd. + Copyright (C) 2020-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -144,6 +144,7 @@ int main(int argc, char *argv[]) "The output precision" ); argList::addOptionCompat("precision", {"writePrecision", 1812}); + argList::addVerboseOption(); argList args(argc, argv); @@ -161,6 +162,8 @@ int main(int argc, char *argv[]) const auto importName = args.get(1); const auto exportName = args.get(2); + const int optVerbose = args.verbose(); + if (importName == exportName) { FatalError @@ -207,7 +210,7 @@ int main(int argc, char *argv[]) if (args.found("clean")) { Info<< "Cleaning up surface" << endl; - surf.cleanup(true); + surf.cleanup(optVerbose); Info<< "After cleaning up surface:" << endl; surf.writeStats(Info); diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C index 3b81e3545a..4466825513 100644 --- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C +++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2018-2022 OpenCFD Ltd. + Copyright (C) 2018-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -127,6 +127,7 @@ int main(int argc, char *argv[]) "clean", "Perform some surface checking/cleanup on the input surface" ); + argList::addVerboseOption(); argList::addOption ( "read-format", @@ -177,13 +178,14 @@ int main(int argc, char *argv[]) "Triangulate surface" ); - argList args(argc, argv); Time runTime(args.rootPath(), args.caseName()); const auto importName = args.get(1); const auto exportName = args.get(2); + const int optVerbose = args.verbose(); + if (importName == exportName) { FatalError @@ -298,7 +300,7 @@ int main(int argc, char *argv[]) if (args.found("clean")) { - surf.cleanup(true); + surf.cleanup(optVerbose); } if (fromCsys) diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C index 260ae19217..57310daedb 100644 --- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C +++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2018-2022 OpenCFD Ltd. + Copyright (C) 2018-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -105,6 +105,7 @@ int main(int argc, char *argv[]) "clean", "Perform some surface checking/cleanup on the input surface" ); + argList::addVerboseOption(); argList::addOption ( "name", @@ -157,6 +158,8 @@ int main(int argc, char *argv[]) const auto exportName = args.get(1); const auto importName = args.getOrDefault("name", "default"); + const int optVerbose = args.verbose(); + const word writeFileType ( args.getOrDefault("write-format", getExtension(exportName)) @@ -273,7 +276,7 @@ int main(int argc, char *argv[]) if (args.found("clean")) { - surf.cleanup(true); + surf.cleanup(optVerbose); } if (fromCsys) diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C index 03cb91a96e..8ebae3ebfe 100644 --- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C +++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2018-2022 OpenCFD Ltd. + Copyright (C) 2018-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -105,6 +105,7 @@ int main(int argc, char *argv[]) "clean", "Perform some surface checking/cleanup on the input surface" ); + argList::addVerboseOption(); argList::addOption ( "name", @@ -169,6 +170,8 @@ int main(int argc, char *argv[]) const auto importName = args.get(1); const auto exportName = args.getOrDefault("name", "default"); + const int optVerbose = args.verbose(); + const word readFileType ( args.getOrDefault("read-format", getExtension(importName)) @@ -268,7 +271,7 @@ int main(int argc, char *argv[]) if (args.found("clean")) { - surf.cleanup(true); + surf.cleanup(optVerbose); } if (fromCsys) diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C index c8d2a498ee..81e4d0403f 100644 --- a/src/OpenFOAM/global/argList/argList.C +++ b/src/OpenFOAM/global/argList/argList.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2015-2022 OpenCFD Ltd. + Copyright (C) 2015-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -514,7 +514,14 @@ void Foam::argList::addVerboseOption bool advanced ) { - argList::addBoolOption("verbose", usage, advanced); + if (usage.empty()) + { + argList::addBoolOption("verbose", "Additional verbosity", advanced); + } + else + { + argList::addBoolOption("verbose", usage, advanced); + } } diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H index ebc3bf836a..8a101e8781 100644 --- a/src/OpenFOAM/global/argList/argList.H +++ b/src/OpenFOAM/global/argList/argList.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2016-2022 OpenCFD Ltd. + Copyright (C) 2016-2023 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -628,7 +628,7 @@ public: //- Enable a 'verbose' bool option, with usage information static void addVerboseOption ( - const string& usage, //! usage information (expected) + const string& usage = "", //! usage information (optional) bool advanced = false );