All test passes. Needs to work on the API now.

Author: Dilawar Singh

pybind11/helper.cpp

@@ -115,7 +115,7 @@ ObjId createIdFromPath(string path, string type, size_t numData)
     return nId;
 }
 
-inline Shell* const getShellPtr(void)
+Shell* getShellPtr(void)
 {
     return reinterpret_cast<Shell*>(Id().eref().data());
 }

pybind11/helper.h

@@ -23,7 +23,7 @@ Id initShell();
 
 ObjId createIdFromPath(string path, string type, size_t numData=1);
 
-Shell* const getShellPtr();
+Shell* getShellPtr();
 
 bool doesExist(const string& path);
 

pybind11/pymoose.cpp

@@ -152,6 +152,10 @@ inline void mooseDelete(const ObjId& oid)
     getShellPtr()->doDelete(oid);
 }
 
+inline void mooseSetClock(const size_t clockId, double dt)
+{
+    getShellPtr()->doSetClock(clockId, dt);
+}
 
 PYBIND11_MODULE(_cmoose, m)
 {
@@ -256,8 +260,8 @@ PYBIND11_MODULE(_cmoose, m)
           py::return_value_policy::reference);
 
     m.def("wildcardFind", &wildcardFind2);
-
     m.def("delete", &mooseDelete);
+    m.def("setClock", &mooseSetClock);
 
     // Attributes.
     m.attr("NA") = NA;

python/moose/moose.py

@@ -40,10 +40,6 @@ def __init__(self, path, ndata=1):
     def __repr__(self):
         return self.cobj.__repr__()
 
-    def __del__(self):
-        __SHELL__.delete(self.cobj)
-        del self
-
     def connect(self, srcField, dest, destField):
         if hasattr(dest, 'cobj'):
             dest = dest.cobj
@@ -68,7 +64,6 @@ def name(self, path):
 
 logger_.info("Declarting classes took %f sec" % (time.time() - t0))
 
-
 #############################################################################
 #                             API                                           #
 #############################################################################
@@ -93,12 +88,13 @@ def wildcardFind(pattern):
     """
     paths = []
     for p in _cmoose._wildcardFind(pattern):
-        paths.append(__toMooseObject(p))
+        paths.append(p)
     return paths
 
 def delete(a):
-    moose._cmoose.delete(a.cobj)
-    del a
+    if hasattr(a, 'cobj'):
+        return moose._cmoose.delete(a.cobj)
+    return moose._cmoose.delete(a)
 
 def element(pathOrObject):
     if isinstance(pathOrObject, str):

tests/pybind11/test_shell.py

@@ -197,9 +197,8 @@ def makereac1():
 
 def makereac2():
     pools = [None]*10
-    s = M.getShell()
     kin = moose.CubeMesh("kinetics", 1)
-    t = moose.StimulusTable("/kinetics/StimulusTable")
+    t = moose.StimulusTable("kinetics/StimulusTable")
     pools[0] = T = moose.BufPool(kin.path+"/T")
     pools[1] = A = moose.Pool(kin.path+"/A")
     pools[2] = B = moose.Pool(kin.path + "/B")
@@ -284,8 +283,8 @@ def makereac2():
 
     #  Schedule it.
     for i in range(11, 18):
-        s.setClock(i, 0.1);
-    s.setClock(18, 0.1);
+        moose.setClock(i, 0.1);
+    moose.setClock(18, 0.1);
     return kin
 
 def run_and_assert(kin, outfile):
@@ -312,8 +311,9 @@ def run_and_assert(kin, outfile):
     assert np.allclose(expected, np.array(got)), "Expected %s but got %s" % ( 
             expected, got)
     # get data.
-    s.delete(kin.cobj)
+    moose.delete(kin)
     plt.savefig(outfile)
+    plt.close()
     print("Done ksolve: Saved to %s" % outfile)
 
 def test_ksolve0():
@@ -325,13 +325,13 @@ def test_ksolve1():
     run_and_assert(kin, "ksolve1_test1.png")
 
 def test_ksolve2():
+    print("[INFO ] test 3")
     kin = makereac2()
-    run_and_assert(kin, "ksolve1_test1.png")
-
+    run_and_assert(kin, "ksolve1_test2.png")
 
 def main():
-    #test_ksolve0()
-    #test_ksolve1()
+    test_ksolve0()
+    test_ksolve1()
     test_ksolve2()
 
 if __name__ == '__main__':