This is for tomorow.

Author: Dilawar Singh

.gitlab-ci.yml

@@ -22,7 +22,7 @@ build:
     - python3 -c "import moose; moose.test()"
 
   except:
-      - pybind11
+      - pybind11*
       - devel
       - temp
 

basecode/Conv.h

@@ -96,13 +96,13 @@ template< class T > class Conv
                 return "float";
             if ( typeid( T ) == typeid( double ) )
                 return "double";
-            if ( typeid( T ) == typeid( Id ) )
+            if ( typeid( T ) == typeid(Id))
                 return "Id";
-            if ( typeid( T ) == typeid( ObjId ) )
+            if ( typeid( T ) == typeid(ObjId))
                 return "ObjId";
-            if ( typeid( T ) == typeid( vector<double> ) )
+            if ( typeid( T ) == typeid(vector<double>))
                 return "vector<double>";
-            if ( typeid( T ) == typeid( vector<Variable> ) )
+            if ( typeid( T ) == typeid(Variable))
                 return "Variable";
             return typeid( T ).name(); // this is not portable but may be more useful than "bad"
         }

builtins/Function.cpp

@@ -197,7 +197,7 @@ const Cinfo * Function::initCinfo()
         "x",
         "Input variables (indexed) to the function. These can be passed via messages.",
         Variable::initCinfo(),
-        &Function::getVar,
+        &Function::getX,
         &Function::setNumVar,
         &Function::getNumVar
     );
@@ -716,7 +716,7 @@ void Function::setVar(unsigned int index, double value)
     MOOSE_WARN("Function: index " << index << " out of bounds.");
 }
 
-Variable* Function::getVar(unsigned int ii) 
+Variable* Function::getX(unsigned int ii) 
 {
     static Variable dummy("DUMMY");
     if(ii >= xs_.size())

builtins/Function.h

@@ -46,7 +46,7 @@ class Function
     // get/set the value of variable `name`
     void setVar(unsigned int index, double value);
 
-    Variable* getVar(unsigned int ii);
+    Variable* getX(unsigned int ii);
 
     // get function eval result
     double getValue() const;

pybind11/CMakeLists.txt

@@ -24,7 +24,7 @@ if(APPLE)
         "-Wl,-all_load"
         ${MOOSE_LIBRARIES}
         ${STATIC_LIBRARIES})
-    target_link_libraries(_cmoose ${SYSTEM_SHARED_LIBS})
+    target_link_libraries(_cmoose PRIVATE ${SYSTEM_SHARED_LIBS})
 else(APPLE)
     target_link_libraries(_cmoose PRIVATE
         "-Wl,--whole-archive" 

pybind11/pymoose.cpp

@@ -35,6 +35,7 @@
 #include "../shell/Shell.h"
 #include "../shell/Wildcard.h"
 #include "../shell/Neutral.h"
+#include "../builtins/Variable.h"
 
 #include "helper.h"
 #include "pymoose.h"
@@ -78,6 +79,9 @@ py::object getFieldElement(const ObjId& oid, const string& fname)
                 + "'. Available: ",  avl);
         return pybind11::none();
     }
+    // FIXME: I am here.
+    Variable res = LookupField<unsigned int, Variable>::get(oid, fname, 0);
+    return py::cast(res);
 }
 
 py::object getFieldGeneric(const ObjId& oid, const string& fname)
@@ -112,7 +116,7 @@ py::object getFieldGeneric(const ObjId& oid, const string& fname)
         return py::cast(getProp<Id>(oid, fname));
     else if (ftype == "ObjId")
         return py::cast(getProp<ObjId>(oid, fname));
-    else if (ftype == typeid(Variable).name())
+    else if (ftype == "Variable")
         return py::cast(getProp<Variable>(oid, fname));
     py::print("pymoose::getFieldGeneric::Warning: Unsupported type " + ftype);
     return pybind11::none();
@@ -199,15 +203,9 @@ PYBIND11_MODULE(_cmoose, m)
                     ">";
          });
 
-    py::class_<FinfoWrapper>(m, "_FinfoWrapper")
-        .def(py::init<const Finfo*>())
-        .def_property_readonly("name", &FinfoWrapper::getName)
-        .def_property_readonly("doc", &FinfoWrapper::docs)
-        .def_property_readonly("type", &FinfoWrapper::type)
-        .def_property_readonly("src", &FinfoWrapper::src,
-                               py::return_value_policy::reference)
-        .def_property_readonly("dest", &FinfoWrapper::dest,
-                               py::return_value_policy::reference);
+    py::class_<Variable>(m, "_Variable")
+        .def(py::init<>())
+        ;
 
     py::class_<Cinfo>(m, "_Cinfo")
         .def(py::init<>())

tests/pybind11/test_shell.py

@@ -229,7 +229,6 @@ def makereac2():
     r1.connect("prd", B, "reac")
 
     sum.cobj.setField("numVars", 2)
-
     print('xxx', sum.cobj.getFieldElement('x'))
     quit()
 
@@ -336,8 +335,8 @@ def test_ksolve2():
 
 
 def main():
-    test_ksolve0()
-    test_ksolve1()
+    #test_ksolve0()
+    #test_ksolve1()
     test_ksolve2()
 
 if __name__ == '__main__':