BUG: sampleDict: missing type

applications/utilities/mesh/generation/blockMesh/blockMeshApp.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,15 +104,22 @@ int main(int argc, char *argv[])
         polyMeshDir = polyMesh::meshSubDir;
     }
 
-    autoPtr<IOobject> meshDictIoPtr;
+    IOobject meshDictIO
+    (
+        dictName,
+        runTime.constant(),
+        polyMeshDir,
+        runTime,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
 
     if (args.optionFound("dict"))
     {
         const fileName dictPath = args["dict"];
 
-        meshDictIoPtr.set
+        meshDictIO = IOobject
-        (
-            new IOobject
         (
             (
                 isDir(dictPath)
@@ -120,44 +127,27 @@ int main(int argc, char *argv[])
               : dictPath
             ),
             runTime,
-                IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
             false
-            )
-        );
-    }
-    else
-    {
-        meshDictIoPtr.set
-        (
-            new IOobject
-            (
-                dictName,
-                runTime.constant(),
-                polyMeshDir,
-                runTime,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
         );
     }
 
-    if (!meshDictIoPtr->headerOk())
+    if (!meshDictIO.headerOk())
     {
         FatalErrorIn(args.executable())
             << "Cannot open mesh description file\n    "
-            << meshDictIoPtr->objectPath()
+            << meshDictIO.objectPath()
             << nl
             << exit(FatalError);
     }
 
     Info<< "Creating block mesh from\n    "
-        << meshDictIoPtr->objectPath() << endl;
+        << meshDictIO.objectPath() << endl;
 
     blockMesh::verbose(true);
 
-    IOdictionary meshDict(meshDictIoPtr());
+    IOdictionary meshDict(meshDictIO);
     blockMesh blocks(meshDict, regionName);
 
 

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -1241,8 +1241,7 @@ int main(int argc, char *argv[])
 
     #include "addRegionOption.H"
     #include "addOverwriteOption.H"
-    argList::addOption("dict", "name", "specify alternative dictionary");
+    #include "addDictOption.H"
-
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
@@ -1263,19 +1262,14 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
     bool overwrite = args.optionFound("overwrite");
-    const word dictName
-        (args.optionLookupOrDefault<word>("dict", "extrudeToRegionMeshDict"));
 
-    IOdictionary dict
+
-    (
+    const word dictName("extrudeToRegionMeshDict");
-        IOobject
+
-        (
+    #include "setSystemMeshDictionaryIO.H"
-            dictName,
+
-            runTime.system(),
+    IOdictionary dict(dictIO);
-            runTime,
+
-            IOobject::MUST_READ_IF_MODIFIED
-        )
-    );
 
     // Point generator
     autoPtr<extrudeModel> model(extrudeModel::New(dict));

applications/utilities/mesh/manipulation/createBaffles/createBaffles.C

@@ -117,14 +117,9 @@ int main(int argc, char *argv[])
         "Makes internal faces into boundary faces.\n"
         "Does not duplicate points."
     );
-
+    #include "addDictOption.H"
     #include "addOverwriteOption.H"
-    argList::addOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "file",
-        "specify alternative dictionary for the createBaffles description"
-    );
     #include "addRegionOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
@@ -136,14 +131,8 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
 
-    const word dictName
+    const word dictName("createBafflesDict");
-    (
+    #include "setSystemMeshDictionaryIO.H"
-        args.optionLookupOrDefault<word>
-        (
-            "dict",
-            "createBafflesDict"
-        )
-    );
 
     Switch internalFacesOnly(false);
 
