Updated [skip ci]

Author: Dilawar Singh

pybind11/helper.cpp

@@ -148,17 +148,12 @@ bool doesExist(const string& path)
 
 ObjId mooseElement(const string& path)
 {
-    ObjId oid;
-    unsigned nid = 0, did = 0, fidx = 0;
-    Id id;
-    unsigned int numData = 0;
-
-    oid = ObjId(path);
+    ObjId oid(path);
     if (oid.bad()) {
         throw runtime_error(std::string("moose_element: '") +
                             std::string(path) +
                             std::string("' does not exist!"));
-        return Id();
+        return ObjId(Id());
     }
     return oid;
 }
@@ -312,3 +307,18 @@ void mooseStart(double runtime, bool notify=false)
 {
     getShellPtr()->doStart(runtime, notify);
 }
+
+//ObjId mooseCopy(const ObjId& orig, ObjId newParent, string newName, unsigned int n=1
+//        , bool toGlobal=false, bool copyExtMsgs=false)
+//{
+//    auto id =  getShellPtr()->doCopy(orig.id, newParent, newName, n, toGlobal, copyExtMsgs);
+//    return ObjId(id);
+//}
+
+
+ObjId mooseCopy(const Id& orig, ObjId newParent, string newName, unsigned int n=1
+        , bool toGlobal=false, bool copyExtMsgs=false)
+{
+    auto id =  getShellPtr()->doCopy(orig, newParent, newName, n, toGlobal, copyExtMsgs);
+    return ObjId(id);
+}

pybind11/helper.h

@@ -47,6 +47,12 @@ void mooseDelete(const ObjId& oid);
 
 ObjId mooseCreate(const string type, const string& path, size_t numdata = 1);
 
+// ObjId mooseCopy(const ObjId& orig, ObjId newParent, string newName, unsigned int n,
+//              bool toGlobal, bool copyExtMsgs);
+
+ObjId mooseCopy(const Id& orig, ObjId newParent, string newName, unsigned int n
+        , bool toGlobal, bool copyExtMsgs);
+
 py::object mooseGetCwe();
 
 void mooseSetClock(const size_t clockId, double dt);
@@ -57,5 +63,4 @@ map<string, string> mooseGetFieldDict(const string& className,
 void mooseReinit();
 void mooseStart(double runtime, bool notify);
 
-
 #endif /* end of include guard: HELPER_H */

pybind11/pymoose.cpp

@@ -131,9 +131,9 @@ py::object getLookupValueFinfoItem(const ObjId& oid, const string& fname,
     string tgtType = srcDestType[1];
 
     py::object r;
-    if(tgtType == "bool")
+    if (tgtType == "bool")
         r = py::cast(LookupField<string, bool>::get(oid, fname, k));
-    else if(tgtType == "vector<Id>")
+    else if (tgtType == "vector<Id>")
         r = py::cast(LookupField<string, vector<Id>>::get(oid, fname, k));
     else
         cerr << "Unsupported types: " << rttType << endl;
@@ -197,6 +197,8 @@ PYBIND11_MODULE(_cmoose, m)
         // properties
         .def_property_readonly("numIds", &Id::numIds)
         .def_property_readonly("path", &Id::path)
+        .def_property_readonly("name",
+                               [](const Id& id) { return ObjId(id).name(); })
         .def_property_readonly("id", &Id::value)
         .def_property_readonly(
             "cinfo", [](Id& id) { return id.element()->cinfo(); },
@@ -222,6 +224,8 @@ PYBIND11_MODULE(_cmoose, m)
         .def_property_readonly("value",
                                [](const ObjId oid) { return oid.id.value(); })
         .def_property_readonly("path", &ObjId::path)
+        .def_property_readonly(
+            "parent", [](const ObjId& oid) { return Neutral::parent(oid); })
         .def_property_readonly("name", &ObjId::name)
         .def_property_readonly(
             "className",
@@ -284,8 +288,7 @@ PYBIND11_MODULE(_cmoose, m)
         .def("quit", &Shell::doQuit);
 
     // Module functions.
-    m.def(
-        "getShell",
+    m.def("getShell",
         []() { return reinterpret_cast<Shell*>(Id().eref().data()); },
         py::return_value_policy::reference);
 
@@ -301,7 +304,9 @@ PYBIND11_MODULE(_cmoose, m)
     m.def("loadModelInternal", &loadModelInternal);
     m.def("getFieldDict", &mooseGetFieldDict, py::arg("className"),
           py::arg("finfoType") = "");
-
+    m.def("copy", &mooseCopy, py::arg("orig"), py::arg("newParent"),
+          py::arg("newName"), py::arg("num") = 1, py::arg("toGlobal") = false,
+          py::arg("copyExtMsgs") = false);
     // Attributes.
     m.attr("NA") = NA;
     m.attr("PI") = PI;

pymoose/moosemodule.cpp

@@ -2556,7 +2556,7 @@ int moose_clear(PyObject *m)
     Py_CLEAR(GETSTATE(m)->error);
     // I did get a segmentation fault at exit (without running a reinit() or
     // start()) after creating a compartment. After putting the finalize here it
-    // went away. But did not reoccur even after commenting it out. Will need
+    // went away. But :edid not reoccur even after commenting it out. Will need
     // closer debugging.
     // - Subha 2012-08-18, 00:36
     finalize();

python/moose/moose.py

@@ -59,7 +59,7 @@ def __getattr__(self, attr):
 
 for p in _cmoose.wildcardFind('/##[TYPE=Cinfo]'):
     # create a class.
-    cls = type(p.name, (__Neutral__,), dict(__metaclass__=p.name, objid=p.id))
+    cls = type(p.name, (__Neutral__,), dict(__metaclass__=p.name))
     setattr(moose, cls.__name__, cls)
 
 logger_.info("Declarting classes took %f sec" % (time.time() - t0))
@@ -104,6 +104,12 @@ def element(pathOrObject):
 def exists(path):
     return _cmoose.exists(path)
 
+def copy(elem, newParent, newName="", n=1):
+    if not newName:
+        newName = elem.name
+    if isinstance(newName, str):
+        newParent = __Neutral__(newParent)
+    return _cmoose.copy(elem, newParent, newName, n, False, False) 
 
 def getCwe():
     return __Neutral__(_cmoose.getCwe())

tests/pybind11/test_shell.py

@@ -331,18 +331,19 @@ def test_ksolve2():
     kin = makereac2()
     run_and_assert(kin, "ksolve1_test2.png")
 
-def test_ksolve3():
+def test_access():
     moose.Neutral('x')
     a = moose.Neutral('x/x')
     print(a.isA)
     print(a.isA('Compartment'))
     print(a.isA['Compartment'])
+    print(a.parent)
 
 def main():
     test_ksolve0()
     test_ksolve1()
     test_ksolve2()
-    test_ksolve3()
+    test_access()
 
 if __name__ == '__main__':
     main()