source: issm/oecreview/Archive/13393-13976/ISSM-13446-13447.diff@ 13980

Last change on this file since 13980 was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 2.8 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp
2===================================================================
3--- ../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 13446)
4+++ ../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 13447)
5@@ -113,7 +113,14 @@
6 *pdataref=mxCreateString(string);
7 }
8 /*}}}*/
9+/*FUNCTION WriteData(mxArray** pdataref){{{*/
10+void WriteData(mxArray** pdataref){
11
12+ ;
13+
14+}
15+/*}}}*/
16+
17 /*ISSM objects*/
18 /*FUNCTION WriteData(mxArray** pdataref,BamgGeom* bamggeom){{{*/
19 void WriteData(mxArray** pdataref,BamgGeom* bamggeom){
20Index: ../trunk-jpl/src/c/matlab/io/matlabio.h
21===================================================================
22--- ../trunk-jpl/src/c/matlab/io/matlabio.h (revision 13446)
23+++ ../trunk-jpl/src/c/matlab/io/matlabio.h (revision 13447)
24@@ -25,6 +25,7 @@
25 void WriteData(mxArray** pdataref,bool boolean);
26 void WriteData(mxArray** pdataref,double scalar);
27 void WriteData(mxArray** pdataref,char* string);
28+void WriteData(mxArray** pdataref);
29 void WriteData(mxArray** pdataref,BamgGeom* bamggeom);
30 void WriteData(mxArray** pdataref,BamgMesh* bamgmesh);
31
32Index: ../trunk-jpl/src/c/python/io/WritePythonData.cpp
33===================================================================
34--- ../trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13446)
35+++ ../trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13447)
36@@ -45,7 +45,13 @@
37
38 PyTuple_SetItem(tuple, index, array);
39 }/*}}}*/
40+/*FUNCTION WriteData(PyObject* py_tuple,int index){{{*/
41+void WriteData(PyObject* py_tuple, int index){
42+
43+ PyTuple_SetItem(py_tuple, index, Py_None);
44
45+}/*}}}*/
46+
47 /*ISSM objects*/
48 /*FUNCTION WriteData(PyObject* py_tuple,int index,BamgGeom* bamggeom){{{*/
49 void WriteData(PyObject* py_tuple,int index,BamgGeom* bamggeom){
50@@ -127,7 +133,7 @@
51
52 }/*}}}*/
53 /*FUNCTION WriteData(PyObject* py_tuple,int index,SeqVec<double>* vector){{{*/
54-void WriteData(PyObject* tuple,int index,SeqVec<double>* vector){
55+void WriteData(PyObject* py_tuple,int index,SeqVec<double>* vector){
56
57 int M;
58 double* buffer=NULL;
59@@ -139,6 +145,6 @@
60 dim=(npy_intp)M;
61 array=PyArray_SimpleNewFromData(1,&dim,NPY_DOUBLE,buffer);
62
63- PyTuple_SetItem(tuple, index, array);
64+ PyTuple_SetItem(py_tuple, index, array);
65 }
66 /*}}}*/
67Index: ../trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp
68===================================================================
69--- ../trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp (revision 13446)
70+++ ../trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp (revision 13447)
71@@ -72,9 +72,11 @@
72 /* output: */
73 if (strcmp(interptype,"node")==0){
74 WriteData(PLHS0,in_nod);
75+ WriteData(PLHS1);
76 }
77 else if (strcmp(interptype,"element")==0){
78 WriteData(PLHS0,in_elem);
79+ WriteData(PLHS1);
80 }
81 else if (strcmp(interptype,"element and node")==0){
82 WriteData(PLHS0,in_nod);
Note: See TracBrowser for help on using the repository browser.