add simpleFunctionPython

Mesh/DivideAndConquer.h

@@ -14,6 +14,7 @@
 #include "SPoint2.h"
 #include "simpleFunction.h"
 #include "Octree.h"
+#include "MElement.h"
 
 class GFace;
 typedef struct _CDLIST DListRecord, *DListPeek;

Mesh/surfaceFiller.cpp

@@ -13,6 +13,7 @@
 #endif
 
 #include "MVertex.h"
+#include "MElement.h"
 //#include "directions3D.h"
 #include "BackgroundMesh.h"
 #include "intersectCurveSurface.h"

Numeric/simpleFunction.h

@@ -7,7 +7,7 @@
 #define _SIMPLE_FUNCTION_H_
 
 // FIXME: Numeric/ should not depend on Geo/
-#include "MElement.h"
+class MElement;
 
 template <class scalar>
 class simpleFunction {

Numeric/simpleFunctionPython.h

+#ifndef _SIMPLE_FUNCTION_PYTHON_H_
+#define _SIMPLE_FUNCTION_PYTHON_H_
+#include "Python.h"
+#include "simpleFunction.h"
+
+class simpleFunctionPython : public simpleFunction<double> {
+  PyObject *_pycallback;
+ public:
+  simpleFunctionPython(PyObject *callback):
+    _pycallback(callback)
+  {
+    Py_INCREF(_pycallback);
+  }
+  ~simpleFunctionPython()
+  {
+    Py_DECREF(_pycallback);
+  }
+  double operator()(double x, double y, double z) const
+  {
+    PyObject *pyargs = Py_BuildValue("(ddd)", x, y, z);
+    PyObject *result = PyEval_CallObject(_pycallback, pyargs);
+    double r = 0;
+    if (result) {
+      int ok = PyArg_Parse(result, "d", &r);
+      if (not ok)
+        Msg::Error("The python function did not return a double.");
+      Py_DECREF(result);
+    }
+    else {
+      PyErr_Print();
+      Msg::Error("An error occurs in the python simple function.");
+    }
+    Py_DECREF(pyargs);
+    return r;
+  }
+};
+#endif

contrib/bamg/bamglib/Mesh2.h

@@ -30,6 +30,7 @@
 #include <math.h>
 #include <limits.h>
 #include <time.h>
+#include "MElement.h"
 #if  (defined(unix) || defined(__unix)) && !defined(__AIX)
 #define SYSTIMES
 #include <sys/times.h>

wrappers/gmshpy/gmshNumeric.i

@@ -11,6 +11,8 @@
   #include "JacobianBasis.h"
   #include "fullMatrix.h"
   #include "nodalBasis.h"
+  #include "simpleFunction.h"
+  #include "simpleFunctionPython.h"
   #include "polynomialBasis.h"
   #include "pyramidalBasis.h"
 %}
@@ -18,8 +20,11 @@
 %include "GaussIntegration.h"
 %include "JacobianBasis.h"
 %include "fullMatrix.h"
+%include "simpleFunction.h"
 %template(fullMatrixDouble) fullMatrix<double>;
 %template(fullVectorDouble) fullVector<double>;
+%template(simpleFunctionDouble) simpleFunction<double>;
+%include "simpleFunctionPython.h"
 %include "nodalBasis.h"
 %include "polynomialBasis.h"
 %include "pyramidalBasis.h"