Changeset 4166 for issm/trunk/src/c/io

Timestamp:

06/23/10 12:23:55 (15 years ago)

Author:

Eric.Larour

Message:

No more DofVec. New outputs from external results, in matlab form. Still have to handle the time and step

Location:

issm/trunk/src/c/io

Files:

• WriteData.cpp (modified) (1 diff)
• io.h (modified) (1 diff)

issm/trunk/src/c/io/WriteData.cpp

@@ -97 +97 @@
         *pdataref=dataref;
 
-}
-/*}}}*/
-/*FUNCTION WriteData(mxArray** pdataref,DofVec* dofvec){{{1*/
-void WriteData(mxArray** pdataref,DofVec* dofvec){
-        
-        mxArray* mxvector=NULL;
-        mxArray* structdataref=NULL;
-        mxArray* dataref=NULL;
-
-        int nfields=4;
-        const   char*   fnames[nfields];
-        mwSize          onebyone[2] = {1,1};
-        mwSize          ndim=2;
-
-        fnames[0] = "name";
-        fnames[1] = "numdofs";
-        fnames[2] = "numentries";
-        fnames[3] = "vector";
-        
-        if(dofvec){
-                
-                /*call toolkit routine: */
-                if(dofvec->vector)PetscVectorToMatlabVector(&mxvector,dofvec->vector);
-                else mxvector=mxCreateDoubleMatrix(0,0,mxREAL);
-
-                /*use the mxvector to create a dofvec object: */
-                structdataref=mxCreateStructArray( ndim,onebyone,nfields,fnames);
-        
-                mxSetField( structdataref, 0, "name",mxCreateString(dofvec->name));
-                mxSetField( structdataref, 0, "numdofs",mxCreateDoubleScalar(dofvec->numdofs));
-                mxSetField( structdataref, 0, "numentries",mxCreateDoubleScalar(dofvec->numentries));
-                mxSetField( structdataref, 0, "vector",mxvector);
-
-
-                /*transform structure into dofvec class: */
-                mexCallMATLAB( 1, &dataref, 1, &structdataref, "dofvec");
-        }
-        else{
-                dataref = mxCreateDoubleMatrix(0,0,mxREAL);
-        }
-        *pdataref=dataref;
 }
 /*}}}*/

issm/trunk/src/c/io/io.h

@@ -25 +25 @@
 void WriteData(mxArray** pdataref,double scalar);
 void WriteData(mxArray** pdataref,char* string);
-void WriteData(mxArray** pdataref,DofVec* vector);
 void WriteData(mxArray** pdataref,BamgMesh* bm);
 void WriteData(mxArray** pdataref,BamgGeom* bg);