Changeset 13638

Timestamp:

10/12/12 11:33:30 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added WriteData for riftstruct

Location:

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

Files:

• WriteMatlabData.cpp (modified) (2 diffs)
• matlabio.h (modified) (2 diffs)

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

@@ -292 +292 @@
 }
 /*}}}*/
+/*FUNCTION WriteData(mxArray** pdataref,RiftStruct* riftstruct){{{*/
+void WriteData(mxArray** pdataref,RiftStruct* riftstruct){
+
+        /*Intermediary*/
+        int         i;
+        mxArray    *dataref           = NULL;
+        const int   numfields         = 10;
+        const char *fnames[numfields];
+        mwSize      ndim              = 2;
+        mwSize      dimensions[2]     = {1,1};
+
+        /*Initialize field names*/
+        i=0;
+        fnames[i++] = "numsegs";
+        fnames[i++] = "segments";
+        fnames[i++] = "pairs";
+        fnames[i++] = "tips";
+        fnames[i++] = "penaltypairs";
+        fnames[i++] = "fill";
+        fnames[i++] = "friction";
+        fnames[i++] = "fraction";
+        fnames[i++] = "fractionincrement";
+        fnames[i++] = "state";
+        _assert_(i==numfields);
+
+        /*Initialize matlab structure of dimension numrifts*/
+        dimensions[0]=riftstruct->numrifts;
+        dataref=mxCreateStructArray(ndim,dimensions,numfields,fnames);
+
+        /*set each matlab each field*/
+        for(int i=0;i<riftstruct->numrifts;i++){
+                SetStructureFieldi(dataref,i,"numsegs"          ,riftstruct->riftsnumsegments[i]);
+                SetStructureFieldi(dataref,i,"segments"         ,riftstruct->riftsnumsegments[i]    ,3,riftstruct->riftssegments[i]);
+                SetStructureFieldi(dataref,i,"pairs"            ,riftstruct->riftsnumpairs[i]       ,2,riftstruct->riftspairs[i]);
+                SetStructureFieldi(dataref,i,"tips"             ,1                                  ,2,&riftstruct->riftstips[2*i]);
+                SetStructureFieldi(dataref,i,"penaltypairs"     ,riftstruct->riftsnumpenaltypairs[i],7,riftstruct->riftspenaltypairs[i]);
+                SetStructureFieldi(dataref,i,"friction"         ,0);
+                SetStructureFieldi(dataref,i,"fill"             ,IceEnum);
+                SetStructureFieldi(dataref,i,"fraction"         ,0.);
+                SetStructureFieldi(dataref,i,"fractionincrement",0.1);
+                SetStructureFieldi(dataref,i,"state"            ,riftstruct->riftsnumpenaltypairs[i],1,riftstruct->state[i]);
+        }
+
+        /*Assign output*/
+        *pdataref=dataref;
+}
+/*}}}*/
 
 /*Toolkit*/
@@ -306 +353 @@
 }
 /*}}}*/
+/*FUNCTION SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,int M,int N,double* fieldpointer){{{*/
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,int M,int N,double* fieldpointer){
+
+        mxArray* field = NULL;
+
+        /*Convert field*/
+        WriteData(&field,fieldpointer,M,N);
+
+        /*Assign to structure*/
+        mxSetField(dataref,i,fieldname,field);
+}
+/*}}}*/
+/*FUNCTION SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,int field){{{*/
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,int fieldin){
+
+        mxArray* field = NULL;
+
+        /*Convert field*/
+        WriteData(&field,fieldin);
+
+        /*Assign to structure*/
+        mxSetField(dataref,i,fieldname,field);
+}
+/*}}}*/
+/*FUNCTION SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,double field){{{*/
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,double fieldin){
+
+        mxArray* field = NULL;
+
+        /*Convert field*/
+        WriteData(&field,fieldin);
+
+        /*Assign to structure*/
+        mxSetField(dataref,i,fieldname,field);
+}
+/*}}}*/

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

@@ -29 +29 @@
 void WriteData(mxArray** pdataref,BamgGeom* bamggeom);
 void WriteData(mxArray** pdataref,BamgMesh* bamgmesh);
+void WriteData(mxArray** pdataref,RiftStruct* riftstruct);
 
 void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref);
@@ -62 +63 @@
 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, const char* field);
 void SetStructureField(mxArray* dataref,const char* fieldname,int fieldrows,int fieldcols,double* fieldpointer);
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,int fieldrows,int fieldcols,double* fieldpointer);
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,int field);
+void SetStructureFieldi(mxArray* dataref,int i,const char* fieldname,double field);
 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* THISFUNCTION, void (*function)( void ));