#include <Python.h>
#include <numpy/ndarrayobject.h>
-PyObject* array2dToNumpy(int dim1, int dim2, const void *data) {
+PyObject* array2dToNumpy(int dim1, int dim2, const void *data)
+{
npy_intp dims[] = {dim1, dim2};
#ifdef GMX_DOUBLE
- return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, (double*) data);
+ return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, (double*) data);
#else
- return PyArray_SimpleNewFromData(2, dims, NPY_FLOAT, (float*) data);
+ return PyArray_SimpleNewFromData(2, dims, NPY_FLOAT, (float*) data);
#endif
}
-PyObject* array1dToNumpy(int dim, const void *data) {
+PyObject* array1dToNumpy(int dim, const void *data)
+{
npy_intp n_dim = dim;
#ifdef GMX_DOUBLE
- return PyArray_SimpleNewFromData(1, &n_dim, NPY_DOUBLE, (double*) data);
+ return PyArray_SimpleNewFromData(1, &n_dim, NPY_DOUBLE, (double*) data);
#else
- return PyArray_SimpleNewFromData(1, &n_dim, NPY_FLOAT, (float*) data);
+ return PyArray_SimpleNewFromData(1, &n_dim, NPY_FLOAT, (float*) data);
#endif
}
-PyObject* iarray1dToNumpy(int dim, const int *data) {
+PyObject* iarray1dToNumpy(int dim, const int *data)
+{
npy_intp n_dim = dim;
return PyArray_SimpleNewFromData(1, &n_dim, NPY_INT, (int*) data);
}