Add the OpenFOAM source tree

applications/test/dictionary/Make/files

@@ -0,0 +1,3 @@
+Test-dictionary.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-dictionary

applications/test/dictionary/Make/options

@@ -0,0 +1 @@
+EXE_INC =

applications/test/dictionary/Test-dictionary.C

@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    dictionaryTest
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "IOstreams.H"
+#include "IOobject.H"
+#include "IFstream.H"
+#include "dictionary.H"
+#include "stringOps.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::validArgs.insert("dict .. dictN");
+    argList args(argc, argv, false, true);
+
+    {
+        dictionary dict;
+        dict.add("aaOPENMPIcc", 1);
+
+        string s("DDD${aa${WM_MPLIB}cc}EEE");
+        stringOps::inplaceExpand(s, dict, true, false);
+        Info<< "variable expansion:" << s << endl;
+    }
+
+
+    Info<< nl
+        << "FOAM_CASE=" << getEnv("FOAM_CASE") << nl
+        << "FOAM_CASENAME=" << getEnv("FOAM_CASENAME") << nl
+        << endl;
+
+    if (args.size() <= 1)
+    {
+        {
+            dictionary dict1(IFstream("testDict")());
+            Info<< "dict1: " << dict1 << nl
+                << "toc: " << dict1.toc() << nl
+                << "keys: " << dict1.keys() << nl
+                << "patterns: " << dict1.keys(true) << endl;
+
+            dictionary dict2(dict1.xfer());
+
+            Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc() << nl
+                << "dict2.toc(): " << dict2.name() << " " << dict2.toc()
+                << endl;
+
+            // copy back
+            dict1 = dict2;
+            Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc()
+                << endl;
+
+            dictionary dict3(dict2.subDictPtr("boundaryField"));
+            dictionary dict4(dict2.subDictPtr("NONEXISTENT"));
+
+            Info<< "dictionary construct from pointer" << nl
+                << "ok = " << dict3.name() << " " << dict3.toc() << nl
+                << "no = " << dict4.name() << " " << dict4.toc() << endl;
+        }
+
+
+        IOobject::writeDivider(Info);
+
+        {
+            dictionary dict(IFstream("testDictRegex")());
+            dict.add(keyType("fooba[rz]", true), "anything");
+
+            Info<< "dict:" << dict << nl
+                << "toc: " << dict.toc() << nl
+                << "keys: " << dict.keys() << nl
+                << "patterns: " << dict.keys(true) << endl;
+
+            Info<< "Pattern find \"abc\" in top directory : "
+                << dict.lookup("abc") << endl;
+            Info<< "Pattern find \"abc\" in sub directory : "
+                << dict.subDict("someDict").lookup("abc")
+                    << endl;
+            Info<< "Recursive pattern find \"def\" in sub directory : "
+                << dict.subDict("someDict").lookup("def", true)
+                    << endl;
+            Info<< "Recursive pattern find \"foo\" in sub directory : "
+                << dict.subDict("someDict").lookup("foo", true)
+                    << endl;
+            Info<< "Recursive pattern find \"fooz\" in sub directory : "
+                << dict.subDict("someDict").lookup("fooz", true)
+                    << endl;
+            Info<< "Recursive pattern find \"bar\" in sub directory : "
+                << dict.subDict("someDict").lookup("bar", true)
+                    << endl;
+            Info<< "Recursive pattern find \"xxx\" in sub directory : "
+                << dict.subDict("someDict").lookup("xxx", true)
+                    << endl;
+        }
+    }
+    else
+    {
+        IOobject::writeDivider(Info);
+        for (label argI=1; argI < args.size(); ++argI)
+        {
+            const string& dictFile = args[argI];
+            IFstream is(dictFile);
+
+            dictionary dict(is);
+
+            Info<< dict << endl;
+        }
+    }
+
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/dictionary/testDict

@@ -0,0 +1,122 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#inputMode  merge
+#includeIfPresent "someUnknownFile"
+#includeIfPresent "$FOAM_CASE/someUnknownFile"
+#includeIfPresent "$FOAM_CASE/someUnknownFile-$FOAM_CASENAME"
+
+internalField   uniform 1;
+
+// use 'protect' to supply defaults
+#inputMode  protect
+internalField   uniform 10;
+dimensions      [ 0 2 -2 0 0 0 0 ];
+#inputMode  merge
+
+active
+{
+    type            turbulentIntensityKineticEnergyInlet;
+    intensity       0.1;
+    value           $internalField;
+}
+
+inactive
+{
+    type            zeroGradient;
+}
+
+
+// Indirection
+varType active;
+
+// Indirection of values
+x 5;
+varName x;
+
+
+//Indirection for keys
+key inlet_9;
+
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            zeroGradient;
+    }
+
+    inlet_1  { $active }
+    inlet_2  { $inactive }
+    inlet_3  { $inactive }
+    inlet_4  { $inactive }
+    inlet_5  "a primitiveEntry is squashed by a directory entry";
+    inlet_5  { $inactive }
+    inlet_6  { $.inactive }     // Test scoping
+    inlet_7  { ${inactive}}     // Test variable expansion
+    inlet_8  { $inactive }
+    ${key}   { $inactive }
+
+    #include "testDictInc"
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           #include "value";
+        // error           #remove self;
+        x               ${${varName}};  // Test indirection/recursive expansion
+        y               6;
+    }
+
+    // this should have no effect
+    #remove inactive
+
+    inlet_7  { ${${varType}}}   // Test indirection/recursive expansion
+    #inputMode overwrite
+    inlet_8  { $active }
+}
+
+// NB: the inputMode has a global scope
+#inputMode merge
+#include "testDict2"
+
+foo
+{
+    $active
+}
+
+bar
+{
+    $active
+}
+
+baz
+{
+    $active
+}
+
+"anynumber.*"
+{
+    $active
+}
+
+// this should work
+#remove active
+
+// this should work too
+#remove ( bar baz )
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/dictionary/testDict2

@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        value $internalField;
+        note "actually a noslip wall";
+    }
+
+    inlet_3  "a primitiveEntry squashes directory entry";
+}
+
+#inputMode  overwrite
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/dictionary/testDictInc

@@ -0,0 +1,6 @@
+    inlet_4
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }

applications/test/dictionary/testDictRegex

@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDictRegex;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#inputMode  merge
+
+".*"        parentValue1;
+"[n-z].*"   parentValue2;
+"f.*"       parentValue3;
+keyX        parentValue4;
+keyY        parentValue5;
+
+"(.*)Dict"
+{
+    foo         subdictValue0;
+    //bar         $f.*;         // should this really match 'foo'?
+
+    // result is dependent on insert order!
+    "a.*c"      subdictValue3;
+    "ab.*"      subdictValue2;
+    "a.*"       subdictValue1;
+    abcd        \1;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/dictionary/value

@@ -0,0 +1,2 @@
+// the trailing ';' shouldn't actually be there, but shouldn't cause problems
+uniform 2;