Merge commit 'd7b321bf864eb8ac0b771c4a5d94121470d46f9f' into olesenm

Conflicts:
	src/OpenFOAM/db/Time/findInstance.C

src/OpenFOAM/db/Time/Time.H

@@ -283,10 +283,11 @@ public:
 
             //- Return the location of "dir" containing the file "name".
             //  (Used in reading mesh data)
+            //  If name is null search for the directory "dir" only
             word findInstance
             (
                 const fileName& dir,
-                const word& name,
+                const word& name = word::null,
                 const IOobject::readOption rOpt = IOobject::MUST_READ
             ) const;
 

src/OpenFOAM/db/Time/findInstance.C

@@ -23,7 +23,9 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Return the location of "directory" containing the file "name".
+    If "name" is empty: return the location of "directory"
+    If "name" is not empty: return the location of "directory" containing the
+    file "name".
     Used in reading mesh data.
 
 \*---------------------------------------------------------------------------*/
@@ -40,85 +42,96 @@ Foam::word Foam::Time::findInstance
     const IOobject::readOption rOpt
 ) const
 {
-    // Is the mesh data in the current time directory ?
+    // Note: if name is empty, just check the directory itself
+
+    // check the current time directory
     if
+    (
+        name.empty()
+      ? isDir(path()/timeName()/dir)
+      :
         (
             isFile(path()/timeName()/dir/name)
          && IOobject(name, timeName(), dir, *this).headerOk()
         )
+    )
     {
         if (debug)
         {
-            Info<< "Time::findInstance(const word& dir, const word& name) : "
+            Info<< "Time::findInstance(const fileName&, const word&) : "
-                << "reading " << name
+                << "found \"" << name
-                << " from " << timeName()/dir
+                << "\" in " << timeName()/dir
                 << endl;
         }
 
         return timeName();
     }
 
-    // Search back through the time directories list to find the time
+    // Search back through the time directories to find the time
     // closest to and lower than current time
 
     instantList ts = times();
-    label i;
+    label instanceI;
 
-    for (i=ts.size()-1; i>=0; i--)
+    for (instanceI = ts.size()-1; instanceI >= 0; --instanceI)
     {
-        if (ts[i].value() <= timeOutputValue())
+        if (ts[instanceI].value() <= timeOutputValue())
         {
             break;
         }
     }
 
-    // Noting that the current directory has already been searched
+    // continue searching from here
-    // for mesh data, start searching from the previously stored time directory
+    for (; instanceI >= 0; --instanceI)
-
-    if (i>=0)
-    {
-        for (label j=i; j>=0; j--)
     {
         if
         (
-                isFile(path()/ts[j].name()/dir/name)
+            name.empty()
-             && IOobject(name, ts[j].name(), dir, *this).headerOk()
+          ? isDir(path()/ts[instanceI].name()/dir)
+          :
+            (
+                isFile(path()/ts[instanceI].name()/dir/name)
+             && IOobject(name, ts[instanceI].name(), dir, *this).headerOk()
+            )
         )
         {
             if (debug)
             {
-                    Info<< "Time::findInstance(const word& dir, "
+                Info<< "Time::findInstance"
-                        << "const word& name) : "
+                    "(const fileName&,const word&) : "
-                        << "reading " << name
+                    << "found \"" << name
-                        << " from " << ts[j].name()/dir
+                    << "\" in " << ts[instanceI].name()/dir
                     << endl;
             }
 
-                return ts[j].name();
+            return ts[instanceI].name();
-            }
         }
     }
 
 
-    // If the mesh data is not in any of the time directories
+    // not in any of the time directories, try constant
-    // Try in constant
 
     // Note. This needs to be a hard-coded constant, rather than the
     // constant function of the time, because the latter points to
     // the case constant directory in parallel cases
 
     if
+    (
+        name.empty()
+      ? isDir(path()/constant()/dir)
+      :
         (
             isFile(path()/constant()/dir/name)
          && IOobject(name, constant(), dir, *this).headerOk()
         )
+    )
     {
         if (debug)
         {
-            Info<< "Time::findInstance(const word& dir, "
+            Info<< "Time::findInstance"
-                << "const word& name) : "
+                   "(const fileName&,const word&) : "
-                << "reading " << name
+                << "found \"" << name
-                << " from " << constant()/dir
+                << "\" in " << constant()/dir
                 << endl;
         }
 
@@ -127,7 +140,10 @@ Foam::word Foam::Time::findInstance
 
     if (rOpt == IOobject::MUST_READ)
     {
-        FatalErrorIn("Time::findInstance(const word& dir, const word& name)")
+        FatalErrorIn
+            (
+                "Time::findInstance(const fileName&,const word&)"
+            )
             << "Cannot find file \"" << name << "\" in directory "
             << constant()/dir
             << exit(FatalError);
@@ -136,4 +152,5 @@ Foam::word Foam::Time::findInstance
     return constant();
 }
 
+
 // ************************************************************************* //