applications/solvers/multiphase/interCondensatingEvaporatingFoam/createFields.H

@@ -29,8 +29,10 @@ volVectorField U
 #include "createPhi.H"
 
 // Creating e based thermo
-autoPtr<twoPhaseMixtureEThermo> thermo;
-thermo.set(new twoPhaseMixtureEThermo(U, phi));
+autoPtr<twoPhaseMixtureEThermo> thermo
+(
+    new twoPhaseMixtureEThermo(U, phi)
+);
 
 // Create mixture and
 Info<< "Creating temperaturePhaseChangeTwoPhaseMixture\n" << endl;

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C

@@ -49,7 +49,7 @@ Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::ThermoPhaseModel
 {
     if (createThermo)
     {
-        thermoPtr_.set
+        thermoPtr_.reset
         (
             ThermoType::New(fluid.mesh(), this->name()).ptr()
         );

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C

@@ -76,7 +76,7 @@ Foam::BlendedInterfacialModel<modelType>::BlendedInterfacialModel
 {
     if (modelTable.found(pair_))
     {
-        model_.set
+        model_.reset
         (
             modelType::New
             (
@@ -88,7 +88,7 @@ Foam::BlendedInterfacialModel<modelType>::BlendedInterfacialModel
 
     if (modelTable.found(pair1In2_))
     {
-        model1In2_.set
+        model1In2_.reset
         (
             modelType::New
             (
@@ -100,7 +100,7 @@ Foam::BlendedInterfacialModel<modelType>::BlendedInterfacialModel
 
     if (modelTable.found(pair2In1_))
     {
-        model2In1_.set
+        model2In1_.reset
         (
             modelType::New
             (

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C

@@ -41,7 +41,7 @@ Foam::orderedPhasePair::orderedPhasePair
 {
     if (aspectRatioTable.found(*this))
     {
-        aspectRatio_.set
+        aspectRatio_.reset
         (
             aspectRatioModel::New
             (

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C

@@ -132,7 +132,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
     phasePair::scalarTable sigmaTable(lookup("sigma"));
     phasePair::dictTable aspectRatioTable(lookup("aspectRatio"));
 
-    pair_.set
+    pair_.reset
     (
         new phasePair
         (
@@ -143,7 +143,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     );
 
-    pair1In2_.set
+    pair1In2_.reset
     (
         new orderedPhasePair
         (
@@ -155,7 +155,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     );
 
-    pair2In1_.set
+    pair2In1_.reset
     (
         new orderedPhasePair
         (
@@ -170,7 +170,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
 
     // Models
 
-    drag_.set
+    drag_.reset
     (
         new BlendedInterfacialModel<dragModel>
         (
@@ -187,7 +187,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     );
 
-    virtualMass_.set
+    virtualMass_.reset
     (
         new BlendedInterfacialModel<virtualMassModel>
         (
@@ -203,7 +203,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     );
 
-    heatTransfer_.set
+    heatTransfer_.reset
     (
         new BlendedInterfacialModel<heatTransferModel>
         (
@@ -219,7 +219,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     );
 
-    lift_.set
+    lift_.reset
     (
         new BlendedInterfacialModel<liftModel>
         (
@@ -235,7 +235,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     );
 
-    wallLubrication_.set
+    wallLubrication_.reset
     (
         new BlendedInterfacialModel<wallLubricationModel>
         (
@@ -251,7 +251,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     );
 
-    turbulentDispersion_.set
+    turbulentDispersion_.reset
     (
         new BlendedInterfacialModel<turbulentDispersionModel>
         (

applications/test/ODE/Test-ODE.C

@@ -103,7 +103,7 @@ public:
 
 int main(int argc, char *argv[])
 {
-    argList::validArgs.append("ODESolver");
+    argList::addArgument("ODESolver");
     argList args(argc, argv);
 
     // Create the ODE system

applications/test/PackedList/Test-PackedList.C

@@ -82,7 +82,7 @@ inline void reportInfo()
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validArgs.insert("file .. fileN");
+    argList::addArgument("file .. fileN");
 
     argList::addBoolOption("mask", "report information about the bit masks");
     argList::addBoolOption("count", "test the count() method");

applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C

@@ -40,7 +40,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    argList::validArgs.append("patch");
+    argList::addArgument("patch");
 
     #include "setRootCase.H"
     #include "createTime.H"

applications/test/PatchTools/Test-PatchTools.C

@@ -201,7 +201,7 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     #include "addTimeOptions.H"
-    argList::validArgs.append("patch");
+    argList::addArgument("patch");
     #include "setRootCase.H"
     #include "createTime.H"
 

applications/test/PointEdgeWave/Test-PointEdgeWave.C

@@ -41,7 +41,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    argList::validArgs.append("(patches)");
+    argList::addArgument("(patches)");
 
     #include "setRootCase.H"
     #include "createTime.H"

applications/test/argList/Test-argList.C

@@ -38,12 +38,24 @@ int main(int argc, char *argv[])
 {
     argList::noBanner();
     argList::noParallel();
-    argList::noFunctionObjects();
+    // argList::noFunctionObjects();
     argList::removeOption("case");
 
     argList::addOption("label", "value", "Test parsing of label");
     argList::addOption("scalar", "value", "Test parsing of scalar");
 
+    // These are actually lies (never had -parseLabel, -parseScalar etc),
+    // but good for testing...
+
+    // Emits warning about it being old
+    argList::addOptionCompat("label", {"parseLabel", 1612});
+
+    // Specifying version=0 to use alias without any warnings
+    argList::addOptionCompat("scalar", {"parseScalar", 0});
+
+    // Fake a future option...
+    argList::addOptionCompat("label", {"parse-label", 2112});
+
     argList args(argc, argv);
 
     label ival;

applications/test/checkDecomposePar/Test-checkDecomposePar.C

@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
         "more information about decomposition"
     );
 
-    argList::validArgs.append("kaffpa-output-file");
+    argList::addArgument("kaffpa-output-file");
 
     // Include explicit constant options, have zero from time range
     timeSelector::addOptions(true, false);

applications/test/codeStream/Test-codeStream.C

@@ -42,7 +42,7 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validArgs.insert("dict .. dictN");
+    argList::addArgument("dict .. dictN");
     argList args(argc, argv, false, true);
 
     Info<< nl

applications/test/cstring/Test-cstring.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,8 +30,10 @@ Description
 #include "DynamicList.H"
 #include "IOstreams.H"
 #include "fileNameList.H"
+#include "stringOps.H"
 #include "stringList.H"
 #include "wordList.H"
+#include "SubStrings.H"
 
 using namespace Foam;
 
@@ -53,6 +55,26 @@ int print(const CStringList& cstrLst)
 }
 
 
+// Using nullptr termination
+int print(char *argv[])
+{
+    if (!argv)
+    {
+        Info<< "argv=null" << endl;
+        return 0;
+    }
+
+    int i=0;
+    while (argv[i])
+    {
+        Info<< "  argv[" << i << "] = \"" << argv[i] << "\"" << endl;
+        ++i;
+    }
+
+    return i;
+}
+
+
 // Main program:
 
 int main(int argc, char *argv[])
@@ -62,18 +84,49 @@ int main(int argc, char *argv[])
 
     dynlst.append("string1 with content");
     dynlst.append("string2 other content");
-    dynlst.append("string3 done");
+    dynlst.append("string3 more");
+    dynlst.append("string4 done");
 
     {
         CStringList inC(dynlst);
 
-        Info<< "input: " << dynlst << endl;
+        Info<< "input: " << dynlst << nl;
         print(inC);
+
+        Info<< "null-terminated string list" << nl;
+        print(inC.strings());
+
+        Info<< "sublist: starting at " << inC.size()/2 << nl;
+        print(inC.strings(inC.size()/2));
+
+        Info<< nl;
+    }
+
+    {
+        string testInput
+        (
+            " A   test   input   line with various spacing  "
+            "  and  text to be split on whitespace  "
+        );
+
+        Info<< testInput << nl;
+        SubStrings<string> args = stringOps::splitSpace(testInput);
+        Info<< "split into " << args.size() << " args" << nl;
+
+        CStringList inC(args);
+        print(inC);
+
+        Info<< "sublist: starting at " << inC.size()/2 << nl;
+        print(inC.strings(inC.size()/2));
+
+        Info<< nl;
     }
 
     Info<<"command-line with " << CStringList::count(argv) << " items"<< endl;
 
     print(argc, argv);
+
+    Info<< nl;
     {
         dynlst.clear();
         for (int i=0; i<argc; ++i)

applications/test/decomposedBlockData/Test-decomposedBlockData.C

@@ -41,7 +41,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    argList::validArgs.append("file");
+    argList::addArgument("file");
     #include "setRootCase.H"
 
     if (!Pstream::parRun())

applications/test/dictionary/Test-dictionary.C

@@ -43,7 +43,7 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validArgs.insert("dict .. dictN");
+    argList::addArgument("dict .. dictN");
     argList args(argc, argv, false, true);
 
     {

applications/test/dictionaryTokens/Test-dictionaryTokens.C

@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     argList::addBoolOption("info", "report token info");
     argList::addBoolOption("value", "report token value");
 
-    argList::validArgs.insert("dict .. dictN");
+    argList::addArgument("dict .. dictN");
     argList args(argc, argv, false, true);
 
     const bool optInfo  = args.optionFound("info");

applications/test/ensightFile/Test-ensightFile.C

@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 {
     argList::noBanner();
     argList::noParallel();
-    argList::validArgs.insert("fileName .. fileNameN");
+    argList::addArgument("fileName .. fileNameN");
 
     argList args(argc, argv, false, true);
 

applications/test/etcFiles/Test-etcFiles.C

@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
         "list",
         "List directories or files to be checked"
     );
-    argList::validArgs.insert("file...");
+    argList::addArgument("file...");
 
     argList::addNote
     (

applications/test/fieldMapping/Test-fieldMapping.C

@@ -57,7 +57,7 @@ bool notEqual(const scalar s1, const scalar s2, const scalar tol)
 int main(int argc, char *argv[])
 {
     #include "addTimeOptions.H"
-    argList::validArgs.append("inflate (true|false)");
+    argList::addArgument("inflate (true|false)");
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"