Perfect. The base API works now. Not time to do a profiling.

Dilawar Singh · Dilawar Singh · commit 070f735b1294 · 2020-03-28T14:06:47.000+05:30
diff --git a/basecode/Finfo.cpp b/basecode/Finfo.cpp
@@ -21,53 +21,32 @@ Finfo::Finfo(const string& name, const string& doc) : name_(name), doc_(doc)
 
 const Cinfo* Finfo::initCinfo()
 {
-    static ReadOnlyValueFinfo< FinfoWrapper, string > fieldName(
-        "fieldName",
-        "Name of field handled by Finfo",
-        &FinfoWrapper::getName
-    );
-
-    static ReadOnlyValueFinfo< FinfoWrapper, string > docs(
-        "docs",
-        "Documentation for Finfo",
-        &FinfoWrapper::docs
-    );
-
-    static ReadOnlyValueFinfo< FinfoWrapper, string > type(
-        "type",
-        "RTTI type info for this Finfo",
-        &FinfoWrapper::type
-    );
-
-    static ReadOnlyValueFinfo< FinfoWrapper, vector< string > > src(
-        "src",
-        "Subsidiary SrcFinfos. Useful for SharedFinfos",
-        &FinfoWrapper::src
-    );
-    static ReadOnlyValueFinfo< FinfoWrapper, vector< string > > dest(
-        "dest",
-        "Subsidiary DestFinfos. Useful for SharedFinfos",
-        &FinfoWrapper::dest
-    );
-
-
-    static Finfo* finfoFinfos[] =
-    {
-        &fieldName,	// ReadOnlyValue
-        &docs,		// ReadOnlyValue
-        &type,		// ReadOnlyValue
-        &src,		// ReadOnlyValue
-        &dest,		// ReadOnlyValue
+    static ReadOnlyValueFinfo<FinfoWrapper, string> fieldName(
+        "fieldName", "Name of field handled by Finfo", &FinfoWrapper::getName);
+
+    static ReadOnlyValueFinfo<FinfoWrapper, string> docs(
+        "docs", "Documentation for Finfo", &FinfoWrapper::docs);
+
+    static ReadOnlyValueFinfo<FinfoWrapper, string> type(
+        "type", "RTTI type info for this Finfo", &FinfoWrapper::type);
+
+    static ReadOnlyValueFinfo<FinfoWrapper, vector<string>> src(
+        "src", "Subsidiary SrcFinfos. Useful for SharedFinfos",
+        &FinfoWrapper::src);
+    static ReadOnlyValueFinfo<FinfoWrapper, vector<string>> dest(
+        "dest", "Subsidiary DestFinfos. Useful for SharedFinfos",
+        &FinfoWrapper::dest);
+
+    static Finfo* finfoFinfos[] = {&fieldName,  // ReadOnlyValue
+                                   &docs,       // ReadOnlyValue
+                                   &type,       // ReadOnlyValue
+                                   &src,        // ReadOnlyValue
+                                   &dest,       // ReadOnlyValue
     };
 
-    static Dinfo< Finfo* > dinfo;
-    static Cinfo finfoCinfo (
-        "Finfo",
-        Neutral::initCinfo(),
-        finfoFinfos,
-        sizeof( finfoFinfos ) / sizeof( Finfo* ),
-        &dinfo
-    );
+    static Dinfo<Finfo*> dinfo;
+    static Cinfo finfoCinfo("Finfo", Neutral::initCinfo(), finfoFinfos,
+                            sizeof(finfoFinfos) / sizeof(Finfo*), &dinfo);
 
     return &finfoCinfo;
 }
@@ -76,59 +55,57 @@ static const Cinfo* finfoCinfo = Finfo::initCinfo();
 
 ////////////////////////////////////////////////////////////////
 
-const string& Finfo::name( ) const
+const string& Finfo::name() const
 {
     return name_;
 }
 
-const string& Finfo::docs( ) const
+const string& Finfo::docs() const
 {
     return doc_;
 }
 
 ////////////////////////////////////////////////////////////////
 // Needed to access as a MOOSE field. Note that the Finfo is stored as a ptr
-string FinfoWrapper::getName( ) const
+string FinfoWrapper::getName() const
 {
     return f_->name();
 }
 
-string FinfoWrapper::docs( ) const
+string FinfoWrapper::docs() const
 {
     return f_->docs();
 }
 
-
-string FinfoWrapper::type( ) const
+string FinfoWrapper::type() const
 {
     return f_->rttiType();
 }
 
-vector< string > FinfoWrapper::src( ) const
+vector<string> FinfoWrapper::src() const
 {
     return f_->innerSrc();
 }
 
-vector< string > FinfoWrapper::dest( ) const
+vector<string> FinfoWrapper::dest() const
 {
     return f_->innerDest();
 }
 
-
 // Default virtual functions.
 string Finfo::rttiType() const
 {
-    return typeid( *this ).name();
+    return typeid(*this).name();
 }
 
-vector< string > Finfo::innerSrc() const
+vector<string> Finfo::innerSrc() const
 {
-    static vector< string > ret;
+    static vector<string> ret;
     return ret;
 }
 
-vector< string > Finfo::innerDest() const
+vector<string> Finfo::innerDest() const
 {
-    static vector< string > ret;
+    static vector<string> ret;
     return ret;
 }
diff --git a/basecode/Finfo.h b/basecode/Finfo.h
@@ -9,10 +9,9 @@
 #ifndef _FINFO_H
 #define _FINFO_H
 
-class Finfo
-{
+class Finfo {
 public:
-    Finfo( const string& name, const string& doc );
+    Finfo(const string& name, const string& doc);
     virtual ~Finfo()
     {
         ;
@@ -35,23 +34,23 @@ class Finfo
     /**
      * Assign function Ids, bindIndex and so on.
      */
-    virtual void registerFinfo( Cinfo* c ) = 0;
+    virtual void registerFinfo(Cinfo* c) = 0;
 
     /**
      * Function to set this field using a string argument.
      * Returns true on success.
      * Normally called only from SetGet::strSet.
      */
-    virtual bool strSet( const Eref& tgt, const string& field,
-                         const string& arg ) const = 0;
+    virtual bool strSet(const Eref& tgt, const string& field,
+                        const string& arg) const = 0;
 
     /**
      * Function to return value of field into a string argument.
      * Returns true on success.
      * Normally called only from SetGet::strGet.
      */
-    virtual bool strGet( const Eref& tgt, const string& field,
-                         string& returnValue ) const = 0;
+    virtual bool strGet(const Eref& tgt, const string& field,
+                        string& returnValue) const = 0;
 
     /**
      * This function is called on each new Element after
@@ -60,7 +59,7 @@ class Finfo
      * as soon as the parent is made.
      * Used in FieldElementFinfo.h
      */
-    virtual void postCreationFunc( Id newId, Element* newElm ) const
+    virtual void postCreationFunc(Id newId, Element* newElm) const
     {
         ;
     }
@@ -78,7 +77,7 @@ class Finfo
      * Is called only from msg src, so most Finfos return 0.
      * SrcFinfo and SharedFinfo will need to implement this.
      */
-    virtual bool checkTarget( const Finfo* target) const
+    virtual bool checkTarget(const Finfo* target) const
     {
         return 0;
     }
@@ -89,7 +88,7 @@ class Finfo
      * Returns 1 on success.
      * Defaults to 0 because many Finfo combinations won't work.
      */
-    virtual bool addMsg( const Finfo* target, ObjId mid, Element* src ) const
+    virtual bool addMsg(const Finfo* target, ObjId mid, Element* src) const
     {
         return 0;
     }
@@ -130,12 +129,12 @@ class Finfo
     /**
      * Returns subsidiary SrcFinfos
      */
-    virtual vector< string > innerSrc() const;
+    virtual vector<string> innerSrc() const;
 
     /**
      * Returns subsidiary DestFinfos
      */
-    virtual vector< string > innerDest() const;
+    virtual vector<string> innerDest() const;
 
     /**
      * Returns the Class Info for this Finfo
@@ -148,32 +147,31 @@ class Finfo
 };
 
 // Wrapper to handle the access functions to the Finfo objects.
-class FinfoWrapper
-{
+class FinfoWrapper {
 public:
-    FinfoWrapper( const Finfo* other ):f_( other )
+    FinfoWrapper(const Finfo* other) : f_(other)
     {
         ;
     }
 
-    string getName( ) const;
-    string docs( ) const;
-    string type( ) const;
+    string getName() const;
+    string docs() const;
+    string type() const;
     /**
      * Returns the list of subsidiary SrcFinfos.
      * Used in Shared Finfos, empty otherwise. Goes via
      * internal virtual function.
      */
-    vector< string > src( ) const;
+    vector<string> src() const;
     /**
      * Returns the list of subsidiary destFinfos.
      * Used in SharedFinfos and ValueFinfos, empty otherwise. Goes via
      * internal virtual function.
      */
-    vector< string > dest( ) const;
+    vector<string> dest() const;
 
 private:
     const Finfo* f_;
 };
 
-#endif // _FINFO_H
+#endif  // _FINFO_H
diff --git a/pybind11/pymoose.cpp b/pybind11/pymoose.cpp
@@ -69,19 +69,37 @@ py::array_t<T> getFieldNumpy(const ObjId& id, const string& fname)
     return py::array_t<T>(v.size(), v.data());
 }
 
-py::object getFieldElement(const ObjId& oid, const string& fname)
+inline ObjId getElementField(const ObjId objid, const string& fname)
 {
-    auto cinfo = oid.element()->cinfo();
-    auto finfo = cinfo->findFinfo(fname);
-    if (! finfo) {
-        py::object avl = py::cast(cinfo->getFinfoNameAndType());
-        py::print("Field " + fname + " is not found on '" + oid.path()
-                + "'. Available: ",  avl);
-        return pybind11::none();
+    return ObjId(objid.path() + '/' + fname);
+}
+
+ObjId getElementFieldItem(const ObjId& objid, const string& fname,
+                          unsigned int index)
+{
+    ObjId oid = getElementField(objid, fname);
+
+    auto len = Field<unsigned int>::get(oid, "numField");
+    assert(len >= 0);
+
+    if (index >= len) {
+        throw runtime_error(
+            "ElementField.getItem: index out of bounds. "
+            "Total elements=" +
+            to_string(len) + ".");
+        return ObjId();
+    }
+
+    // Negative indexing. Thanks Subha for hint.
+    if (index < 0) {
+        index += len;
     }
-    // FIXME: I am here.
-    Variable res = LookupField<unsigned int, Variable>::get(oid, fname, 0);
-    return py::cast(res);
+    if (index < 0) {
+        throw runtime_error("ElementField.getItem: invalid index: " +
+                            to_string(index) + ".");
+        return ObjId();
+    }
+    return ObjId(oid.id, oid.dataIndex, index);
 }
 
 py::object getFieldGeneric(const ObjId& oid, const string& fname)
@@ -129,6 +147,7 @@ ObjId connect(const ObjId& src, const string& srcField, const ObjId& tgt,
     return pShell->doAddMsg("Single", src, srcField, tgt, tgtField);
 }
 
+
 PYBIND11_MODULE(_cmoose, m)
 {
     m.doc() = R"moosedoc(moose module.)moosedoc";
@@ -186,7 +205,8 @@ PYBIND11_MODULE(_cmoose, m)
         // See discussion here: https://github.com/pybind/pybind11/issues/1667
         // Required c++14 compiler.
         .def("getField", &getFieldGeneric)
-        .def("getFieldElement", &getFieldElement)
+        .def("getElementField", &getElementField)
+        .def("getElementFieldItem", &getElementFieldItem)
         .def("getNumpy", &getFieldNumpy<double>)
 
         //---------------------------------------------------------------------
@@ -203,9 +223,7 @@ PYBIND11_MODULE(_cmoose, m)
                     ">";
          });
 
-    py::class_<Variable>(m, "_Variable")
-        .def(py::init<>())
-        ;
+    py::class_<Variable>(m, "_Variable").def(py::init<>());
 
     py::class_<Cinfo>(m, "_Cinfo")
         .def(py::init<>())
diff --git a/python/moose/moose.py b/python/moose/moose.py
@@ -41,7 +41,9 @@ def __repr__(self):
         return self.cobj.__repr__()
 
     def connect(self, srcField, dest, destField):
-        return self.cobj.connect(srcField, dest.cobj, destField)
+        if hasattr(dest, 'cobj'):
+            dest = dest.cobj
+        return self.cobj.connect(srcField, dest, destField)
 
     def parent(self, path):
         p = '/'.join(path.split('/')[:-1])
diff --git a/tests/pybind11/test_shell.py b/tests/pybind11/test_shell.py
