From a6134d254a23c9f86bb59f399098cbf0f92dfcfd Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 11 Oct 2010 17:31:01 +0100
Subject: [PATCH] ENH: Added dictName() functions to return last cmpt of scoped
 name

---
 src/OpenFOAM/db/dictionary/dictionary.H         | 17 +++++++++++++++++
 .../dictionaryEntry/dictionaryEntry.H           | 10 ++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index bb5f186aad..26fe7f6dd7 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -111,6 +111,23 @@ public:
         {
             return name_;
         }
+
+        //- Return the local dictionary name (final part of scoped name)
+        const word dictName() const
+        {
+            const word scopedName = name_.name();
+
+            string::size_type i = scopedName.rfind(':');
+
+            if (i == scopedName.npos)
+            {
+                return scopedName;
+            }
+            else
+            {
+                return scopedName.substr(i + 1, scopedName.npos);
+            }
+        }
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
index 54aeb6c899..693c9a03f3 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
@@ -106,13 +106,19 @@ public:
 
     // Member functions
 
-        //- Return the dictionary name
+        //- Return the local dictionary name (final part of scoped name)
+        const word dictName() const
+        {
+            return dictionary::dictName();
+        }
+
+        //- Return the dictionary name (scoped, e.g. dictA::dictB::dictC)
         const fileName& name() const
         {
             return dictionary::name();
         }
 
-        //- Return the dictionary name
+        //- Return the dictionary name (scoped, e.g. dictA::dictB::dictC)
         fileName& name()
         {
             return dictionary::name();