Merge branch 'master' into molecularDynamics

src/OpenFOAM/db/dictionary/dictionary.H

@@ -30,9 +30,9 @@ Description
     of values (e.g. words and numbers).
 
     The dictionary class is the base class for IOdictionary.
-    It serves the purpose of a bootstrap dictionary for the objectRegistry
+    It also serves as a bootstrap dictionary for the objectRegistry data
-    data dictionaries, since unlike the IOdictionary class, it does not use
+    dictionaries since, unlike the IOdictionary class, it does not use an
-    a objectRegistry itself to work.
+    objectRegistry itself to work.
 
 ToDo
     A merge() member function with a non-const dictionary parameter.
@@ -199,25 +199,31 @@ public:
             //- Find and return a T, if not found return the given default value
             //  If recursive search parent dictionaries
             template<class T>
-            T lookupOrDefault(const word&, const T&, bool recursive=false) const;
+            T lookupOrDefault
+            (
+                const word&,
+                const T&,
+                bool recursive=false
+            ) const;
 
             //- Find and return a T, if not found return the given default value,
-            //  and add to dictionary. If recusive search parent dictionaries
+            //  and add to dictionary. If recursive search parent dictionaries
             template<class T>
             T lookupOrAddDefault
             (
                 const word&,
                 const T&,
-                bool recusive=false
+                bool recursive=false
             );
 
             //- Find an entry if present, and assign to T
+            //  Returns true if the entry was found
             template<class T>
-            void readIfPresent
+            bool readIfPresent
             (
                 const word&,
                 T&,
-                bool recusive=false
+                bool recursive=false
             ) const;
 
             //- Check if entry is a sub-dictionary

src/OpenFOAM/db/dictionary/dictionaryTemplates.C

@@ -54,40 +54,42 @@ template<class T>
 T Foam::dictionary::lookupOrAddDefault
 (
     const word& keyword,
-    const T& deft,
+    const T& deflt,
-    bool recusive
+    bool recursive
 )
 {
-    const entry* ePtr = lookupEntryPtr(keyword, recusive);
+    const entry* entryPtr = lookupEntryPtr(keyword, recursive);
 
-    if (ePtr == NULL)
+    if (entryPtr == NULL)
     {
-        entry* defPtr = new primitiveEntry(keyword, deft);
+        add(new primitiveEntry(keyword, deflt));
-        append(defPtr);
+        return deflt;
-        hashedEntries_.insert(defPtr->keyword(), defPtr);
-
-        return deft;
     }
     else
     {
-        return pTraits<T>(ePtr->stream());
+        return pTraits<T>(entryPtr->stream());
     }
 }
 
 
 template<class T>
-void Foam::dictionary::readIfPresent
+bool Foam::dictionary::readIfPresent
 (
-    const word& keyword,
+    const word& k,
-    T& deft,
+    T& val,
-    bool recusive
+    bool recursive
 ) const
 {
-    const entry* ePtr = lookupEntryPtr(keyword, recusive);
+    const entry* entryPtr = lookupEntryPtr(k, recursive);
 
-    if (ePtr != NULL)
+    if (entryPtr == NULL)
     {
-        ePtr->stream() >> deft;
+        return false;
+    }
+    else
+    {
+        entryPtr->stream() >> val;
+        return true;
     }
 }
 

src/Pstream/mpi/IPread.C

@@ -61,7 +61,7 @@ Foam::IPstream::IPstream
 
     MPI_Status status;
 
-    // If the buffer size is not specified probe the incomming message
+    // If the buffer size is not specified, probe the incomming message
     // and set it
     if (!bufSize)
     {
@@ -181,8 +181,7 @@ Foam::label Foam::IPstream::read
         (
             "IPstream::read"
             "(const int fromProcNo, char* buf, std::streamsize bufSize)"
-        )   << "Unsupported communications type "
+        )   << "Unsupported communications type " << commsType
-            << Pstream::commsTypeNames[commsType]
             << Foam::abort(FatalError);
 
         return 0;

src/Pstream/mpi/OPwrite.C

@@ -119,8 +119,7 @@ bool Foam::OPstream::write
         (
             "OPstream::write"
             "(const int fromProcNo, char* buf, std::streamsize bufSize)"
-        )   << "Unsupported communications type "
+        )   << "Unsupported communications type " << commsType
-            << Pstream::commsTypeNames[commsType]
             << Foam::abort(FatalError);
     }
 

src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C

@@ -123,9 +123,9 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
 
     if (typeid(curPatch) == typeid(wallFvPatch))
     {
-        dimensionedScalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
+        scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
 
-        Yp = pow(Cmu.value(), 0.25)
+        Yp = pow(Cmu, 0.25)
             *y_[patchNo]
             *sqrt(k()().boundaryField()[patchNo].patchInternalField())
            /(
@@ -164,32 +164,14 @@ bool turbulenceModel::read()
         lookup("turbulence") >> turbulence_;
         turbulenceModelCoeffs_ = subDict(type() + "Coeffs");
 
-        kappa_ = dimensionedScalar
+        subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
-        (
+        subDict("wallFunctionCoeffs").lookup("E") >> E_;
-            subDict("wallFunctionCoeffs").lookup("kappa")
-        ).value();
-
-        E_ = dimensionedScalar
-        (
-            subDict("wallFunctionCoeffs").lookup("E")
-        ).value();
 
         yPlusLam_ = yPlusLam(kappa_, E_);
 
-        if (found("k0"))
+        readIfPresent("k0", k0_);
-        {
+        readIfPresent("epsilon0", epsilon0_);
-            lookup("k0") >> k0_;
+        readIfPresent("epsilonSmall", epsilonSmall_);
-        }
-
-        if (found("epsilon0"))
-        {
-            lookup("epsilon0") >> epsilon0_;
-        }
-
-        if (found("epsilonSmall"))
-        {
-            lookup("epsilonSmall") >> epsilonSmall_;
-        }
 
         return true;
     }

src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C

@@ -123,9 +123,9 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
 
     if (typeid(curPatch) == typeid(wallFvPatch))
     {
-        dimensionedScalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
+        scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
 
-        Yp = pow(Cmu.value(), 0.25)*y_[patchNo]
+        Yp = pow(Cmu, 0.25)*y_[patchNo]
             *sqrt(k()().boundaryField()[patchNo].patchInternalField())
             /nu().boundaryField()[patchNo];
     }
@@ -161,32 +161,14 @@ bool turbulenceModel::read()
         lookup("turbulence") >> turbulence_;
         turbulenceModelCoeffs_ = subDict(type() + "Coeffs");
 
-        kappa_ = dimensionedScalar
+        subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
-        (
+        subDict("wallFunctionCoeffs").lookup("E") >> E_;
-            subDict("wallFunctionCoeffs").lookup("kappa")
-        ).value();
-
-        E_ = dimensionedScalar
-        (
-            subDict("wallFunctionCoeffs").lookup("E")
-        ).value();
 
         yPlusLam_ = yPlusLam(kappa_, E_);
 
-        if (found("k0"))
+        readIfPresent("k0", k0_);
-        {
+        readIfPresent("epsilon0", epsilon0_);
-            lookup("k0") >> k0_;
+        readIfPresent("epsilonSmall", epsilonSmall_);
-        }
-
-        if (found("epsilon0"))
-        {
-            lookup("epsilon0") >> epsilon0_;
-        }
-
-        if (found("epsilonSmall"))
-        {
-            lookup("epsilonSmall") >> epsilonSmall_;
-        }
 
         return true;
     }