beat the old api in microbenchmarks as well.

Author: Dilawar Singh

pybind11/helper.cpp

@@ -145,15 +145,6 @@ bool mooseExists(const string& p)
     return Id(path) != Id() || path == "/" || path == "/root";
 }
 
-ObjId mooseObjId(const string& path)
-{
-    ObjId oid(path);
-    if (oid.bad()) {
-        cerr << "moose_element: " << path << " does not exist!" << endl;
-        return ObjId(Id());
-    }
-    return oid;
-}
 
 ObjId loadModelInternal(const string& fname, const string& modelpath,
                         const string& solverclass = "")

pybind11/helper.h

@@ -37,7 +37,20 @@ bool mooseExists(const string& path);
 void mooseMoveId(const Id& a, const ObjId& b);
 void mooseMoveObjId(const ObjId& a, const ObjId& b);
 
-ObjId mooseObjId(const string& path);
+inline ObjId mooseObjIdPath(const string& path)
+{
+    ObjId oid(path);
+    if (oid.bad()) {
+        cerr << "moose_element: " << path << " does not exist!" << endl;
+        return ObjId(Id());
+    }
+    return oid;
+}
+
+inline ObjId mooseObjIdObj(const ObjId& obj)
+{
+    return ObjId(obj.id, obj.dataIndex, obj.fieldIndex);
+}
 
 ObjId loadModelInternal(const string& fname, const string& modelpath,
                         const string& solverclass);

pybind11/pymoose.cpp

@@ -332,7 +332,8 @@ PYBIND11_MODULE(_moose, m)
     m.def("reinit", &mooseReinit);
     m.def("start", &mooseStart, "runtime"_a, "notify"_a = false);
     m.def("stop", &mooseStop);
-    m.def("objid", &mooseObjId);
+    m.def("element", &mooseObjIdPath);
+    m.def("element", &mooseObjIdObj);
     m.def("exists", &mooseExists);
     m.def("getCwe", &mooseGetCwe);
     m.def("setCwe", &mooseSetCwe);

python/moose/moose.py

@@ -64,26 +64,26 @@ def about():
                 version=_moose.__version__,
                 docs='https://moose.readthedocs.io/en/latest/')
 
-def element(path):
-    """moose.element(arg) -> moose object
-    Convert a path or an object to the appropriate builtin moose class
-    instance.
-
-    Parameters
-    ----------
-    arg : str/vec/moose object"
-        path of the moose element to be converted or another element (possibly
-        available as a superclass instance).
-
-    Returns"
-    -------"
-        MOOSE element (object) corresponding to the `arg` converted to an
-        appropriate class.
-    """
-    if not isinstance(path, str):
-        path = path.path
-    obj = _moose.objid(path)
-    return PyObjId(obj)
+#def element(arg):
+#    """moose.element(arg) -> moose object
+#    Convert a path or an object to the appropriate builtin moose class
+#    instance.
+#
+#    Parameters
+#    ----------
+#    arg : str/vec/moose object"
+#        path of the moose element to be converted or another element (possibly
+#        available as a superclass instance).
+#
+#    Returns"
+#    -------"
+#        MOOSE element (object) corresponding to the `arg` converted to an
+#        appropriate class.
+#    """
+#    #if not isinstance(path, str):
+#    #    path = path.path
+#    #obj = _moose.objid(path)
+#    return PyObjId(_moose.objid(arg))
 
 def wildcardFind(pattern):
     # return _moose.wildcardFind(pattern)

tests/benchmarks/micro_benchmark.sh

@@ -11,4 +11,5 @@ function run_str() {
 run_str "import moose"
 run_str "a=moose.Neutral('a');moose.delete(a)"
 run_str "a=moose.Neutral('a', 10000);moose.delete(a)"
+run_str "a1=moose.Neutral('a');a2=moose.element(a1);moose.delete(a1)"
 run_str "a1=moose.Neutral('a');a2=moose.element(a1);a1==a2;moose.delete(a1)"