@@ -152,17 +141,7 @@ int main(int argc, char *argv[])
     PtrList<faceSelection> selectors;
     {
         Info<< "Reading baffle criteria from " << dictName << nl << endl;
-        IOdictionary dict
+        IOdictionary dict(dictIO);
-        (
-            IOobject
-            (
-                dictName,
-                mesh.time().system(),
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
 
         dict.lookup("internalFacesOnly") >> internalFacesOnly;
         noFields = dict.lookupOrDefault("noFields", false);

applications/utilities/mesh/manipulation/createPatch/createPatch.C

@@ -505,13 +505,7 @@ int main(int argc, char *argv[])
 {
     #include "addOverwriteOption.H"
     #include "addRegionOption.H"
-    argList::addOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "word",
-        "name of dictionary to provide patch information"
-    );
-
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
@@ -521,38 +515,20 @@ int main(int argc, char *argv[])
 
     const bool overwrite = args.optionFound("overwrite");
 
-    word dictName
+    #include "createNamedPolyMesh.H"
-    (
+
-        args.optionLookupOrDefault<word>("dict", "createPatchDict")
+    const word oldInstance = mesh.pointsInstance();
-    );
+
+    const word dictName("createPatchDict");
+    #include "setSystemMeshDictionaryIO.H"
 
     Info<< "Reading " << dictName << nl << endl;
 
-    IOdictionary dict
+    IOdictionary dict(dictIO);
-    (
-        IOobject
-        (
-            dictName,
-            runTime.system(),
-            (
-                meshRegionName != polyMesh::defaultRegion
-              ? meshRegionName
-              : word::null
-            ),
-            runTime,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE,
-            false
-        )
-    );
-
 
     // Whether to synchronise points
     const Switch pointSync(dict.lookup("pointSync"));
 
-    #include "createNamedPolyMesh.H"
-
-    const word oldInstance = mesh.pointsInstance();
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 

applications/utilities/mesh/manipulation/refineMesh/refineMesh.C

@@ -298,12 +298,7 @@ int main(int argc, char *argv[])
 
     #include "addOverwriteOption.H"
     #include "addRegionOption.H"
-    argList::addBoolOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "refine according to system/refineMeshDict"
-    );
-
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
@@ -327,19 +322,12 @@ int main(int argc, char *argv[])
 
     if (readDict)
     {
-        Info<< "Refining according to refineMeshDict" << nl << endl;
+        const word dictName("refineMeshDict");
+        #include "setSystemMeshDictionaryIO.H"
 
-        refineDict = IOdictionary
+        Info<< "Refining according to " << dictName << nl << endl;
-        (
+
-            IOobject
+        refineDict = IOdictionary(dictIO);
-            (
-                "refineMeshDict",
-                runTime.system(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-        );
 
         const word setName(refineDict.lookup("set"));
 

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -614,11 +614,7 @@ int main(int argc, char *argv[])
 #   include "addRegionOption.H"
 #   include "addOverwriteOption.H"
 #   include "addTimeOptions.H"
-    argList::addBoolOption
+#   include "addDictOption.H"
-    (
-        "dict",
-        "renumber according to system/renumberMeshDict"
-    );
     argList::addBoolOption
     (
         "frontWidth",
@@ -700,23 +696,13 @@ int main(int argc, char *argv[])
 
     if (readDict)
     {
-        Info<< "Renumber according to renumberMeshDict." << nl << endl;
+        const word dictName("renumberMeshDict");
+        #include "setSystemMeshDictionaryIO.H"
 
-        renumberDictPtr.reset
+        Info<< "Renumber according to " << dictName << nl << endl;
-        (
+
-            new IOdictionary
+        renumberDictPtr.reset(new IOdictionary(dictIO));
-            (
+        const IOdictionary& renumberDict = renumberDictPtr();
-                IOobject
-                (
-                    "renumberMeshDict",
-                    runTime.system(),
-                    mesh,
-                    IOobject::MUST_READ_IF_MODIFIED,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-        const IOdictionary renumberDict = renumberDictPtr();
 
         renumberPtr = renumberMethod::New(renumberDict);
 

applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C

@@ -155,12 +155,7 @@ int main(int argc, char *argv[])
         "select a mesh subset based on a provided cellSet and/or"
         " selection criteria"
     );
-    argList::addBoolOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "read mesh subset selection criteria"
-        " from system/subsetMeshDict"
-    );
     argList::addOption
     (
         "cellSet",
@@ -210,18 +205,10 @@ int main(int argc, char *argv[])
     PtrList<cellSelection> selectors;
     if (useDict)
     {
-        Info<< "Reading selection criteria from subsetMeshDict" << nl << endl;
+        const word dictName("subsetMeshDict");
-        IOdictionary dict
+        #include "setSystemMeshDictionaryIO.H"
-        (
+        Info<< "Reading selection criteria from " << dictName << nl << endl;
-            IOobject
+        IOdictionary dict(dictIO);
-            (
-                "subsetMeshDict",
-                mesh.time().system(),
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
 
         const dictionary& selectionsDict = dict.subDict("selections");
 

applications/utilities/mesh/manipulation/topoSet/topoSet.C

@@ -193,12 +193,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions(true, false);
-    argList::addOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "file",
-        "specify an alternative dictionary for the topoSet dictionary"
-    );
     #include "addRegionOption.H"
     argList::addBoolOption
     (
@@ -216,41 +211,11 @@ int main(int argc, char *argv[])
     const bool noSync = args.optionFound("noSync");
 
     const word dictName("topoSetDict");
-
+    #include "setSystemMeshDictionaryIO.H"
-    fileName dictPath = dictName;
-    if (args.optionFound("dict"))
-    {
-        dictPath = args["dict"];
-        if (isDir(dictPath))
-        {
-            dictPath = dictPath / dictName;
-        }
-    }
 
     Info<< "Reading " << dictName << "\n" << endl;
 
-    IOdictionary topoSetDict
+    IOdictionary topoSetDict(dictIO);
-    (
-        (
-            args.optionFound("dict")
-          ? IOobject
-            (
-                dictPath,
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-          : IOobject
-            (
-                dictName,
-                runTime.system(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-        )
-    );
-
 
     // Read set construct info from dictionary
     PtrList<dictionary> actions(topoSetDict.lookup("actions"));

applications/utilities/postProcessing/foamCalc/foamCalcApp.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,12 +49,7 @@ int main(int argc, char *argv[])
         "noWrite",
         "suppress writing results"
     );
-    Foam::argList::addOption
+#   include "addDictOption.H"
-    (
-        "dict",
-        "name",
-        "dictionary to use"
-    );
 
     if (argc < 2)
     {

applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H

@@ -1,15 +1,8 @@
-word dictName(args.optionLookupOrDefault<word>("dict", "particleTrackDict"));
+const word dictName("particleTrackDict");
 
-IOdictionary propsDict
+#include "setConstantMeshDictionaryIO.H"
-(
+
-    IOobject
+IOdictionary propsDict(dictIO);
-    (
-        dictName,
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ_IF_MODIFIED
-    )
-);
 
 word cloudName(propsDict.lookup("cloudName"));
 

applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
     argList::noParallel();
     timeSelector::addOptions();
     #include "addRegionOption.H"
-    argList::validOptions.insert("dict", "");
+    #include "addDictOption.H"
 
     #include "setRootCase.H"
 

applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C

@@ -65,7 +65,6 @@ namespace Foam
                 IOobject
                 (
                     args["dict"],
-                    runTime.system(),
                     runTime,
                     IOobject::MUST_READ_IF_MODIFIED
                 )

applications/utilities/postProcessing/sampling/sample/sample.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,37 +97,82 @@ int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
     #include "addRegionOption.H"
-    argList::addOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "word",
-        "name of dictionary to provide sample information"
-    );
-
     #include "setRootCase.H"
     #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
     #include "createNamedMesh.H"
 
-    word sampleDict(args.optionLookupOrDefault<word>("dict", "sampleDict"));
+    const word dictName("sampleDict");
 
-    IOsampledSets sSets
+    autoPtr<IOsampledSets> sSetsPtr;
+    autoPtr<IOsampledSurfaces> sSurfsPtr;
+
+    if (args.optionFound("dict"))
+    {
+        // Construct from fileName
+
+        fileName dictPath = args["dict"];
+        if (isDir(dictPath))
+        {
+            dictPath = dictPath / dictName;
+        }
+
+        sSetsPtr.reset
+        (
+            new IOsampledSets
             (
                 sampledSets::typeName,
                 mesh,
-        sampleDict,
+                dictPath,
                 IOobject::MUST_READ_IF_MODIFIED,
                 true
+            )
         );
 
-    IOsampledSurfaces sSurfs
+        sSurfsPtr.reset
+        (
+            new IOsampledSurfaces
             (
                 sampledSurfaces::typeName,
                 mesh,
-        sampleDict,
+                dictPath,
                 IOobject::MUST_READ_IF_MODIFIED,
                 true
+            )
         );
+    }
+    else
+    {
+        // Construct from name in system() directory
+
+        sSetsPtr.reset
+        (
+            new IOsampledSets
+            (
+                sampledSets::typeName,
+                mesh,
+                dictName,
+                IOobject::MUST_READ_IF_MODIFIED,
+                true
+            )
+        );
+
+        sSurfsPtr.reset
+        (
+            new IOsampledSurfaces
+            (
+                sampledSurfaces::typeName,
+                mesh,
+                dictName,
+                IOobject::MUST_READ_IF_MODIFIED,
+                true
+            )
+        );
+    }
+
+    IOsampledSets& sSets = sSetsPtr();
+    IOsampledSurfaces& sSurfs = sSurfsPtr();
 
     forAll(timeDirs, timeI)
     {

applications/utilities/postProcessing/sampling/sample/sampleDict

@@ -140,6 +140,7 @@ sets
 
     patchSeed
     {
+        type        patchSeed;
         patches     (".*Wall.*");
         // Number of points to seed. Divided amongst all processors according
         // to fraction of patches they hold.

applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C

@@ -680,35 +680,17 @@ int main(int argc, char *argv[])
     );
     argList::noParallel();
 
-    argList::addOption
+#   include "addDictOption.H"
-    (
-        "dict",
-        "word",
-        "specify alternative dictionary for the feature extraction information"
-    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    word dictName
+    const word dictName("surfaceFeatureExtractDict");
-    (
+#   include "setSystemRunTimeDictionaryIO.H"
-        args.optionLookupOrDefault<word>("dict", "surfaceFeatureExtractDict")
-    );
 
     Info<< "Reading " << dictName << nl << endl;
 
-    IOdictionary dict
+    const IOdictionary dict(dictIO);
-    (
-        IOobject
-        (
-            dictName,
-            runTime.system(),
-            runTime,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        )
-    );
 
     forAllConstIter(dictionary, dict, iter)
     {

applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C

@@ -97,7 +97,6 @@ int main(int argc, char *argv[])
         "geometry scaling factor on output"
     );
     #include "addDictOption.H"
-
     argList::addOption
     (
         "from",

applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C

@@ -103,12 +103,7 @@ int main(int argc, char *argv[])
         "factor",
         "geometry scaling factor on output - default is 1"
     );
-    argList::addOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "file",
-        "specify an alternative dictionary for constant/coordinateSystems"
-    );
     argList::addOption
     (
         "from",

applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C

@@ -103,12 +103,7 @@ int main(int argc, char *argv[])
         "factor",
         "geometry scaling factor on output - default is 1"
     );
-    argList::addOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "file",
-        "specify an alternative dictionary for constant/coordinateSystems"
-    );
     argList::addOption
     (
         "from",

src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
 (
     const word& outputFilterName,
     const objectRegistry& obr,
-    const fileName& dictName,
+    const word& dictName,
     const IOobject::readOption rOpt,
     const bool readFromFiles
 )
@@ -66,6 +66,30 @@ Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
 {}
 
 
+template<class OutputFilter>
+Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
+(
+    const word& outputFilterName,
+    const objectRegistry& obr,
+    const fileName& dictName,
+    const IOobject::readOption rOpt,
+    const bool readFromFiles
+)
+:
+    IOdictionary
+    (
+        IOobject
+        (
+            dictName,
+            obr,
+            rOpt,
+            IOobject::NO_WRITE
+        )
+    ),
+    OutputFilter(outputFilterName, obr, *this, readFromFiles)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class OutputFilter>

src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,19 @@ public:
         (
             const word& outputFilterName,
             const objectRegistry&,
-            const fileName& dictName = OutputFilter::typeName() + "Dict",
+            const word& dictName = OutputFilter::typeName() + "Dict",
+            const IOobject::readOption rOpt = IOobject::MUST_READ_IF_MODIFIED,
+            const bool loadFromFile = false
+        );
+
+        //- Construct for given objectRegistry and dictionary
+        //  Dictionary read from full path.
+        //  Allow the possibility to load fields from files
+        IOOutputFilter
+        (
+            const word& outputFilterName,
+            const objectRegistry&,
+            const fileName& dictName,
             const IOobject::readOption rOpt = IOobject::MUST_READ_IF_MODIFIED,
             const bool loadFromFile = false
         );

src/postProcessing/postCalc/postCalc.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,12 +68,7 @@ int main(int argc, char *argv[])
         "noFlow",
         "suppress creating flow models (execFlowFunctionObjects only)"
     );
-    Foam::argList::addOption
+    #include "addDictOption.H"
-    (
-        "dict",
-        "name",
-        "dictionary to use"
-    );
 
     #include "setRootCase.H"
     #include "createTime.H"