Changeset 26565

Timestamp:

11/09/21 06:53:57 (3 years ago)

Author:

bdef

Message:

NEW: adding some single precision import

File:

• issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp (modified) (4 diffs)

issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp

@@ -189 +189 @@
         long* lmatrix=NULL;
         bool* bmatrix=NULL;
+        float* smatrix=NULL;
         int i;
         PyObject* py_matrix2=NULL;
@@ -212 +213 @@
                         }
 
-                        if (PyArray_TYPE((PyArrayObject*)py_matrix) == NPY_DOUBLE) {
+                        if (PyArray_TYPE((PyArrayObject*)py_matrix) == NPY_FLOAT) {
+                                /*retrieve internal value: */
+                                smatrix=(float*)PyArray_DATA((PyArrayObject*)py_matrix);
+
+                                /*transform into double matrix: */
+                                matrix=xNew<double>(M*N);
+                                for(i=0;i<M*N;i++)matrix[i]=(double)smatrix[i];
+                        }
+
+                        else if (PyArray_TYPE((PyArrayObject*)py_matrix) == NPY_DOUBLE) {
                                 /*retrieve internal value: */
                                 dmatrix=(double*)PyArray_DATA((PyArrayObject*)py_matrix);
@@ -558 +568 @@
         long* lvector=NULL;
         bool* bvector=NULL;
+        float* svector=NULL;
         int i;
         PyObject* py_vector2=NULL;
@@ -584 +595 @@
                         }
 
-                        if      (PyArray_TYPE((PyArrayObject*)py_vector) == NPY_DOUBLE) {
+                        if (PyArray_TYPE((PyArrayObject*)py_vector) == NPY_FLOAT) {
+                                /*retrieve internal value: */
+                                svector=(float*)PyArray_DATA((PyArrayObject*)py_vector);
+
+                                /*transform into double matrix: */
+                                vector=xNew<double>(M);
+                                for(i=0;i<M;i++)vector[i]=(double)svector[i];
+                        }
+                        else if (PyArray_TYPE((PyArrayObject*)py_vector) == NPY_DOUBLE) {
                                 /*retrieve internal value: */
                                 dvector=(double*)PyArray_DATA((PyArrayObject*)py_vector);