Changeset 13227

Timestamp:

09/04/12 08:48:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: make sure we are writing SeqMat and SeqVec for matlab in order to disconnect petsc from modules

Location:

issm/trunk-jpl/src/c

Files:

• matlab/io/WriteMatlabData.cpp (modified) (2 diffs)
• matlab/io/matlabio.h (modified) (2 diffs)
• modules/TriMeshx/TriMeshx.cpp (modified) (3 diffs)
• modules/TriMeshx/TriMeshx.h (modified) (1 diff)

issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp

@@ -216 +216 @@
 }
 /*}}}*/
-/*FUNCTION WriteData(mxArray** pdataref,Matrix* matrix){{{*/
-void WriteData(mxArray** pdataref,Matrix<double>* matrix){
+/*FUNCTION WriteData(mxArray** pdataref,SeqMat<double>* matrix){{{*/
+void WriteData(mxArray** pdataref,SeqMat<double>* matrix){
                 
         int      i,j;
@@ -246 +246 @@
                 /*Free ressources:*/
                 xDelete<double>(matrix_ptr);
-
-        }
-        else{
-                dataref = mxCreateDoubleMatrix(0,0,mxREAL);
-        }
-
-        *pdataref=dataref;
-}
-/*}}}*/
-/*FUNCTION WriteData(mxArray** pdataref,Vector<double>* vector){{{*/
-void WriteData(mxArray** pdataref,Vector<double>* vector){
+        }
+        else{
+                dataref = mxCreateDoubleMatrix(0,0,mxREAL);
+        }
+
+        *pdataref=dataref;
+}
+/*}}}*/
+/*FUNCTION WriteData(mxArray** pdataref,SeqVec<double>* vector){{{*/
+void WriteData(mxArray** pdataref,SeqVec<double>* vector){
         
         mxArray* dataref=NULL;

issm/trunk-jpl/src/c/matlab/io/matlabio.h

@@ -18 +18 @@
 #include <mex.h>
 
-void WriteData(mxArray** pdataref,Matrix<double>* matrix);
+void WriteData(mxArray** pdataref,SeqMat<double>* matrix);
 void WriteData(mxArray** pdataref,double* matrix, int M,int N);
 void WriteData(mxArray** pdataref,int*    matrix, int M,int N);
-void WriteData(mxArray** pdataref,Vector<double>* vector);
+void WriteData(mxArray** pdataref,SeqVec<double>* vector);
 void WriteData(mxArray** pdataref,double* vector, int M);
 void WriteData(mxArray** pdataref,int integer);
@@ -85 +85 @@
 #endif
 
-
 #endif  /* _IO_H_ */

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp

@@ -20 +20 @@
 /*}}}*/
 
-void TriMeshx(Matrix<IssmPDouble>** pindex,Vector<IssmPDouble>** px,Vector<IssmPDouble>** py,Matrix<IssmPDouble>** psegments,Vector<IssmPDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
+void TriMeshx(SeqMat<IssmPDouble>** pindex,SeqVec<IssmPDouble>** px,SeqVec<IssmPDouble>** py,SeqMat<IssmPDouble>** psegments,SeqVec<IssmPDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
 
         /*indexing: */
@@ -26 +26 @@
 
         /*output: */
-        IssmPDouble* index=NULL;
-        Matrix<IssmPDouble>* index_matrix=NULL;
-        double* x=NULL;
-        double* y=NULL;
-        double* segments=NULL;
-        Matrix<IssmPDouble>* segments_matrix=NULL;
-        double* segmentmarkerlist=NULL;
+        IssmPDouble         *index             = NULL;
+        SeqMat<IssmPDouble> *index_matrix      = NULL;
+        double              *x                 = NULL;
+        double              *y                 = NULL;
+        double              *segments          = NULL;
+        SeqMat<IssmPDouble> *segments_matrix   = NULL;
+        double              *segmentmarkerlist = NULL;
 
         /*intermediary: */
-        int      counter,counter2,backcounter;
-        Contour<IssmPDouble>* contour=NULL;
+        int counter,counter2,backcounter;
+        Contour<IssmPDouble> *contour = NULL;
 
         /* Triangle structures needed to call Triangle library routines: */
@@ -192 +192 @@
 
         /*Output : */
-        index_matrix=new Matrix<IssmPDouble>(index,out.numberoftriangles,3,1.0,SeqMatType);
+        index_matrix=new SeqMat<IssmPDouble>(index,out.numberoftriangles,3,1.0);
         *pindex=index_matrix;
         
-        segments_matrix=new Matrix<IssmPDouble>(segments,out.numberofsegments,3,1.0,SeqMatType);
+        segments_matrix=new SeqMat<IssmPDouble>(segments,out.numberofsegments,3,1.0);
         *psegments=segments_matrix;
 
-        *px=new Vector<IssmPDouble>(x,out.numberofpoints,SeqMatType);
-        *py=new Vector<IssmPDouble>(y,out.numberofpoints,SeqMatType);
-        *psegmentmarkerlist=new Vector<IssmPDouble>(segmentmarkerlist,out.numberofsegments,SeqMatType);
+        *px=new SeqVec<IssmPDouble>(x,out.numberofpoints);
+        *py=new SeqVec<IssmPDouble>(y,out.numberofpoints);
+        *psegmentmarkerlist=new SeqVec<IssmPDouble>(segmentmarkerlist,out.numberofsegments);
 }

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.h

@@ -11 +11 @@
 
 /* local prototypes: */
-void TriMeshx(Matrix<IssmPDouble>** pindex,Vector<IssmPDouble>** px,Vector<IssmPDouble>** py,Matrix<IssmPDouble>** psegments,Vector<IssmPDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area);
+void TriMeshx(SeqMat<IssmPDouble>** pindex,SeqVec<IssmPDouble>** px,SeqVec<IssmPDouble>** py,SeqMat<IssmPDouble>** psegments,SeqVec<IssmPDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area);
 
 #endif  /* _TRIMESHX_H */