Passing ObjId as Id is creating trouble.

Author: Dilawar Singh

pybind11/Finfo.cpp

@@ -182,10 +182,10 @@ py::cpp_function __Finfo__::getDestFinfoSetterFunc1(const ObjId& oid,
 
     if (ftype == "double") 
         return getSetGetFunc1<double>(oid, fname);
-    if (ftype == "Id") 
-        return getSetGetFunc1<Id>(oid, fname);
     if (ftype == "ObjId") 
         return getSetGetFunc1<ObjId>(oid, fname);
+    if (ftype == "Id")
+       return getSetGetFunc1<Id>(oid, fname);
     if (ftype == "vector<Id>") 
         return getSetGetFunc1<vector<Id>>(oid, fname);
     if (ftype == "vector<ObjId>") 

pybind11/Finfo.h

@@ -39,7 +39,8 @@ class __Finfo__ {
     }
 
     template <typename T>
-    static std::function<bool(T)> getSetGetFunc1(const ObjId& oid, const string& fname)
+    static std::function<bool(T)> getSetGetFunc1(const ObjId& oid,
+                                                 const string& fname)
     {
         std::function<bool(T)> func = [oid, fname](const T& val) {
             return SetGet1<T>::set(oid, fname, val);

python/moose/fixXreacs.py

@@ -119,7 +119,7 @@ def disconnectReactant(reacOrEnz, reactant, duppool):
     if _cmoose.exists(infoPath):
         info = moose.element(infoPath)
     else:
-        info = _cmoose.Annotator(infoPath)
+        info = moose.Annotator(infoPath)
 
     #_cmoose.le( reactant )
     notes = ""

tests/py_moose/test_Xreacs2.py

@@ -53,7 +53,7 @@ def test_xreac2():
     s2.path = '/model/compartment_1/##'
 
     print(ds1)
-    ds2.buildMeshJunctions( ds1.id )
+    ds2.buildMeshJunctions( ds1 )
 
     moose.reinit()
     moose.start( runtime )