From 1f0ca378bf84459314219774e5bc571648c5b4bc Mon Sep 17 00:00:00 2001
From: Jonathan Lambrechts <jonathan.lambrechts@uclouvain.be>
Date: Fri, 25 Jul 2014 06:11:24 +0000
Subject: [PATCH] dg : revert last commits as I won't be able to fix everything
before leaving Revert "dg : some fixes (functor)"
This reverts commit c25745274f596fd0d887efa51a4cafe9deeb72ba.
Revert "dg : functionPrecomputed->functor"
This reverts commit 6039a7ebfc4eb32c682e30338f151e193e54bece.
Revert "fix"
This reverts commit 12b85bf0978ab2706e2290fd53918b114bd89e76.
Revert "dg : introduce functorNumpy"
This reverts commit dbda48a49cc7e78ad341b2655bce2c9dbe03a7d4.
---
wrappers/gmshpy/gmshtypemaps.i | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/wrappers/gmshpy/gmshtypemaps.i b/wrappers/gmshpy/gmshtypemaps.i
index 65ac1f075f..fa9ec33d24 100644
--- a/wrappers/gmshpy/gmshtypemaps.i
+++ b/wrappers/gmshpy/gmshtypemaps.i
@@ -102,15 +102,6 @@
delete [](double*)PyCapsule_GetPointer(capsule, NULL);
}
%#endif
- PyObject *constFullMatrix2PyArray(const fullMatrix<double> &fm)
- {
- npy_intp dims[2] = {fm.size1(), fm.size2()};
- double *data = (double*) fm.getDataPtr();
- // do not copy data
- PyObject *array = PyArray_New(&PyArray_Type, dims[1] == 1 ? 1 : 2, dims, NPY_DOUBLE, NULL, (void*)data, 0, NPY_ARRAY_F_CONTIGUOUS, NULL);
- PyArray_UpdateFlags((PyArrayObject*)array, NPY_ARRAY_ALIGNED);
- return array;
- }
PyObject *fullMatrix2PyArray(fullMatrix<double> &fm)
{
npy_intp dims[2] = {fm.size1(), fm.size2()};
@@ -185,10 +176,6 @@
%typemap(out, fragment="fullMatrixConversion") fullMatrix<double> {
$result = fullMatrix2PyArray($1);
}
-
-%typemap(out, fragment="fullMatrixConversion") const fullMatrix<double>& {
- $result = constFullMatrix2PyArray(*($1));
-}
#endif
--
GitLab