Changeset 13373

Timestamp:

09/14/12 14:13:08 (13 years ago)

Author:

jschierm

Message:

CHG: Changed appropriate FetchData to memcpy and added more to FetchData for Options.

Location:

issm/trunk-jpl/src/c/python/io

Files:

• FetchPythonData.cpp (modified) (5 diffs)
• pythonio.h (modified) (1 diff)

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

@@ -66 +66 @@
         double* matrix=NULL;
         int M,N;
-        int i,ndim;
+        int ndim;
         npy_intp*  dims=NULL;
 
@@ -80 +80 @@
         /*copy matrix: */
         matrix=xNew<double>(M*N);
-        for(i=0;i<M*N;i++)matrix[i]=dmatrix[i];
+        memcpy(matrix,dmatrix,(M*N)*sizeof(double));
 
         /*output: */
@@ -127 +127 @@
         double* vector=NULL;
         int M;
-        int i,ndim;
+        int ndim;
         npy_intp*  dims=NULL;
 
@@ -141 +141 @@
         /*copy vector: */
         vector=xNew<double>(M);
-        for(i=0;i<M;i++)vector[i]=dvector[i];
+        memcpy(vector,dvector,(M)*sizeof(double));
 
         /*output: */
@@ -233 +233 @@
 }
 /*}}}*/
-/*FUNCTION FetchData(Options** poptions,int istart, int nrhs,PyObject* arguments){{{*/
-void FetchData(Options** poptions,int istart, int nrhs,PyObject* arguments){
+/*FUNCTION FetchData(Options** poptions,int istart, int nrhs,PyObject* py_args){{{*/
+void FetchData(Options** poptions,int istart, int nrhs,PyObject* py_tuple){
+
+        char   *name   = NULL;
+        Option *option = NULL;
 
         /*Initialize output*/
         Options* options=new Options();
 
-        _pprintLine_("FetchData for Options not implemented yet, ignoring them!");
+        /*Fetch all options*/
+        for (int i=istart; i<nrhs; i=i+2){
+                if (!PyString_Check(PyTuple_GetItem(py_tuple,(Py_ssize_t)i))) _error_("Argument " << i+1 << " must be name of option");
+
+                FetchData(&name,PyTuple_GetItem(py_tuple,(Py_ssize_t)i));
+                if(i+1 == nrhs) _error_("Argument " << i+2 << " must exist and be value of option \"" << name << "\".");
+
+//              _pprintLine_("FetchData for Options not implemented yet, ignoring them!");
+                _printf_(1,"FetchData for Options not implemented yet, ignoring option '%s'!",name);
+
+//              option=(Option*)OptionParse(name,&PyTuple_GetItem(py_tuple,(Py_ssize_t)(i+1)));
+//              options->AddOption(option);
+//              option=NULL;
+        }
 
         /*Assign output pointers:*/
         *poptions=options;
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/python/io/pythonio.h

@@ -34 +34 @@
 void FetchData(BamgMesh** bamgmesh,PyObject* py_dict);
 void FetchData(BamgOpts** bamgopts,PyObject* py_dict);
-void FetchData(Options** poptions,int istart, int nrhs,PyObject* arguments);
+void FetchData(Options** poptions,int istart, int nrhs,PyObject* py_tuple);
 void FetchData(DataSet** pcontours,PyObject* py_list);