Work from home.

dilawar · Mar 27, 2020 · 72f7b62 · 72f7b62
1 parent 4ea29e9
commit 72f7b62
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/basecode/Cinfo.cpp b/basecode/Cinfo.cpp
@@ -218,7 +218,7 @@ const Cinfo* Cinfo::baseCinfo() const
  */
 const Finfo* Cinfo::findFinfo(const string& name) const
 {
-    map<string, Finfo*>::const_iterator i = finfoMap_.find(name);
+    auto i = finfoMap_.find(name);
     if (i != finfoMap_.end())
         return i->second;
     return 0;
@@ -229,21 +229,21 @@ const FinfoWrapper Cinfo::findFinfoWrapper(const string& name) const
     return FinfoWrapper(findFinfo(name));
 }
 
-vector<string> Cinfo::getFinfoNames() const
+std::vector<pair<string, string>> Cinfo::getFinfoNameAndType() const
 {
-    vector<string> res;
-    for (auto& f : srcFinfos_) res.push_back("srcFinfos:" + f->name());
+    vector<pair<string, string>> res;
+    for (auto& f : srcFinfos_) res.push_back({"srcFinfos", f->name()});
 
-    for (auto& f : destFinfos_) res.push_back("destFinfo:" + f->name());
+    for (auto& f : destFinfos_) res.push_back({"destFinfo", f->name()});
 
-    for (auto& f : valueFinfos_) res.push_back("valueFinfo:" + f->name());
+    for (auto& f : valueFinfos_) res.push_back({"valueFinfo", f->name()});
 
-    for (auto& f : lookupFinfos_) res.push_back("lookupFinfo:" + f->name());
+    for (auto& f : lookupFinfos_) res.push_back({"lookupFinfo",  f->name()});
 
-    for (auto& f : sharedFinfos_) res.push_back("sharedFinfo:" + f->name());
+    for (auto& f : sharedFinfos_) res.push_back({"sharedFinfo",  f->name()});
 
     for (auto& f : fieldElementFinfos_)
-        res.push_back("fieldElement:" + f->name());
+        res.push_back({"fieldElement", f->name()});
 
     return res;
 }

diff --git a/basecode/Cinfo.h b/basecode/Cinfo.h
@@ -144,7 +144,7 @@ class Cinfo {
     const map<string, Finfo*>& finfoMap() const;
 
     // Used in python bindings. Also return type of finfo.
-    vector<string> getFinfoNames() const;
+    std::vector<std::pair<string,string>> getFinfoNameAndType() const;
 
     /**
      * Returns the Dinfo, which manages creation and destruction

diff --git a/pybind11/pymoose.cpp b/pybind11/pymoose.cpp
@@ -72,8 +72,10 @@ py::object getFieldElement(const ObjId& oid, const string& fname)
 {
     auto cinfo = oid.element()->cinfo();
     auto finfo = cinfo->findFinfo(fname);
-    if (!finfo) {
-        py::print("Field " + fname + " is not found on " + oid.path());
+    if (! finfo) {
+        py::object avl = py::cast(cinfo->getFinfoNameAndType());
+        py::print("Field " + fname + " is not found on '" + oid.path()
+                + "'. Available: ",  avl);
         return pybind11::none();
     }
 }
@@ -212,7 +214,6 @@ PYBIND11_MODULE(_cmoose, m)
         .def_property_readonly("name", &Cinfo::name)
         .def_property_readonly("finfoMap", &Cinfo::finfoMap,
                                py::return_value_policy::reference)
-        .def_property_readonly("finfoNames", &Cinfo::getFinfoNames)
         .def("findFinfo", &Cinfo::findFinfoWrapper)
         .def("baseCinfo", &Cinfo::baseCinfo,
              py::return_value_policy::reference);

diff --git a/tests/pybind11/test_shell.py b/tests/pybind11/test_shell.py
@@ -230,7 +230,7 @@ def makereac2():
 
     sum.cobj.setField("numVars", 2)
 
-    print('xxx', sum.cobj.getField('x'))
+    print('xxx', sum.cobj.getFieldElement('x'))
     quit()
 
     A.connect("nOut", sum.cobj.getField("x"), "input")