From 35afeb9b189552a0271325d509576acc35a60cc1 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 3 May 2010 08:38:39 +0200 Subject: [PATCH] STYLE: remove superfluous uses of argList::validArgs.clear() - a holdover from the old days --- applications/test/FixedList/FixedListTest.C | 1 - applications/test/ODETest/ODETest.C | 1 - applications/test/prefixOSstream/prefixOSstreamTest.C | 1 - applications/test/readCHEMKINIII/readCHEMKINIII.C | 1 - .../utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C | 2 -- .../utilities/mesh/manipulation/objToVTK/objToVTK.C | 1 - .../miscellaneous/expandDictionary/expandDictionary.C | 1 - applications/utilities/preProcessing/mapFields/mapFields.C | 1 - applications/utilities/surface/surfaceAdd/surfaceAdd.C | 1 - .../utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C | 1 - applications/utilities/surface/surfaceCheck/surfaceCheck.C | 3 --- applications/utilities/surface/surfaceClean/surfaceClean.C | 1 - .../utilities/surface/surfaceCoarsen/surfaceCoarsen.C | 1 - .../utilities/surface/surfaceConvert/surfaceConvert.C | 1 - .../surface/surfaceFeatureExtract/surfaceFeatureExtract.C | 2 -- applications/utilities/surface/surfaceFind/surfaceFind.C | 6 ++---- .../utilities/surface/surfaceOrient/surfaceOrient.C | 1 - .../utilities/surface/surfacePointMerge/surfacePointMerge.C | 1 - .../surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C | 1 - .../utilities/surface/surfaceSmooth/surfaceSmooth.C | 1 - .../surface/surfaceSplitByPatch/surfaceSplitByPatch.C | 3 +-- .../surfaceSplitNonManifolds/surfaceSplitNonManifolds.C | 2 -- .../utilities/surface/surfaceSubset/surfaceSubset.C | 1 - .../surface/surfaceTransformPoints/surfaceTransformPoints.C | 1 - .../thermophysical/adiabaticFlameT/adiabaticFlameT.C | 1 - .../utilities/thermophysical/chemkinToFoam/chemkinToFoam.C | 1 - .../thermophysical/equilibriumFlameT/equilibriumFlameT.C | 1 - .../mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C | 1 - 28 files changed, 3 insertions(+), 37 deletions(-) diff --git a/applications/test/FixedList/FixedListTest.C b/applications/test/FixedList/FixedListTest.C index 79abb4a34a..208ff277b1 100644 --- a/applications/test/FixedList/FixedListTest.C +++ b/applications/test/FixedList/FixedListTest.C @@ -43,7 +43,6 @@ using namespace Foam; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList args(argc, argv); FixedList list; diff --git a/applications/test/ODETest/ODETest.C b/applications/test/ODETest/ODETest.C index e8d29553e1..2a3b8357b9 100644 --- a/applications/test/ODETest/ODETest.C +++ b/applications/test/ODETest/ODETest.C @@ -104,7 +104,6 @@ public: int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList::validArgs.append("ODESolver"); argList args(argc, argv); diff --git a/applications/test/prefixOSstream/prefixOSstreamTest.C b/applications/test/prefixOSstream/prefixOSstreamTest.C index 98bcee40c4..093c540e96 100644 --- a/applications/test/prefixOSstream/prefixOSstreamTest.C +++ b/applications/test/prefixOSstream/prefixOSstreamTest.C @@ -45,7 +45,6 @@ using namespace Foam; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList args(argc, argv); //Pout.prefix() = '[' + name(Pstream::myProcNo()) + "] "; diff --git a/applications/test/readCHEMKINIII/readCHEMKINIII.C b/applications/test/readCHEMKINIII/readCHEMKINIII.C index 9165f84839..7005f93592 100644 --- a/applications/test/readCHEMKINIII/readCHEMKINIII.C +++ b/applications/test/readCHEMKINIII/readCHEMKINIII.C @@ -35,7 +35,6 @@ using namespace Foam; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList::validArgs.append("CHEMKINIIIFile"); argList::addOption("thermo", "fileName"); argList args(argc, argv); diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C index 03741a528c..af09f07933 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C +++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C @@ -61,8 +61,6 @@ int main(int argc, char *argv[]) ); argList::noParallel(); - argList::validArgs.clear(); - argList::validArgs.append("masterCase"); argList::addOption ( diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C index 2cb7ef6c5b..55a2238757 100644 --- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C +++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C @@ -110,7 +110,6 @@ labelList parseVertices(const string& line) int main(int argc, char *argv[]) { argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("OBJ file"); argList::validArgs.append("output VTK file"); argList args(argc, argv); diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C index c488cb6602..08e8f29f24 100644 --- a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C +++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C @@ -44,7 +44,6 @@ int main(int argc, char *argv[]) { argList::noBanner(); argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("inputDict"); argList args(argc, argv); diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C index 2d416fd029..0b1d251483 100644 --- a/applications/utilities/preProcessing/mapFields/mapFields.C +++ b/applications/utilities/preProcessing/mapFields/mapFields.C @@ -232,7 +232,6 @@ int main(int argc, char *argv[]) "map volume fields from one mesh to another" ); argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("sourceCase"); argList::addOption diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C index 5dd58b1402..2c6d1509d9 100644 --- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C +++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C @@ -51,7 +51,6 @@ int main(int argc, char *argv[]) ); argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("surfaceFile"); argList::validArgs.append("output surfaceFile"); diff --git a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C index 8144b54f21..1ab3b58082 100644 --- a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C +++ b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C @@ -46,7 +46,6 @@ using namespace Foam; int main(int argc, char *argv[]) { argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("input surfaceFile"); argList::validArgs.append("output surfaceFile"); argList::validArgs.append("includedAngle [0..180]"); diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C index 4cad39c8aa..577f1470ae 100644 --- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C +++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C @@ -173,10 +173,7 @@ labelList countBins int main(int argc, char *argv[]) { argList::noParallel(); - - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); - argList::addBoolOption ( "checkSelfIntersection", diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C index 2547240472..85b9cd324e 100644 --- a/applications/utilities/surface/surfaceClean/surfaceClean.C +++ b/applications/utilities/surface/surfaceClean/surfaceClean.C @@ -46,7 +46,6 @@ using namespace Foam; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList::noParallel(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("min length"); diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C index af9d5ff9c6..3a2393949d 100644 --- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C +++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C @@ -64,7 +64,6 @@ int mapVertex(::List& collapse_map, int a, int mx) int main(int argc, char *argv[]) { argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("reductionFactor"); argList::validArgs.append("output surfaceFile"); diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C index 566c9f1583..c2598aff2a 100644 --- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C +++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C @@ -64,7 +64,6 @@ int main(int argc, char *argv[]) ); argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("inputFile"); argList::validArgs.append("outputFile"); diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C index 5775e68a6b..83d84b92c8 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C +++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C @@ -95,8 +95,6 @@ int main(int argc, char *argv[]) "extract and write surface features to file" ); argList::noParallel(); - - argList::validArgs.clear(); argList::validArgs.append("surface"); argList::validArgs.append("output set"); diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C index 383a692800..1d6d098752 100644 --- a/applications/utilities/surface/surfaceFind/surfaceFind.C +++ b/applications/utilities/surface/surfaceFind/surfaceFind.C @@ -40,16 +40,14 @@ using namespace Foam; int main(int argc, char *argv[]) { argList::noParallel(); - argList::validArgs.clear(); + argList::validArgs.append("surfaceFile"); argList::addOption("x", "X", "The point x-coordinate (if non-zero)"); argList::addOption("y", "Y", "The point y-coordinate (if non-zero)"); argList::addOption("z", "Z", "The point y-coordinate (if non-zero)"); - argList::validArgs.append("surfaceFile"); - argList args(argc, argv); - point samplePt + const point samplePt ( args.optionLookupOrDefault("x", 0), args.optionLookupOrDefault("y", 0), diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C index b19a39ff1c..6ed45df88d 100644 --- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C +++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C @@ -45,7 +45,6 @@ int main(int argc, char *argv[]) ); argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("visiblePoint"); argList::validArgs.append("output surfaceFile"); diff --git a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C index da6df12877..542a72e484 100644 --- a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C +++ b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C @@ -42,7 +42,6 @@ using namespace Foam; int main(int argc, char *argv[]) { argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("merge distance"); argList::validArgs.append("output surfaceFile"); diff --git a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C index 786adff49d..3bf41c96ed 100644 --- a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C +++ b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C @@ -47,7 +47,6 @@ using namespace Foam; int main(int argc, char *argv[]) { argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("output surfaceFile"); argList args(argc, argv); diff --git a/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C b/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C index bb767307ab..3f990dc8ff 100644 --- a/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C +++ b/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C @@ -42,7 +42,6 @@ int main(int argc, char *argv[]) { argList::noParallel(); argList::validOptions.clear(); - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("underrelax factor (0..1)"); argList::validArgs.append("iterations"); diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C index 2f11567cda..1024ea9bf4 100644 --- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C +++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C @@ -42,8 +42,7 @@ int main(int argc, char *argv[]) ); argList::noParallel(); - argList::validArgs.clear(); - argList::validArgs.append("input file"); + argList::validArgs.append("input surfaceFile"); argList args(argc, argv); const fileName surfName = args[1]; diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C index 284732438b..a8ec5ea4d8 100644 --- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C +++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C @@ -671,8 +671,6 @@ int main(int argc, char *argv[]) "split multiply connected surface edges by duplicating points" ); argList::noParallel(); - argList::validArgs.clear(); - argList::validArgs.append("surfaceFile"); argList::validArgs.append("output surfaceFile"); argList::addBoolOption diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C index 9de7881744..3246358d9b 100644 --- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C +++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C @@ -47,7 +47,6 @@ using namespace Foam; int main(int argc, char *argv[]) { argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("surfaceSubsetDict"); argList::validArgs.append("surfaceFile"); argList::validArgs.append("output surfaceFile"); diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C index 189a281877..0b223d6f83 100644 --- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C +++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C @@ -60,7 +60,6 @@ int main(int argc, char *argv[]) "Like transformPoints but for surfaces." ); argList::noParallel(); - argList::validArgs.clear(); argList::validArgs.append("surfaceFile"); argList::validArgs.append("output surfaceFile"); argList::addOption diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C index 5139b8c499..29d8d35feb 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C +++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C @@ -49,7 +49,6 @@ typedef specieThermo > thermo; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList::validArgs.append("controlFile"); argList args(argc, argv); diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C index 508d868c7a..1bf676cd54 100644 --- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C +++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C @@ -38,7 +38,6 @@ using namespace Foam; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList::validArgs.append("CHEMKINFile"); argList::validArgs.append("CHEMKINThermodynamicsFile"); argList::validArgs.append("FOAMChemistryFile"); diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C index 2990cc81dc..457c0db080 100644 --- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C +++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C @@ -50,7 +50,6 @@ typedef specieThermo > thermo; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList::validArgs.append("controlFile"); argList args(argc, argv); diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C index fa28d5cc01..eef86c7f7a 100644 --- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C +++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C @@ -49,7 +49,6 @@ typedef specieThermo > thermo; int main(int argc, char *argv[]) { - argList::validArgs.clear(); argList::validArgs.append("controlFile"); argList args(argc, argv);