biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uncrustify files
[alexxy/gromacs.git]
/
src
/
python
/
include
/
numpy_conv.h
diff --git
a/src/python/include/numpy_conv.h
b/src/python/include/numpy_conv.h
index b810832b051c99676de5f0c7308b31b538db651f..67d04da321dbc24a9416c03ef8c82a39fc9cf26c 100644
(file)
--- a/
src/python/include/numpy_conv.h
+++ b/
src/python/include/numpy_conv.h
@@
-39,25
+39,28
@@
#include <Python.h>
#include <numpy/ndarrayobject.h>
#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
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
#else
-
return PyArray_SimpleNewFromData(2, dims, NPY_FLOAT, (float*) data);
+ return PyArray_SimpleNewFromData(2, dims, NPY_FLOAT, (float*) data);
#endif
}
#endif
}
-PyObject* array1dToNumpy(int dim, const void *data) {
+PyObject* array1dToNumpy(int dim, const void *data)
+{
npy_intp n_dim = dim;
#ifdef GMX_DOUBLE
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
#else
-
return PyArray_SimpleNewFromData(1, &n_dim, NPY_FLOAT, (float*) data);
+ return PyArray_SimpleNewFromData(1, &n_dim, NPY_FLOAT, (float*) data);
#endif
}
#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);
}
npy_intp n_dim = dim;
return PyArray_SimpleNewFromData(1, &n_dim, NPY_INT, (int*) data);
}