Changeset 8910
- Timestamp:
- 07/11/11 16:41:47 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 11 added
- 10 deleted
- 79 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Container/Options.cpp
r8565 r8910 42 42 if (!mxIsClass(prhs[i],"char")) _error_("Argument %d must be name of option.",i+1); 43 43 44 Fetch Data(&name,prhs[i]);44 FetchMatlabData(&name,prhs[i]); 45 45 if (i+1 == nrhs) _error_("Argument %d must exist and be value of option \"%s\".",i+2,name); 46 46 -
issm/trunk/src/c/Makefile.am
r8906 r8910 402 402 ./toolkits.h\ 403 403 ./io/io.h\ 404 ./io/FetchData.cpp\ 405 ./io/WriteData.cpp\ 406 ./io/IoModelFetchData.cpp\ 407 ./io/WriteParams.cpp\ 408 ./io/FetchParams.cpp\ 409 ./io/OptionParse.cpp\ 410 ./io/pfopen.cpp\ 411 ./io/pfclose.cpp\ 404 ./io/Disk/diskio.h\ 405 ./io/Disk/IoModelFetchData.cpp\ 406 ./io/Disk/pfopen.cpp\ 407 ./io/Disk/pfclose.cpp\ 408 ./io/Disk/FetchData.cpp\ 409 ./io/Matlab/matlabio.h\ 410 ./io/Matlab/WriteMatlabData.cpp\ 411 ./io/Matlab/FetchMatlabData.cpp\ 412 ./io/Matlab/OptionParse.cpp\ 412 413 ./EnumDefinitions/EnumDefinitions.h\ 413 414 ./EnumDefinitions/EnumToModelField.cpp\ … … 1075 1076 ./toolkits.h\ 1076 1077 ./io/io.h\ 1077 ./io/FetchData.cpp\ 1078 ./io/WriteData.cpp\ 1079 ./io/IoModelFetchData.cpp\ 1080 ./io/WriteParams.cpp\ 1081 ./io/pfopen.cpp\ 1082 ./io/pfclose.cpp\ 1078 ./io/Disk/diskio.h\ 1079 ./io/Disk/IoModelFetchData.cpp\ 1080 ./io/Disk/pfopen.cpp\ 1081 ./io/Disk/pfclose.cpp\ 1082 ./io/Disk/FetchData.cpp\ 1083 ./io/Matlab/matlabio.h\ 1084 ./io/Matlab/WriteMatlabData.cpp\ 1085 ./io/Matlab/FetchMatlabData.cpp\ 1086 ./io/Matlab/OptionParse.cpp\ 1083 1087 ./EnumDefinitions/EnumDefinitions.h\ 1084 1088 ./EnumDefinitions/EnumToModelField.cpp\ -
issm/trunk/src/c/io/io.h
r8906 r8910 6 6 #define _IO_H_ 7 7 8 #include "../objects/objects.h" 9 #include "../Container/Container.h" 10 #include "../include/include.h" 8 #include "./Disk/diskio.h" 9 #include "./Matlab/matlabio.h" 11 10 12 class DataSet;13 class Parameters;14 15 FILE* pfopen(char* filename,char* format);16 void pfclose(FILE* fid,char* filename);17 18 void FetchData(double** pmatrix, int* pM,int* pN,FILE* fid);19 void FetchData(char** pstring,FILE* fid);20 void FetchData(double* pscalar,FILE* fid);21 void FetchData(int* pinteger,FILE* fid);22 23 void IoModelFetchData(double** pmatrix,int* pM,int* pN,FILE* model_handle,char* data_name);24 void IoModelFetchData(char** pstring,FILE* model_handle,char* data_name);25 void IoModelFetchData(double* pscalar,FILE* model_handle,char* data_name);26 void IoModelFetchData(int* pinteger,FILE* model_handle,char* data_name);27 FILE* SetFilePointerToData(FILE* model_handle,char* data_name);28 29 #ifdef _SERIAL_30 void WriteData(mxArray** pdataref,DataSet* dataset);31 void WriteData(mxArray** pdataref,Mat matrix);32 void WriteData(mxArray** pdataref,double* matrix, int M,int N);33 void WriteData(mxArray** pdataref,Vec vector);34 void WriteData(mxArray** pdataref,double* vector, int M);35 void WriteData(mxArray** pdataref,int integer);36 void WriteData(mxArray** pdataref,bool boolean);37 void WriteData(mxArray** pdataref,double scalar);38 void WriteData(mxArray** pdataref,char* string);39 void WriteNodeSets(DataHandle* pdataref,NodeSets* nodesets);40 void WriteParams(DataHandle* pdataref,Parameters* parameters);41 42 void FetchData(DataSet** pdataset,const mxArray* dataref);43 void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref);44 void FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref);45 void FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref);46 void FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref);47 void FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref);48 void FetchData(Mat* pmatrix,const mxArray* dataref);49 void FetchData(int** pvector,int* pM,const mxArray* dataref);50 void FetchData(float** pvector,int* pM,const mxArray* dataref);51 void FetchData(double** pvector,int* pM,const mxArray* dataref);52 void FetchData(bool** pvector,int* pM,const mxArray* dataref);53 void FetchData(Vec* pvector,const mxArray* dataref);54 void FetchData(char** pstring,const mxArray* dataref);55 void FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref);56 void FetchData(double* pscalar,const mxArray* dataref);57 void FetchData(int* pinteger,const mxArray* dataref);58 void FetchData(bool* pbool,const mxArray* dataref);59 void FetchNodeSets(NodeSets** pnodesets,ConstDataHandle dataref);60 void FetchParams(Parameters** pparameters, DataHandle dataref);61 62 Option* OptionParse(char* name, const mxArray* prhs[]);63 OptionDouble* OptionDoubleParse( char* name, const mxArray* prhs[]);64 OptionLogical* OptionLogicalParse( char* name, const mxArray* prhs[]);65 OptionChar* OptionCharParse( char* name, const mxArray* prhs[]);66 OptionStruct* OptionStructParse( char* name, const mxArray* prhs[]);67 OptionCell* OptionCellParse( char* name, const mxArray* prhs[]);68 #endif69 11 #endif /* _IO_H_ */ -
issm/trunk/src/c/objects/Bamg/BamgGeom.cpp
r7249 r8910 22 22 BamgGeom::BamgGeom(mxArray* matlab_struct){ 23 23 24 Fetch Data(&this->Vertices, &this->VerticesSize[0], &this->VerticesSize[1], mxGetAssignedField(matlab_struct,0,"Vertices"));25 Fetch Data(&this->Edges, &this->EdgesSize[0], &this->EdgesSize[1], mxGetAssignedField(matlab_struct,0,"Edges"));24 FetchMatlabData(&this->Vertices, &this->VerticesSize[0], &this->VerticesSize[1], mxGetAssignedField(matlab_struct,0,"Vertices")); 25 FetchMatlabData(&this->Edges, &this->EdgesSize[0], &this->EdgesSize[1], mxGetAssignedField(matlab_struct,0,"Edges")); 26 26 this->TangentAtEdgesSize[0]=0, this->TangentAtEdgesSize[1]=0; this->TangentAtEdges=NULL; 27 Fetch Data(&this->Corners, &this->CornersSize[0], &this->CornersSize[1], mxGetAssignedField(matlab_struct,0,"Corners"));28 Fetch Data(&this->RequiredVertices,&this->RequiredVerticesSize[0],&this->RequiredVerticesSize[1],mxGetAssignedField(matlab_struct,0,"RequiredVertices"));29 Fetch Data(&this->RequiredEdges, &this->RequiredEdgesSize[0], &this->RequiredEdgesSize[1], mxGetAssignedField(matlab_struct,0,"RequiredEdges"));30 Fetch Data(&this->CrackedEdges, &this->CrackedEdgesSize[0], &this->CrackedEdgesSize[1], mxGetAssignedField(matlab_struct,0,"CrackedEdges"));31 Fetch Data(&this->SubDomains, &this->SubDomainsSize[0], &this->SubDomainsSize[1], mxGetAssignedField(matlab_struct,0,"SubDomains"));27 FetchMatlabData(&this->Corners, &this->CornersSize[0], &this->CornersSize[1], mxGetAssignedField(matlab_struct,0,"Corners")); 28 FetchMatlabData(&this->RequiredVertices,&this->RequiredVerticesSize[0],&this->RequiredVerticesSize[1],mxGetAssignedField(matlab_struct,0,"RequiredVertices")); 29 FetchMatlabData(&this->RequiredEdges, &this->RequiredEdgesSize[0], &this->RequiredEdgesSize[1], mxGetAssignedField(matlab_struct,0,"RequiredEdges")); 30 FetchMatlabData(&this->CrackedEdges, &this->CrackedEdgesSize[0], &this->CrackedEdgesSize[1], mxGetAssignedField(matlab_struct,0,"CrackedEdges")); 31 FetchMatlabData(&this->SubDomains, &this->SubDomainsSize[0], &this->SubDomainsSize[1], mxGetAssignedField(matlab_struct,0,"SubDomains")); 32 32 33 33 } -
issm/trunk/src/c/objects/Bamg/BamgMesh.cpp
r7249 r8910 37 37 int lines,cols; 38 38 39 Fetch Data(&this->Vertices, &this->VerticesSize[0], &this->VerticesSize[1], mxGetAssignedField(matlab_struct,0,"Vertices"));40 Fetch Data(&this->Edges, &this->EdgesSize[0], &this->EdgesSize[1], mxGetAssignedField(matlab_struct,0,"Edges"));41 Fetch Data(&this->Triangles, &this->TrianglesSize[0], &this->TrianglesSize[1], mxGetAssignedField(matlab_struct,0,"Triangles"));39 FetchMatlabData(&this->Vertices, &this->VerticesSize[0], &this->VerticesSize[1], mxGetAssignedField(matlab_struct,0,"Vertices")); 40 FetchMatlabData(&this->Edges, &this->EdgesSize[0], &this->EdgesSize[1], mxGetAssignedField(matlab_struct,0,"Edges")); 41 FetchMatlabData(&this->Triangles, &this->TrianglesSize[0], &this->TrianglesSize[1], mxGetAssignedField(matlab_struct,0,"Triangles")); 42 42 this->QuadrilateralsSize[0]=0, this->QuadrilateralsSize[1]=0; this->Quadrilaterals=NULL; 43 43 … … 45 45 this->SubDomainsFromGeomSize[0]=0, this->SubDomainsFromGeomSize[1]=0; this->SubDomainsFromGeom=NULL; 46 46 this->CrackedVerticesSize[0]=0, this->CrackedVerticesSize[1]=0; this->CrackedVertices=NULL; 47 Fetch Data(&this->CrackedEdges, &this->CrackedEdgesSize[0], &this->CrackedEdgesSize[1], mxGetAssignedField(matlab_struct,0,"CrackedEdges"));47 FetchMatlabData(&this->CrackedEdges, &this->CrackedEdgesSize[0], &this->CrackedEdgesSize[1], mxGetAssignedField(matlab_struct,0,"CrackedEdges")); 48 48 49 Fetch Data(&this->VerticesOnGeomEdge, &this->VerticesOnGeomEdgeSize[0], &this->VerticesOnGeomEdgeSize[1], mxGetAssignedField(matlab_struct,0,"VerticesOnGeomEdge"));50 Fetch Data(&this->VerticesOnGeomVertex,&this->VerticesOnGeomVertexSize[0],&this->VerticesOnGeomVertexSize[1],mxGetAssignedField(matlab_struct,0,"VerticesOnGeomVertex"));51 Fetch Data(&this->EdgesOnGeomEdge, &this->EdgesOnGeomEdgeSize[0], &this->EdgesOnGeomEdgeSize[1], mxGetAssignedField(matlab_struct,0,"EdgesOnGeomEdge"));49 FetchMatlabData(&this->VerticesOnGeomEdge, &this->VerticesOnGeomEdgeSize[0], &this->VerticesOnGeomEdgeSize[1], mxGetAssignedField(matlab_struct,0,"VerticesOnGeomEdge")); 50 FetchMatlabData(&this->VerticesOnGeomVertex,&this->VerticesOnGeomVertexSize[0],&this->VerticesOnGeomVertexSize[1],mxGetAssignedField(matlab_struct,0,"VerticesOnGeomVertex")); 51 FetchMatlabData(&this->EdgesOnGeomEdge, &this->EdgesOnGeomEdgeSize[0], &this->EdgesOnGeomEdgeSize[1], mxGetAssignedField(matlab_struct,0,"EdgesOnGeomEdge")); 52 52 53 53 this->IssmEdgesSize[0]=0, this->IssmEdgesSize[1]=0; this->IssmEdges=NULL; 54 Fetch Data(&this->IssmSegments, &this->IssmSegmentsSize[0], &this->IssmSegmentsSize[1], mxGetAssignedField(matlab_struct,0,"IssmSegments"));54 FetchMatlabData(&this->IssmSegments, &this->IssmSegmentsSize[0], &this->IssmSegmentsSize[1], mxGetAssignedField(matlab_struct,0,"IssmSegments")); 55 55 56 56 this->ElementConnectivitySize[0]=0, this->ElementConnectivitySize[1]=0; this->ElementConnectivity=NULL; -
issm/trunk/src/c/objects/Bamg/BamgOpts.cpp
r6412 r8910 45 45 BamgOpts::BamgOpts(mxArray* matlab_struct){ 46 46 47 Fetch Data(&this->anisomax,mxGetField(matlab_struct,0,"anisomax"));48 Fetch Data(&this->cutoff,mxGetField(matlab_struct,0,"cutoff"));49 Fetch Data(&this->coeff,mxGetField(matlab_struct,0,"coeff"));50 Fetch Data(&this->errg,mxGetField(matlab_struct,0,"errg"));51 Fetch Data(&this->gradation,mxGetField(matlab_struct,0,"gradation"));52 Fetch Data(&this->Hessiantype,mxGetField(matlab_struct,0,"Hessiantype"));53 Fetch Data(&this->MaxCornerAngle,mxGetField(matlab_struct,0,"MaxCornerAngle"));54 Fetch Data(&this->maxnbv,mxGetField(matlab_struct,0,"maxnbv"));55 Fetch Data(&this->maxsubdiv,mxGetField(matlab_struct,0,"maxsubdiv"));56 Fetch Data(&this->Metrictype,mxGetField(matlab_struct,0,"Metrictype"));57 Fetch Data(&this->nbjacobi,mxGetField(matlab_struct,0,"nbjacobi"));58 Fetch Data(&this->nbsmooth,mxGetField(matlab_struct,0,"nbsmooth"));59 Fetch Data(&this->omega,mxGetField(matlab_struct,0,"omega"));60 Fetch Data(&this->power,mxGetField(matlab_struct,0,"power"));61 Fetch Data(&this->verbose,mxGetField(matlab_struct,0,"verbose"));47 FetchMatlabData(&this->anisomax,mxGetField(matlab_struct,0,"anisomax")); 48 FetchMatlabData(&this->cutoff,mxGetField(matlab_struct,0,"cutoff")); 49 FetchMatlabData(&this->coeff,mxGetField(matlab_struct,0,"coeff")); 50 FetchMatlabData(&this->errg,mxGetField(matlab_struct,0,"errg")); 51 FetchMatlabData(&this->gradation,mxGetField(matlab_struct,0,"gradation")); 52 FetchMatlabData(&this->Hessiantype,mxGetField(matlab_struct,0,"Hessiantype")); 53 FetchMatlabData(&this->MaxCornerAngle,mxGetField(matlab_struct,0,"MaxCornerAngle")); 54 FetchMatlabData(&this->maxnbv,mxGetField(matlab_struct,0,"maxnbv")); 55 FetchMatlabData(&this->maxsubdiv,mxGetField(matlab_struct,0,"maxsubdiv")); 56 FetchMatlabData(&this->Metrictype,mxGetField(matlab_struct,0,"Metrictype")); 57 FetchMatlabData(&this->nbjacobi,mxGetField(matlab_struct,0,"nbjacobi")); 58 FetchMatlabData(&this->nbsmooth,mxGetField(matlab_struct,0,"nbsmooth")); 59 FetchMatlabData(&this->omega,mxGetField(matlab_struct,0,"omega")); 60 FetchMatlabData(&this->power,mxGetField(matlab_struct,0,"power")); 61 FetchMatlabData(&this->verbose,mxGetField(matlab_struct,0,"verbose")); 62 62 63 Fetch Data(&this->Crack,mxGetField(matlab_struct,0,"Crack"));64 Fetch Data(&this->geometricalmetric,mxGetField(matlab_struct,0,"geometricalmetric"));65 Fetch Data(&this->KeepVertices,mxGetField(matlab_struct,0,"KeepVertices"));66 Fetch Data(&this->splitcorners,mxGetField(matlab_struct,0,"splitcorners"));63 FetchMatlabData(&this->Crack,mxGetField(matlab_struct,0,"Crack")); 64 FetchMatlabData(&this->geometricalmetric,mxGetField(matlab_struct,0,"geometricalmetric")); 65 FetchMatlabData(&this->KeepVertices,mxGetField(matlab_struct,0,"KeepVertices")); 66 FetchMatlabData(&this->splitcorners,mxGetField(matlab_struct,0,"splitcorners")); 67 67 68 Fetch Data(&this->hmin,mxGetField(matlab_struct,0,"hmin"));69 Fetch Data(&this->hmax,mxGetField(matlab_struct,0,"hmax"));70 Fetch Data(&this->hminVertices,&this->hminVerticesSize[0],&this->hminVerticesSize[1],mxGetField(matlab_struct,0,"hminVertices"));71 Fetch Data(&this->hmaxVertices,&this->hmaxVerticesSize[0],&this->hmaxVerticesSize[1],mxGetField(matlab_struct,0,"hmaxVertices"));72 Fetch Data(&this->hVertices,&this->hVerticesSize[0],&this->hVerticesSize[1],mxGetField(matlab_struct,0,"hVertices"));73 Fetch Data(&this->metric,&this->metricSize[0],&this->metricSize[1],mxGetField(matlab_struct,0,"metric"));74 Fetch Data(&this->field,&this->fieldSize[0],&this->fieldSize[1],mxGetField(matlab_struct,0,"field"));75 Fetch Data(&this->err,&this->errSize[0],&this->errSize[1],mxGetField(matlab_struct,0,"err"));68 FetchMatlabData(&this->hmin,mxGetField(matlab_struct,0,"hmin")); 69 FetchMatlabData(&this->hmax,mxGetField(matlab_struct,0,"hmax")); 70 FetchMatlabData(&this->hminVertices,&this->hminVerticesSize[0],&this->hminVerticesSize[1],mxGetField(matlab_struct,0,"hminVertices")); 71 FetchMatlabData(&this->hmaxVertices,&this->hmaxVerticesSize[0],&this->hmaxVerticesSize[1],mxGetField(matlab_struct,0,"hmaxVertices")); 72 FetchMatlabData(&this->hVertices,&this->hVerticesSize[0],&this->hVerticesSize[1],mxGetField(matlab_struct,0,"hVertices")); 73 FetchMatlabData(&this->metric,&this->metricSize[0],&this->metricSize[1],mxGetField(matlab_struct,0,"metric")); 74 FetchMatlabData(&this->field,&this->fieldSize[0],&this->fieldSize[1],mxGetField(matlab_struct,0,"field")); 75 FetchMatlabData(&this->err,&this->errSize[0],&this->errSize[1],mxGetField(matlab_struct,0,"err")); 76 76 77 77 /*Additional checks*/ -
issm/trunk/src/mex/AddExternalResult/AddExternalResult.cpp
r6412 r8910 19 19 20 20 /*Input datasets: */ 21 Fetch Data(&results,RESULTS);22 Fetch Data(&type,TYPE);23 Fetch Data(&value,&nraws,&ncols,VALUE);21 FetchMatlabData(&results,RESULTS); 22 FetchMatlabData(&type,TYPE); 23 FetchMatlabData(&value,&nraws,&ncols,VALUE); 24 24 25 25 /*results might be NILL, allocate: */ … … 38 38 39 39 /*write output datasets: */ 40 Write Data(RESULTSOUT,results);40 WriteMatlabData(RESULTSOUT,results); 41 41 42 42 /*Free ressources: */ -
issm/trunk/src/mex/AverageFilter/AverageFilter.cpp
r4453 r8910 37 37 38 38 /*Fetch data: */ 39 Fetch Data(&imagein,&imagein_rows,&imagein_cols,IMAGEIN);40 Fetch Data(&smooth,SMOOTH);39 FetchMatlabData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN); 40 FetchMatlabData(&smooth,SMOOTH); 41 41 42 42 /*Run core hole filler routine: */ … … 44 44 45 45 /* output: */ 46 Write Data(IMAGEOUT,imageout,imagein_rows,imagein_cols);46 WriteMatlabData(IMAGEOUT,imageout,imagein_rows,imagein_cols); 47 47 48 48 /*end module: */ -
issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.cpp
r6412 r8910 38 38 /*Input datasets: */ 39 39 if (verbose) printf("Fetching inputs\n"); 40 Fetch Data(&index,&nels,&index_rows,INDEXHANDLE);41 Fetch Data(&x,&nods,&x_cols,XHANDLE);42 Fetch Data(&y,&y_rows,&y_cols,YHANDLE);40 FetchMatlabData(&index,&nels,&index_rows,INDEXHANDLE); 41 FetchMatlabData(&x,&nods,&x_cols,XHANDLE); 42 FetchMatlabData(&y,&y_rows,&y_cols,YHANDLE); 43 43 44 44 /*Check inputs*/ -
issm/trunk/src/mex/Chaco/Chaco.cpp
r6412 r8910 74 74 75 75 /*Fetch rest of data: */ 76 Fetch Data(&vwgts,&nterms,VWGTS_IN);76 FetchMatlabData(&vwgts,&nterms,VWGTS_IN); 77 77 78 Fetch Data(&x,&nterms,X_IN);79 Fetch Data(&y,&nterms,Y_IN);80 Fetch Data(&z,&nterms,Z_IN);78 FetchMatlabData(&x,&nterms,X_IN); 79 FetchMatlabData(&y,&nterms,Y_IN); 80 FetchMatlabData(&z,&nterms,Z_IN); 81 81 82 Fetch Data(&in_options,&nterms,OPTNS_IN);82 FetchMatlabData(&in_options,&nterms,OPTNS_IN); 83 83 for (i=0;i<(nterms<10?nterms:10);i++) options[i]=in_options[i]; //copy in_options into default options 84 84 85 Fetch Data(&npart,NPARTS_IN);85 FetchMatlabData(&npart,NPARTS_IN); 86 86 nparts=(int*)xmalloc(sizeof(int)); nparts[0]=npart; //weird Chacox interface ain't it? 87 87 88 Fetch Data(&goal,&nterms,GOAL_IN);88 FetchMatlabData(&goal,&nterms,GOAL_IN); 89 89 90 90 /*Some debugging print: {{{*/ … … 120 120 doubleassignment=(double*)xmalloc(nvtxs*sizeof(double)); 121 121 for (i=0;i<nvtxs;i++) doubleassignment[i]=(double)assignment[i]; 122 Write Data(ASSGN_OUT,doubleassignment,nvtxs);122 WriteMatlabData(ASSGN_OUT,doubleassignment,nvtxs); 123 123 124 124 /*Free ressources:*/ -
issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.cpp
r4573 r8910 26 26 27 27 /*Input datasets: */ 28 Fetch Data((DataSet**)&elements,ELEMENTS);29 Fetch Data((DataSet**)&nodes,NODES);30 Fetch Data((DataSet**)&vertices,VERTICES);31 Fetch Data((DataSet**)&loads,LOADS);32 Fetch Data((DataSet**)&materials,MATERIALS);33 Fetch Params(¶meters,PARAMETERS);28 FetchMatlabData((DataSet**)&elements,ELEMENTS); 29 FetchMatlabData((DataSet**)&nodes,NODES); 30 FetchMatlabData((DataSet**)&vertices,VERTICES); 31 FetchMatlabData((DataSet**)&loads,LOADS); 32 FetchMatlabData((DataSet**)&materials,MATERIALS); 33 FetchMatlabData(¶meters,PARAMETERS); 34 34 35 35 /*configure: */ … … 42 42 43 43 /*write output datasets: */ 44 Write Data(SIGMA,sigma_g);44 WriteMatlabData(SIGMA,sigma_g); 45 45 46 46 /*Free ressources: */ -
issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.cpp
r6412 r8910 24 24 25 25 /*Input datasets: */ 26 Fetch Data((DataSet**)&elements,ELEMENTSIN);27 Fetch Data((DataSet**)&loads,LOADSIN);28 Fetch Data((DataSet**)&nodes,NODES);29 Fetch Data((DataSet**)&vertices,VERTICES);30 Fetch Data((DataSet**)&materials,MATERIALS);31 Fetch Params(¶meters,PARAMETERS);26 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 27 FetchMatlabData((DataSet**)&loads,LOADSIN); 28 FetchMatlabData((DataSet**)&nodes,NODES); 29 FetchMatlabData((DataSet**)&vertices,VERTICES); 30 FetchMatlabData((DataSet**)&materials,MATERIALS); 31 FetchMatlabData(¶meters,PARAMETERS); 32 32 33 33 /*!Configure objects:*/ … … 35 35 36 36 /*write output datasets: */ 37 Write Data(ELEMENTS,elements);38 Write Data(LOADS,loads);39 Write Data(NODESOUT,nodes);40 Write Params(PARAMETERSOUT,parameters);37 WriteMatlabData(ELEMENTS,elements); 38 WriteMatlabData(LOADS,loads); 39 WriteMatlabData(NODESOUT,nodes); 40 WriteMatlabData(PARAMETERSOUT,parameters); 41 41 42 42 /*Free ressources: */ -
issm/trunk/src/mex/ConstraintsState/ConstraintsState.cpp
r8404 r8910 26 26 27 27 /*Input datasets: */ 28 Fetch Data((DataSet**)&elements,ELEMENTS);29 Fetch Data((DataSet**)&nodes,NODES);30 Fetch Data((DataSet**)&vertices,VERTICES);31 Fetch Data((DataSet**)&loads,LOADSIN);32 Fetch Data((DataSet**)&materials,MATERIALS);33 Fetch Params(¶meters,PARAMETERS);28 FetchMatlabData((DataSet**)&elements,ELEMENTS); 29 FetchMatlabData((DataSet**)&nodes,NODES); 30 FetchMatlabData((DataSet**)&vertices,VERTICES); 31 FetchMatlabData((DataSet**)&loads,LOADSIN); 32 FetchMatlabData((DataSet**)&materials,MATERIALS); 33 FetchMatlabData(¶meters,PARAMETERS); 34 34 35 35 /*configure: */ … … 42 42 43 43 /*write output datasets: */ 44 Write Data(LOADS,loads);45 Write Data(CONVERGED,converged);46 Write Data(NUMUNSTABLECONSTRAINTS,num_unstable_constraints);44 WriteMatlabData(LOADS,loads); 45 WriteMatlabData(CONVERGED,converged); 46 WriteMatlabData(NUMUNSTABLECONSTRAINTS,num_unstable_constraints); 47 47 48 48 /*Free ressources: */ -
issm/trunk/src/mex/ContourToMesh/ContourToMesh.cpp
r8306 r8910 58 58 59 59 /*Fetch inputs: */ 60 Fetch Data(&index,&nel,NULL,INDEXHANDLE);61 Fetch Data(&x,&nods,NULL,XHANDLE);62 Fetch Data(&y,NULL,NULL,YHANDLE);63 Fetch Data(&edgevalue,EDGEVALUEHANDLE);60 FetchMatlabData(&index,&nel,NULL,INDEXHANDLE); 61 FetchMatlabData(&x,&nods,NULL,XHANDLE); 62 FetchMatlabData(&y,NULL,NULL,YHANDLE); 63 FetchMatlabData(&edgevalue,EDGEVALUEHANDLE); 64 64 65 65 //Fetch contours … … 78 78 79 79 /*Fetch interptype: */ 80 Fetch Data(&interptype,INTERPTYPEHANDLE);80 FetchMatlabData(&interptype,INTERPTYPEHANDLE); 81 81 82 82 /* Debugging of contours :{{{1*/ … … 96 96 /* output: */ 97 97 if (strcmp(interptype,"node")==0){ 98 Write Data(PLHS0,in_nod);98 WriteMatlabData(PLHS0,in_nod); 99 99 } 100 100 else if (strcmp(interptype,"element")==0){ 101 Write Data(PLHS0,in_elem);101 WriteMatlabData(PLHS0,in_elem); 102 102 } 103 103 else if (strcmp(interptype,"element and node")==0){ 104 Write Data(PLHS0,in_nod);105 Write Data(PLHS1,in_elem);104 WriteMatlabData(PLHS0,in_nod); 105 WriteMatlabData(PLHS1,in_elem); 106 106 } 107 107 else _error_(" wrong interpolation type"); -
issm/trunk/src/mex/ContourToNodes/ContourToNodes.cpp
r8306 r8910 52 52 53 53 /*Fetch inputs: */ 54 Fetch Data(&x,&nods,NULL,XHANDLE);55 Fetch Data(&y,NULL,NULL,YHANDLE);56 Fetch Data(&edgevalue,EDGEVALUEHANDLE);54 FetchMatlabData(&x,&nods,NULL,XHANDLE); 55 FetchMatlabData(&y,NULL,NULL,YHANDLE); 56 FetchMatlabData(&edgevalue,EDGEVALUEHANDLE); 57 57 58 58 //Fetch contours … … 95 95 96 96 /* output: */ 97 Write Data(FLAGS,flags);97 WriteMatlabData(FLAGS,flags); 98 98 99 99 /*end module: */ -
issm/trunk/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp
r8595 r8910 26 26 27 27 /*Input datasets: */ 28 Fetch Data((DataSet**)&elements,ELEMENTSIN);29 Fetch Data((DataSet**)&nodes,NODES);30 Fetch Data((DataSet**)&vertices,VERTICES);31 Fetch Data((DataSet**)&loads,LOADSIN);32 Fetch Data((DataSet**)&materials,MATERIALS);33 Fetch Params(¶meters,PARAMETERS);34 Fetch Data(&control_type,CONTROLTYPE);28 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 29 FetchMatlabData((DataSet**)&nodes,NODES); 30 FetchMatlabData((DataSet**)&vertices,VERTICES); 31 FetchMatlabData((DataSet**)&loads,LOADSIN); 32 FetchMatlabData((DataSet**)&materials,MATERIALS); 33 FetchMatlabData(¶meters,PARAMETERS); 34 FetchMatlabData(&control_type,CONTROLTYPE); 35 35 36 36 /*configure: */ … … 44 44 45 45 /*write output datasets: */ 46 Write Data(GRADIENT,gradient);46 WriteMatlabData(GRADIENT,gradient); 47 47 48 48 /*Free ressources: */ -
issm/trunk/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp
r6412 r8910 24 24 25 25 /*Input datasets: */ 26 Fetch Data((DataSet**)&elements,ELEMENTSIN);27 Fetch Data((DataSet**)&nodes,NODESIN);28 Fetch Data((DataSet**)&vertices,VERTICESIN);29 Fetch Data((DataSet**)&loads,LOADSIN);30 Fetch Data((DataSet**)&materials,MATERIALSIN);31 Fetch Params(¶meters,PARAMETERSIN);32 Fetch Data(&control_type,CONTROLTYPE);33 Fetch Data(&scaling_factor,SCALE);26 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 27 FetchMatlabData((DataSet**)&nodes,NODESIN); 28 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 29 FetchMatlabData((DataSet**)&loads,LOADSIN); 30 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 31 FetchMatlabData(¶meters,PARAMETERSIN); 32 FetchMatlabData(&control_type,CONTROLTYPE); 33 FetchMatlabData(&scaling_factor,SCALE); 34 34 35 35 /*configure: */ … … 42 42 43 43 /*write output datasets: */ 44 Write Data(ELEMENTS,elements);45 Write Data(NODES,nodes);46 Write Data(VERTICES,vertices);47 Write Data(LOADS,loads);48 Write Data(MATERIALS,materials);49 Write Params(PARAMETERS,parameters);44 WriteMatlabData(ELEMENTS,elements); 45 WriteMatlabData(NODES,nodes); 46 WriteMatlabData(VERTICES,vertices); 47 WriteMatlabData(LOADS,loads); 48 WriteMatlabData(MATERIALS,materials); 49 WriteMatlabData(PARAMETERS,parameters); 50 50 51 51 /*Free ressources: */ -
issm/trunk/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp
r6412 r8910 24 24 25 25 /*Input datasets: */ 26 Fetch Data((DataSet**)&elements,ELEMENTSIN);27 Fetch Data((DataSet**)&nodes,NODESIN);28 Fetch Data((DataSet**)&vertices,VERTICESIN);29 Fetch Data((DataSet**)&loads,LOADSIN);30 Fetch Data((DataSet**)&materials,MATERIALSIN);31 Fetch Params(¶meters,PARAMETERSIN);32 Fetch Data(&control_type,CONTROLTYPE);33 Fetch Data(&gradient,NULL,GRADIENT);26 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 27 FetchMatlabData((DataSet**)&nodes,NODESIN); 28 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 29 FetchMatlabData((DataSet**)&loads,LOADSIN); 30 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 31 FetchMatlabData(¶meters,PARAMETERSIN); 32 FetchMatlabData(&control_type,CONTROLTYPE); 33 FetchMatlabData(&gradient,NULL,GRADIENT); 34 34 35 35 /*configure: */ … … 42 42 43 43 /*write output datasets: */ 44 Write Data(ELEMENTS,elements);45 Write Data(NODES,nodes);46 Write Data(VERTICES,vertices);47 Write Data(LOADS,loads);48 Write Data(MATERIALS,materials);49 Write Params(PARAMETERS,parameters);44 WriteMatlabData(ELEMENTS,elements); 45 WriteMatlabData(NODES,nodes); 46 WriteMatlabData(VERTICES,vertices); 47 WriteMatlabData(LOADS,loads); 48 WriteMatlabData(MATERIALS,materials); 49 WriteMatlabData(PARAMETERS,parameters); 50 50 51 51 /*Free ressources: */ -
issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp
r8604 r8910 30 30 31 31 /*Input datasets: */ 32 Fetch Data(&function_name,FUNCTIONNAME);33 Fetch Data(&xmin,XMIN);34 Fetch Data(&xmax,XMAX);35 Fetch Data(&tolerance,mxGetField(OPTIONS,0,"TolX"));36 Fetch Data(&maxiter,NULL,NULL,mxGetField(OPTIONS,0,"MaxIter"));32 FetchMatlabData(&function_name,FUNCTIONNAME); 33 FetchMatlabData(&xmin,XMIN); 34 FetchMatlabData(&xmax,XMAX); 35 FetchMatlabData(&tolerance,mxGetField(OPTIONS,0,"TolX")); 36 FetchMatlabData(&maxiter,NULL,NULL,mxGetField(OPTIONS,0,"MaxIter")); 37 37 38 38 /*Parameters: */ 39 Fetch Data(&cm_jump,NULL,NULL,mxGetField(PARAMETERS,0,"CmJump"));40 Fetch Data(&n_value,STEP);39 FetchMatlabData(&cm_jump,NULL,NULL,mxGetField(PARAMETERS,0,"CmJump")); 40 FetchMatlabData(&n_value,STEP); 41 41 42 42 optargs.function_name=function_name; … … 52 52 53 53 /*write output : */ 54 Write Data(SEARCHSCALAR,search_scalar);55 Write Data(MISFIT,J);54 WriteMatlabData(SEARCHSCALAR,search_scalar); 55 WriteMatlabData(MISFIT,J); 56 56 57 57 /*Free ressources: */ -
issm/trunk/src/mex/CostFunction/CostFunction.cpp
r8607 r8910 25 25 26 26 /*Input datasets: */ 27 Fetch Data((DataSet**)&elements,ELEMENTS);28 Fetch Data((DataSet**)&nodes,NODES);29 Fetch Data((DataSet**)&vertices,VERTICES);30 Fetch Data((DataSet**)&loads,LOADS);31 Fetch Data((DataSet**)&materials,MATERIALS);32 Fetch Params(¶meters,PARAMETERS);27 FetchMatlabData((DataSet**)&elements,ELEMENTS); 28 FetchMatlabData((DataSet**)&nodes,NODES); 29 FetchMatlabData((DataSet**)&vertices,VERTICES); 30 FetchMatlabData((DataSet**)&loads,LOADS); 31 FetchMatlabData((DataSet**)&materials,MATERIALS); 32 FetchMatlabData(¶meters,PARAMETERS); 33 33 34 34 /*configure: */ … … 41 41 42 42 /*write output : */ 43 Write Data(COST,J);43 WriteMatlabData(COST,J); 44 44 45 45 /*Free ressources: */ -
issm/trunk/src/mex/CreateNodalConstraints/CreateNodalConstraints.cpp
r6412 r8910 21 21 22 22 /*Input datasets: */ 23 Fetch Data((DataSet**)&nodes,NODES);24 Fetch Data(&analysis_type,ANALYSISTYPE);23 FetchMatlabData((DataSet**)&nodes,NODES); 24 FetchMatlabData(&analysis_type,ANALYSISTYPE); 25 25 26 26 /*!Reduce vector: */ … … 28 28 29 29 /*write output datasets: */ 30 Write Data(YS,ys);30 WriteMatlabData(YS,ys); 31 31 32 32 /*Free ressources: */ -
issm/trunk/src/mex/DakotaResponses/DakotaResponses.cpp
r6412 r8910 31 31 32 32 /*Input datasets: */ 33 Fetch Data((DataSet**)&elements,ELEMENTSIN);34 Fetch Data((DataSet**)&nodes,NODESIN);35 Fetch Data((DataSet**)&vertices,VERTICESIN);36 Fetch Data((DataSet**)&loads,LOADSIN);37 Fetch Data((DataSet**)&materials,MATERIALSIN);38 Fetch Params(¶meters,PARAMETERSIN);33 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 34 FetchMatlabData((DataSet**)&nodes,NODESIN); 35 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 36 FetchMatlabData((DataSet**)&loads,LOADSIN); 37 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 38 FetchMatlabData(¶meters,PARAMETERSIN); 39 39 40 40 /*number of responses: */ … … 64 64 65 65 /*write output datasets: */ 66 Write Data(RESPONSES,responses,numresponses);66 WriteMatlabData(RESPONSES,responses,numresponses); 67 67 68 68 /*Free ressources: */ -
issm/trunk/src/mex/Echo/Echo.cpp
r6412 r8910 17 17 18 18 /*Input datasets: */ 19 Fetch Data(&dataset,DATASET);19 FetchMatlabData(&dataset,DATASET); 20 20 21 21 /*Echo dataset: */ -
issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.cpp
r6412 r8910 23 23 24 24 /*Input datasets: */ 25 Fetch Data(&elements,&nel,NULL,ELEMENTS);26 Fetch Data(&nodeconnectivity,&nods,&width,NODECONNECTIVITY);25 FetchMatlabData(&elements,&nel,NULL,ELEMENTS); 26 FetchMatlabData(&nodeconnectivity,&nods,&width,NODECONNECTIVITY); 27 27 28 28 /*!Generate internal degree of freedom numbers: */ … … 30 30 31 31 /*write output datasets: */ 32 Write Data(ELEMENTCONNECTIVITY,elementconnectivity,nel,3);32 WriteMatlabData(ELEMENTCONNECTIVITY,elementconnectivity,nel,3); 33 33 34 34 /*Free ressources: */ -
issm/trunk/src/mex/EnumToString/EnumToString.cpp
r8370 r8910 16 16 17 17 /*Fetch inputs: */ 18 Fetch Data(&enum_in,ENUMIN);18 FetchMatlabData(&enum_in,ENUMIN); 19 19 20 20 /*Run core function: */ … … 22 22 23 23 /* output: */ 24 Write Data(NAME,name);24 WriteMatlabData(NAME,name); 25 25 } 26 26 -
issm/trunk/src/mex/Exp2Kml/Exp2Kml.cpp
r8718 r8910 35 35 /*Input datasets: */ 36 36 if (verbose) printf("Fetching inputs:\n"); 37 Fetch Data(&filexp,EXP_IN);37 FetchMatlabData(&filexp,EXP_IN); 38 38 if (verbose) printf(" filexp=\"%s\"\n",filexp); 39 Fetch Data(&filkml,KML_IN);39 FetchMatlabData(&filkml,KML_IN); 40 40 if (verbose) printf(" filkml=\"%s\"\n",filkml); 41 Fetch Data(&sgn,SGN_IN);41 FetchMatlabData(&sgn,SGN_IN); 42 42 if (verbose) printf(" sgn=%d\n",sgn); 43 43 … … 76 76 77 77 /*Write data: */ 78 Write Data(RET_OUT,iret);78 WriteMatlabData(RET_OUT,iret); 79 79 80 80 /*Clean-up*/ -
issm/trunk/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.cpp
r6412 r8910 25 25 26 26 /*Input datasets: */ 27 Fetch Data((DataSet**)&elements,ELEMENTSIN);28 Fetch Data((DataSet**)&nodes,NODES);29 Fetch Data((DataSet**)&vertices,VERTICES);30 Fetch Data((DataSet**)&loads,LOADSIN);31 Fetch Data((DataSet**)&materials,MATERIALS);32 Fetch Params(¶meters,PARAMETERS);27 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 28 FetchMatlabData((DataSet**)&nodes,NODES); 29 FetchMatlabData((DataSet**)&vertices,VERTICES); 30 FetchMatlabData((DataSet**)&loads,LOADSIN); 31 FetchMatlabData((DataSet**)&materials,MATERIALS); 32 FetchMatlabData(¶meters,PARAMETERS); 33 33 34 34 /*configure: */ … … 41 41 42 42 /*write output datasets: */ 43 Write Data(UG,ug);43 WriteMatlabData(UG,ug); 44 44 45 45 /*Free ressources: */ -
issm/trunk/src/mex/GetVectorFromInputs/GetVectorFromInputs.cpp
r6412 r8910 27 27 28 28 /*Input datasets: */ 29 Fetch Data((DataSet**)&elements,ELEMENTSIN);30 Fetch Data((DataSet**)&nodes,NODES);31 Fetch Data((DataSet**)&vertices,VERTICES);32 Fetch Data((DataSet**)&loads,LOADSIN);33 Fetch Data((DataSet**)&materials,MATERIALS);34 Fetch Params(¶meters,PARAMETERS);35 Fetch Data(&name_enum,NAMEENUM);36 Fetch Data(&type_enum,TYPEENUM);29 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 30 FetchMatlabData((DataSet**)&nodes,NODES); 31 FetchMatlabData((DataSet**)&vertices,VERTICES); 32 FetchMatlabData((DataSet**)&loads,LOADSIN); 33 FetchMatlabData((DataSet**)&materials,MATERIALS); 34 FetchMatlabData(¶meters,PARAMETERS); 35 FetchMatlabData(&name_enum,NAMEENUM); 36 FetchMatlabData(&type_enum,TYPEENUM); 37 37 38 38 /*configure: */ … … 45 45 46 46 /*write output datasets: */ 47 Write Data(UG,ug);47 WriteMatlabData(UG,ug); 48 48 49 49 /*Free ressources: */ -
issm/trunk/src/mex/Gradj/Gradj.cpp
r6412 r8910 26 26 27 27 /*Input datasets: */ 28 Fetch Data((DataSet**)&elements,ELEMENTS);29 Fetch Data((DataSet**)&nodes,NODES);30 Fetch Data((DataSet**)&vertices,VERTICES);31 Fetch Data((DataSet**)&loads,LOADS);32 Fetch Data((DataSet**)&materials,MATERIALS);33 Fetch Params(¶meters,PARAMETERS);34 Fetch Data(&control_type,CONTROLTYPE);28 FetchMatlabData((DataSet**)&elements,ELEMENTS); 29 FetchMatlabData((DataSet**)&nodes,NODES); 30 FetchMatlabData((DataSet**)&vertices,VERTICES); 31 FetchMatlabData((DataSet**)&loads,LOADS); 32 FetchMatlabData((DataSet**)&materials,MATERIALS); 33 FetchMatlabData(¶meters,PARAMETERS); 34 FetchMatlabData(&control_type,CONTROLTYPE); 35 35 36 36 /*configure: */ … … 43 43 44 44 /*write output : */ 45 Write Data(GRADG,gradient);45 WriteMatlabData(GRADG,gradient); 46 46 47 47 /*Free ressources: */ -
issm/trunk/src/mex/HoleFiller/HoleFiller.cpp
r4453 r8910 38 38 39 39 /*Fetch data: */ 40 Fetch Data(&imagein,&imagein_rows,&imagein_cols,IMAGEIN);41 Fetch Data(&smooth_flag,SMOOTH);40 FetchMatlabData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN); 41 FetchMatlabData(&smooth_flag,SMOOTH); 42 42 43 43 /*Get smooth flag setup: */ … … 51 51 52 52 /* output: */ 53 Write Data(IMAGEOUT,imageout,imagein_rows,imagein_cols);53 WriteMatlabData(IMAGEOUT,imageout,imagein_rows,imagein_cols); 54 54 55 55 /*end module: */ -
issm/trunk/src/mex/InputControlUpdate/InputControlUpdate.cpp
r6412 r8910 24 24 25 25 /*Input datasets: */ 26 Fetch Data((DataSet**)&elements,ELEMENTSIN);27 Fetch Data((DataSet**)&nodes,NODESIN);28 Fetch Data((DataSet**)&vertices,VERTICESIN);29 Fetch Data((DataSet**)&loads,LOADSIN);30 Fetch Data((DataSet**)&materials,MATERIALSIN);31 Fetch Params(¶meters,PARAMETERSIN);32 Fetch Data(&scalar,SCALAR);33 Fetch Data(&update,UPDATE);26 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 27 FetchMatlabData((DataSet**)&nodes,NODESIN); 28 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 29 FetchMatlabData((DataSet**)&loads,LOADSIN); 30 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 31 FetchMatlabData(¶meters,PARAMETERSIN); 32 FetchMatlabData(&scalar,SCALAR); 33 FetchMatlabData(&update,UPDATE); 34 34 35 35 /*configure: */ … … 42 42 43 43 /*write output datasets: */ 44 Write Data(ELEMENTS,elements);45 Write Data(NODES,nodes);46 Write Data(VERTICES,vertices);47 Write Data(LOADS,loads);48 Write Data(MATERIALS,materials);49 Write Params(PARAMETERS,parameters);44 WriteMatlabData(ELEMENTS,elements); 45 WriteMatlabData(NODES,nodes); 46 WriteMatlabData(VERTICES,vertices); 47 WriteMatlabData(LOADS,loads); 48 WriteMatlabData(MATERIALS,materials); 49 WriteMatlabData(PARAMETERS,parameters); 50 50 51 51 /*Free ressources: */ -
issm/trunk/src/mex/InputConvergence/InputConvergence.cpp
r6412 r8910 35 35 CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputConvergenceUsage); 36 36 37 Fetch Data((DataSet**)&elements,ELEMENTS);38 Fetch Data((DataSet**)&loads,LOADS);39 Fetch Data((DataSet**)&nodes,NODES);40 Fetch Data((DataSet**)&vertices,VERTICES);41 Fetch Data((DataSet**)&materials,MATERIALS);42 Fetch Params(¶meters,PARAMETERS);37 FetchMatlabData((DataSet**)&elements,ELEMENTS); 38 FetchMatlabData((DataSet**)&loads,LOADS); 39 FetchMatlabData((DataSet**)&nodes,NODES); 40 FetchMatlabData((DataSet**)&vertices,VERTICES); 41 FetchMatlabData((DataSet**)&materials,MATERIALS); 42 FetchMatlabData(¶meters,PARAMETERS); 43 43 44 Fetch Data(&double_fields,&numfields,FIELDENUMS);44 FetchMatlabData(&double_fields,&numfields,FIELDENUMS); 45 45 field_enums=(int*)xmalloc(numfields*sizeof(int)); 46 46 for(i=0;i<numfields;i++)field_enums[i]=(int)double_fields[i]; 47 47 48 Fetch Data(&double_criterion,&numcriterions,CRITERIONENUMS);49 Fetch Data(&criterion_values,&numcriterions,CRITERIONVALUES);48 FetchMatlabData(&double_criterion,&numcriterions,CRITERIONENUMS); 49 FetchMatlabData(&criterion_values,&numcriterions,CRITERIONVALUES); 50 50 criterion_enums=(int*)xmalloc(numcriterions*sizeof(int)); 51 51 for(i=0;i<numcriterions;i++)criterion_enums[i]=(int)double_criterion[i]; … … 60 60 61 61 /*Write output data: */ 62 Write Data(CONVERGED,converged);62 WriteMatlabData(CONVERGED,converged); 63 63 64 64 /*Free ressources: */ -
issm/trunk/src/mex/InputDuplicate/InputDuplicate.cpp
r6412 r8910 23 23 24 24 /*Input datasets: */ 25 Fetch Data((DataSet**)&elements,ELEMENTS);26 Fetch Data((DataSet**)&nodes,NODES);27 Fetch Data((DataSet**)&vertices,VERTICES);28 Fetch Data((DataSet**)&loads,LOADS);29 Fetch Data((DataSet**)&materials,MATERIALS);30 Fetch Params(¶meters,PARAMETERS);25 FetchMatlabData((DataSet**)&elements,ELEMENTS); 26 FetchMatlabData((DataSet**)&nodes,NODES); 27 FetchMatlabData((DataSet**)&vertices,VERTICES); 28 FetchMatlabData((DataSet**)&loads,LOADS); 29 FetchMatlabData((DataSet**)&materials,MATERIALS); 30 FetchMatlabData(¶meters,PARAMETERS); 31 31 32 Fetch Data(&original_enum,ORIGINALENUM);33 Fetch Data(&new_enum,NEWENUM);32 FetchMatlabData(&original_enum,ORIGINALENUM); 33 FetchMatlabData(&new_enum,NEWENUM); 34 34 35 35 /*!Call core code: */ … … 37 37 38 38 /*write output : */ 39 Write Data(ELEMENTSOUT,elements);39 WriteMatlabData(ELEMENTSOUT,elements); 40 40 41 41 /*Free ressources: */ -
issm/trunk/src/mex/InputScale/InputScale.cpp
r6412 r8910 24 24 25 25 /*Input datasets: */ 26 Fetch Data((DataSet**)&elements,ELEMENTS);27 Fetch Data((DataSet**)&nodes,NODES);28 Fetch Data((DataSet**)&vertices,VERTICES);29 Fetch Data((DataSet**)&loads,LOADS);30 Fetch Data((DataSet**)&materials,MATERIALS);31 Fetch Params(¶meters,PARAMETERS);26 FetchMatlabData((DataSet**)&elements,ELEMENTS); 27 FetchMatlabData((DataSet**)&nodes,NODES); 28 FetchMatlabData((DataSet**)&vertices,VERTICES); 29 FetchMatlabData((DataSet**)&loads,LOADS); 30 FetchMatlabData((DataSet**)&materials,MATERIALS); 31 FetchMatlabData(¶meters,PARAMETERS); 32 32 33 Fetch Data(&enum_type,ENUMTYPE);34 Fetch Data(&scale_factor,SCALEFACTOR);33 FetchMatlabData(&enum_type,ENUMTYPE); 34 FetchMatlabData(&scale_factor,SCALEFACTOR); 35 35 36 36 /*configure: */ … … 43 43 44 44 /*write output : */ 45 Write Data(ELEMENTSOUT,elements);45 WriteMatlabData(ELEMENTSOUT,elements); 46 46 47 47 /*Free ressources: */ -
issm/trunk/src/mex/InputToResult/InputToResult.cpp
r6412 r8910 28 28 29 29 /*Input datasets: */ 30 Fetch Data((DataSet**)&elements,ELEMENTS);31 Fetch Data((DataSet**)&nodes,NODES);32 Fetch Data((DataSet**)&vertices,VERTICES);33 Fetch Data((DataSet**)&loads,LOADS);34 Fetch Data((DataSet**)&materials,MATERIALS);35 Fetch Params(¶meters,PARAMETERS);30 FetchMatlabData((DataSet**)&elements,ELEMENTS); 31 FetchMatlabData((DataSet**)&nodes,NODES); 32 FetchMatlabData((DataSet**)&vertices,VERTICES); 33 FetchMatlabData((DataSet**)&loads,LOADS); 34 FetchMatlabData((DataSet**)&materials,MATERIALS); 35 FetchMatlabData(¶meters,PARAMETERS); 36 36 37 Fetch Data(&enum_type,ENUMTYPE);37 FetchMatlabData(&enum_type,ENUMTYPE); 38 38 39 39 /*configure: */ … … 43 43 44 44 if(nrhs==9){ 45 Fetch Data(&step,STEP);46 Fetch Data(&time,TIME);45 FetchMatlabData(&step,STEP); 46 FetchMatlabData(&time,TIME); 47 47 48 48 /*!Call core code: */ … … 56 56 57 57 /*write output : */ 58 Write Data(ELEMENTSOUT,elements);58 WriteMatlabData(ELEMENTSOUT,elements); 59 59 60 60 /*Free ressources: */ -
issm/trunk/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.cpp
r6412 r8910 24 24 25 25 /*Input datasets: */ 26 Fetch Data((DataSet**)&elements,ELEMENTSIN);27 Fetch Data((DataSet**)&nodes,NODESIN);28 Fetch Data((DataSet**)&vertices,VERTICESIN);29 Fetch Data((DataSet**)&loads,LOADSIN);30 Fetch Data((DataSet**)&materials,MATERIALSIN);31 Fetch Params(¶meters,PARAMETERSIN);32 Fetch Data(&constant,CONSTANT);33 Fetch Data(&name,NAME);26 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 27 FetchMatlabData((DataSet**)&nodes,NODESIN); 28 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 29 FetchMatlabData((DataSet**)&loads,LOADSIN); 30 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 31 FetchMatlabData(¶meters,PARAMETERSIN); 32 FetchMatlabData(&constant,CONSTANT); 33 FetchMatlabData(&name,NAME); 34 34 35 35 /*configure: */ … … 42 42 43 43 /*write output datasets: */ 44 Write Data(ELEMENTS,elements);45 Write Data(LOADS,loads);44 WriteMatlabData(ELEMENTS,elements); 45 WriteMatlabData(LOADS,loads); 46 46 47 47 /*Free ressources: */ -
issm/trunk/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp
r6412 r8910 30 30 31 31 /*Input datasets: */ 32 Fetch Data((DataSet**)&elements,ELEMENTSIN);33 Fetch Data((DataSet**)&nodes,NODESIN);34 Fetch Data((DataSet**)&vertices,VERTICESIN);35 Fetch Data((DataSet**)&loads,LOADSIN);36 Fetch Data((DataSet**)&materials,MATERIALSIN);37 Fetch Params(¶meters,PARAMETERSIN);32 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 33 FetchMatlabData((DataSet**)&nodes,NODESIN); 34 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 35 FetchMatlabData((DataSet**)&loads,LOADSIN); 36 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 37 FetchMatlabData(¶meters,PARAMETERSIN); 38 38 /*dakota input: */ 39 Fetch Data(&variables,&numvariables,VARIABLES);39 FetchMatlabData(&variables,&numvariables,VARIABLES); 40 40 41 41 variables_descriptors=(char**)xmalloc(numvariables*sizeof(char*)); … … 60 60 61 61 /*write output datasets: */ 62 Write Data(ELEMENTS,elements);63 Write Data(LOADS,loads);64 Write Data(MATERIALS,materials);62 WriteMatlabData(ELEMENTS,elements); 63 WriteMatlabData(LOADS,loads); 64 WriteMatlabData(MATERIALS,materials); 65 65 66 66 /*Free ressources: */ -
issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp
r6412 r8910 23 23 24 24 /*Input datasets: */ 25 Fetch Data((DataSet**)&elements,ELEMENTSIN);26 Fetch Data((DataSet**)&nodes,NODESIN);27 Fetch Data((DataSet**)&vertices,VERTICESIN);28 Fetch Data((DataSet**)&loads,LOADSIN);29 Fetch Data((DataSet**)&materials,MATERIALSIN);30 Fetch Params(¶meters,PARAMETERSIN);31 Fetch Data(&solution,SOLUTION);25 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 26 FetchMatlabData((DataSet**)&nodes,NODESIN); 27 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 28 FetchMatlabData((DataSet**)&loads,LOADSIN); 29 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 30 FetchMatlabData(¶meters,PARAMETERSIN); 31 FetchMatlabData(&solution,SOLUTION); 32 32 33 33 /*configure: */ … … 40 40 41 41 /*write output datasets: */ 42 Write Data(ELEMENTS,elements);43 Write Data(MATERIALS,materials);42 WriteMatlabData(ELEMENTS,elements); 43 WriteMatlabData(MATERIALS,materials); 44 44 45 45 /*Free ressources: */ -
issm/trunk/src/mex/InputUpdateFromVector/InputUpdateFromVector.cpp
r8223 r8910 26 26 27 27 /*Input datasets: */ 28 Fetch Data((DataSet**)&elements,ELEMENTSIN);29 Fetch Data((DataSet**)&nodes,NODESIN);30 Fetch Data((DataSet**)&vertices,VERTICESIN);31 Fetch Data((DataSet**)&loads,LOADSIN);32 Fetch Data((DataSet**)&materials,MATERIALSIN);33 Fetch Params(¶meters,PARAMETERSIN);34 Fetch Data(&vector,&dummy,VECTOR);35 Fetch Data(&name,NAME);36 Fetch Data(&type,TYPE);28 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 29 FetchMatlabData((DataSet**)&nodes,NODESIN); 30 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 31 FetchMatlabData((DataSet**)&loads,LOADSIN); 32 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 33 FetchMatlabData(¶meters,PARAMETERSIN); 34 FetchMatlabData(&vector,&dummy,VECTOR); 35 FetchMatlabData(&name,NAME); 36 FetchMatlabData(&type,TYPE); 37 37 38 38 /*Check that type is one of Constant, Vertex or Element: */ … … 50 50 51 51 /*write output datasets: */ 52 Write Data(ELEMENTS,elements);53 Write Data(NODES,nodes);54 Write Data(VERTICES,vertices);55 Write Data(LOADS,loads);56 Write Data(MATERIALS,materials);57 Write Params(PARAMETERS,parameters);52 WriteMatlabData(ELEMENTS,elements); 53 WriteMatlabData(NODES,nodes); 54 WriteMatlabData(VERTICES,vertices); 55 WriteMatlabData(LOADS,loads); 56 WriteMatlabData(MATERIALS,materials); 57 WriteMatlabData(PARAMETERS,parameters); 58 58 59 59 /*Free ressources: */ -
issm/trunk/src/mex/InternalFront/InternalFront.cpp
r7331 r8910 25 25 26 26 /*Fetch required fields*/ 27 Fetch Data(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));27 FetchMatlabData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements")); 28 28 if(numberofelements<=0) _error_("No elements found in the model"); 29 Fetch Data(&elements,&M,&N,mxGetAssignedField(MODEL,0,"elements"));29 FetchMatlabData(&elements,&M,&N,mxGetAssignedField(MODEL,0,"elements")); 30 30 if(M!=numberofelements || N!=3) _error_("Field 'elements' should be of size [md.numberofelements 3]"); 31 Fetch Data(&elementonwater,&M,&N,mxGetAssignedField(MODEL,0,"elementonwater"));31 FetchMatlabData(&elementonwater,&M,&N,mxGetAssignedField(MODEL,0,"elementonwater")); 32 32 if(M!=numberofelements || N!=1) _error_("Field 'elementonwater' should be of size [md.numberofelements 1]"); 33 Fetch Data(&elementconnectivity,&M,&N,mxGetAssignedField(MODEL,0,"elementconnectivity"));33 FetchMatlabData(&elementconnectivity,&M,&N,mxGetAssignedField(MODEL,0,"elementconnectivity")); 34 34 if(M!=numberofelements || N!=3) _error_("Field 'elementconnectivity' should be of size [md.numberofelements 3]"); 35 35 … … 87 87 88 88 /*write output datasets: */ 89 Write Data(FRONT,front2,numberofsegments,4);89 WriteMatlabData(FRONT,front2,numberofsegments,4); 90 90 91 91 /*end module: */ -
issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp
r8306 r8910 50 50 51 51 /*Input datasets: */ 52 Fetch Data(&x,&x_rows,NULL,XHANDLE);53 Fetch Data(&y,&y_rows,NULL,YHANDLE);54 Fetch Data(&data,&data_rows,&data_cols,DATAHANDLE);55 Fetch Data(&x_mesh,&x_mesh_rows,NULL,XMESHHANDLE);56 Fetch Data(&y_mesh,&y_mesh_rows,NULL,YMESHHANDLE);57 Fetch Data(&default_value,DEFAULTHANDLE);52 FetchMatlabData(&x,&x_rows,NULL,XHANDLE); 53 FetchMatlabData(&y,&y_rows,NULL,YHANDLE); 54 FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE); 55 FetchMatlabData(&x_mesh,&x_mesh_rows,NULL,XMESHHANDLE); 56 FetchMatlabData(&y_mesh,&y_mesh_rows,NULL,YMESHHANDLE); 57 FetchMatlabData(&default_value,DEFAULTHANDLE); 58 58 59 59 /* Run core computations: */ 60 60 if(nrhs==7){ 61 Fetch Data(&interpolationenum,INTERPENUM);61 FetchMatlabData(&interpolationenum,INTERPENUM); 62 62 InterpFromGridToMeshx(&data_mesh, x, x_rows, y, y_rows, data, data_rows,data_cols, x_mesh, y_mesh, x_mesh_rows,default_value,interpolationenum); 63 63 } … … 67 67 68 68 /*Write data: */ 69 Write Data(DATAMESH,data_mesh);69 WriteMatlabData(DATAMESH,data_mesh); 70 70 71 71 /*end module: */ -
issm/trunk/src/mex/InterpFromMesh2d/InterpFromMesh2d.cpp
r8306 r8910 77 77 78 78 /*Input datasets: */ 79 Fetch Data(&index_data,&index_data_rows,&dummy,INDEXHANDLE);80 Fetch Data(&x_data,&x_data_rows,NULL,XHANDLE);81 Fetch Data(&y_data,&y_data_rows,NULL,YHANDLE);82 Fetch Data(&data,&data_rows,&data_cols,DATAHANDLE);83 Fetch Data(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE);84 Fetch Data(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE);79 FetchMatlabData(&index_data,&index_data_rows,&dummy,INDEXHANDLE); 80 FetchMatlabData(&x_data,&x_data_rows,NULL,XHANDLE); 81 FetchMatlabData(&y_data,&y_data_rows,NULL,YHANDLE); 82 FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE); 83 FetchMatlabData(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE); 84 FetchMatlabData(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE); 85 85 86 86 if(nrhs>=7){ 87 87 /*default values: */ 88 Fetch Data(&default_values,&num_default_values,DEFAULTHANDLE);88 FetchMatlabData(&default_values,&num_default_values,DEFAULTHANDLE); 89 89 } 90 90 else{ … … 146 146 147 147 /*Write data: */ 148 Write Data(DATAPRIME,data_prime);148 WriteMatlabData(DATAPRIME,data_prime); 149 149 150 150 /*end module: */ -
issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
r6412 r8910 35 35 36 36 /*Input datasets: */ 37 Fetch Data(&index,&nel,NULL,INDEX);38 Fetch Data(&x,&nods,NULL,X);39 Fetch Data(&y,NULL,NULL,Y);40 Fetch Data(&meshdata,&meshdata_length,NULL,MESHDATA);41 Fetch Data(&cornereast,CORNEREAST);42 Fetch Data(&cornernorth,CORNERNORTH);43 Fetch Data(&xposting,XPOSTING);44 Fetch Data(&yposting,YPOSTING);45 Fetch Data(&nlines,NLINES);46 Fetch Data(&ncols,NCOLS);47 Fetch Data(&default_value,DEFAULTVALUE);37 FetchMatlabData(&index,&nel,NULL,INDEX); 38 FetchMatlabData(&x,&nods,NULL,X); 39 FetchMatlabData(&y,NULL,NULL,Y); 40 FetchMatlabData(&meshdata,&meshdata_length,NULL,MESHDATA); 41 FetchMatlabData(&cornereast,CORNEREAST); 42 FetchMatlabData(&cornernorth,CORNERNORTH); 43 FetchMatlabData(&xposting,XPOSTING); 44 FetchMatlabData(&yposting,YPOSTING); 45 FetchMatlabData(&nlines,NLINES); 46 FetchMatlabData(&ncols,NCOLS); 47 FetchMatlabData(&default_value,DEFAULTVALUE); 48 48 49 49 /*Call core of computation: */ … … 51 51 52 52 /*Write results: */ 53 Write Data(XM,x_m,ncols+1);54 Write Data(YM,y_m,nlines+1);55 Write Data(GRIDDATA,griddata,nlines,ncols);53 WriteMatlabData(XM,x_m,ncols+1); 54 WriteMatlabData(YM,y_m,nlines+1); 55 WriteMatlabData(GRIDDATA,griddata,nlines,ncols); 56 56 57 57 /*Free ressources: */ -
issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
r8306 r8910 61 61 /*Input datasets: */ 62 62 if (verbose) printf("Fetching inputs\n"); 63 Fetch Data(&index,&nels_data,&index_cols,INDEXHANDLE);64 Fetch Data(&x_data,&x_data_rows,NULL,XHANDLE);65 Fetch Data(&y_data,&y_data_rows,NULL,YHANDLE);66 Fetch Data(&data,&data_rows,&data_cols,DATAHANDLE);67 Fetch Data(&x_interp,&x_interp_rows,NULL,XINTERPHANDLE);68 Fetch Data(&y_interp,&y_interp_rows,NULL,YINTERPHANDLE);63 FetchMatlabData(&index,&nels_data,&index_cols,INDEXHANDLE); 64 FetchMatlabData(&x_data,&x_data_rows,NULL,XHANDLE); 65 FetchMatlabData(&y_data,&y_data_rows,NULL,YHANDLE); 66 FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE); 67 FetchMatlabData(&x_interp,&x_interp_rows,NULL,XINTERPHANDLE); 68 FetchMatlabData(&y_interp,&y_interp_rows,NULL,YINTERPHANDLE); 69 69 70 70 if(nrhs==8){ … … 74 74 75 75 /*default values: */ 76 Fetch Data(&default_values,&num_default_values,DEFAULTHANDLE);76 FetchMatlabData(&default_values,&num_default_values,DEFAULTHANDLE); 77 77 78 78 /*contours: */ … … 129 129 130 130 /*Write data: */ 131 Write Data(DATAINTERP,data_interp,nods_interp,data_cols);131 WriteMatlabData(DATAINTERP,data_interp,nods_interp,data_cols); 132 132 133 133 /*end module: */ -
issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
r8306 r8910 64 64 65 65 /*Input datasets: */ 66 Fetch Data(&index_data,&index_data_rows,NULL,INDEXHANDLE);67 Fetch Data(&x_data,&x_data_rows,NULL,XHANDLE);68 Fetch Data(&y_data,&y_data_rows,NULL,YHANDLE);69 Fetch Data(&z_data,&z_data_rows,NULL,ZHANDLE);70 Fetch Data(&data,&data_rows,&data_cols,DATAHANDLE);71 Fetch Data(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE);72 Fetch Data(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE);73 Fetch Data(&z_prime,&z_prime_rows,NULL,ZPRIMEHANDLE);74 Fetch Data(&default_value,DEFAULTHANDLE);66 FetchMatlabData(&index_data,&index_data_rows,NULL,INDEXHANDLE); 67 FetchMatlabData(&x_data,&x_data_rows,NULL,XHANDLE); 68 FetchMatlabData(&y_data,&y_data_rows,NULL,YHANDLE); 69 FetchMatlabData(&z_data,&z_data_rows,NULL,ZHANDLE); 70 FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE); 71 FetchMatlabData(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE); 72 FetchMatlabData(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE); 73 FetchMatlabData(&z_prime,&z_prime_rows,NULL,ZPRIMEHANDLE); 74 FetchMatlabData(&default_value,DEFAULTHANDLE); 75 75 76 76 /*some checks*/ … … 90 90 91 91 /*Write data: */ 92 Write Data(DATAPRIME,data_prime);92 WriteMatlabData(DATAPRIME,data_prime); 93 93 94 94 /*end module: */ -
issm/trunk/src/mex/KMLMeshWrite/KMLFileRead.cpp
r8468 r8910 67 67 /*Input datasets: */ 68 68 if (verbose) printf("Fetching inputs:\n"); 69 Fetch Data(&filnam,FILENAME);69 FetchMatlabData(&filnam,FILENAME); 70 70 if (verbose) printf(" filnam =\"%s\"\n",filnam); 71 71 … … 112 112 113 113 /*Write data: */ 114 Write Data(ERRORFLAG,ierror);114 WriteMatlabData(ERRORFLAG,ierror); 115 115 116 116 /*Clean-up*/ -
issm/trunk/src/mex/KMLMeshWrite/KMLMeshWrite.cpp
r8062 r8910 62 62 /*Input datasets: */ 63 63 if (verbose) printf("Fetching inputs:\n"); 64 Fetch Data(&name,NAME);64 FetchMatlabData(&name,NAME); 65 65 if (verbose) printf(" name =\"%s\"\n",name); 66 66 … … 84 84 } 85 85 else 86 Fetch Data(¬es,NOTES);86 FetchMatlabData(¬es,NOTES); 87 87 if (verbose) printf(" notes =\"%s\"\n",notes); 88 88 89 Fetch Data(&elem,&melem,&nelem,ELEMHANDLE);89 FetchMatlabData(&elem,&melem,&nelem,ELEMHANDLE); 90 90 if (verbose) printf(" elem =size [%d x %d]\n",melem,nelem); 91 Fetch Data(&nodecon,&mncon,&nncon,NODECONHANDLE);91 FetchMatlabData(&nodecon,&mncon,&nncon,NODECONHANDLE); 92 92 if (verbose) printf(" nodecon=size [%d x %d]\n",mncon,nncon); 93 Fetch Data(&lat,&mlat,&nlat,LATHANDLE);93 FetchMatlabData(&lat,&mlat,&nlat,LATHANDLE); 94 94 llat=mlat*nlat; 95 95 if (verbose) printf(" lat =length [%d]\n",llat); 96 Fetch Data(&lng,&mlng,&nlng,LNGHANDLE);96 FetchMatlabData(&lng,&mlng,&nlng,LNGHANDLE); 97 97 llng=mlng*nlng; 98 98 if (verbose) printf(" lng =length [%d]\n",llng); 99 Fetch Data(&part,&mprt,&nprt,PARTHANDLE);99 FetchMatlabData(&part,&mprt,&nprt,PARTHANDLE); 100 100 lprt=mprt*nprt; 101 101 if (verbose) printf(" part =length [%d]\n",lprt); 102 Fetch Data(&data,&mdata,&ndata,DATAHANDLE);102 FetchMatlabData(&data,&mdata,&ndata,DATAHANDLE); 103 103 if (verbose) printf(" data =size [%d x %d]\n",mdata,ndata); 104 Fetch Data(&cmap,&mcmap,&ncmap,CMAPHANDLE);104 FetchMatlabData(&cmap,&mcmap,&ncmap,CMAPHANDLE); 105 105 if (verbose) printf(" cmap =size [%d x %d]\n",mcmap,ncmap); 106 Fetch Data(&filnam,FILENAME);106 FetchMatlabData(&filnam,FILENAME); 107 107 if (verbose) printf(" filnam =\"%s\"\n",filnam); 108 108 … … 160 160 161 161 /*Write data: */ 162 Write Data(ERRORFLAG,ierror);162 WriteMatlabData(ERRORFLAG,ierror); 163 163 164 164 /*Clean-up*/ -
issm/trunk/src/mex/KMLOverlay/KMLOverlay.cpp
r8639 r8910 41 41 /*Input datasets: */ 42 42 if (verbose) printf("Fetching inputs:\n"); 43 Fetch Data(&filkml,FILENAME);43 FetchMatlabData(&filkml,FILENAME); 44 44 if (verbose) printf(" filkml=\"%s\"\n",filkml); 45 45 … … 109 109 110 110 /*Write data: */ 111 Write Data(ERRORFLAG,ierror);111 WriteMatlabData(ERRORFLAG,ierror); 112 112 113 113 /*Clean-up*/ -
issm/trunk/src/mex/Ll2xy/Ll2xy.cpp
r8717 r8910 35 35 /*Input datasets: */ 36 36 if (verbose) printf("Fetching inputs:\n"); 37 Fetch Data(&lat,&nlat,LAT_IN);37 FetchMatlabData(&lat,&nlat,LAT_IN); 38 38 if (verbose) 39 39 if (nlat == 1) printf(" lat=%g\n",lat[0]); 40 40 else printf(" lat=[%d values]\n",nlat); 41 41 // for (i=0; i<nlat; i++) printf(" lat[%d]=%g\n",i,lat[i]); 42 Fetch Data(&lon,&nlon,LON_IN);42 FetchMatlabData(&lon,&nlon,LON_IN); 43 43 if (verbose) 44 44 if (nlon == 1) printf(" lon=%g\n",lon[0]); 45 45 else printf(" lon=[%d values]\n",nlon); 46 46 // for (i=0; i<nlon; i++) printf(" lon[%d]=%g\n",i,lon[i]); 47 Fetch Data(&sgn,SGN_IN);47 FetchMatlabData(&sgn,SGN_IN); 48 48 if (verbose) printf(" sgn=%d\n",sgn); 49 49 … … 84 84 85 85 /*Write data: */ 86 Write Data(X_OUT,x,ncoord);87 Write Data(Y_OUT,y,ncoord);86 WriteMatlabData(X_OUT,x,ncoord); 87 WriteMatlabData(Y_OUT,y,ncoord); 88 88 89 89 /*Clean-up*/ -
issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp
r8801 r8910 27 27 28 28 /*Input datasets: */ 29 Fetch Data(&uf,UF);30 Fetch Data(&ys,YS);31 Fetch Data((DataSet**)&nodes,NODES);32 Fetch Params(¶meters,PARAMETERS);29 FetchMatlabData(&uf,UF); 30 FetchMatlabData(&ys,YS); 31 FetchMatlabData((DataSet**)&nodes,NODES); 32 FetchMatlabData(¶meters,PARAMETERS); 33 33 34 34 /*!Reduce vector: */ … … 37 37 } 38 38 else{ 39 Fetch Data(&flag_ys0,YSFLAG);39 FetchMatlabData(&flag_ys0,YSFLAG); 40 40 Mergesolutionfromftogx(&ug, uf,ys,nodes,parameters,flag_ys0); 41 41 } 42 42 43 43 /*write output datasets: */ 44 Write Data(UG,ug);44 WriteMatlabData(UG,ug); 45 45 46 46 /*Free ressources: */ -
issm/trunk/src/mex/MeshPartition/MeshPartition.cpp
r8306 r8910 57 57 58 58 /*Fetch data: */ 59 Fetch Data(&dim,mxGetAssignedField(MODEL,0,"dim"));60 Fetch Data(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));61 Fetch Data(&numberofnodes,mxGetAssignedField(MODEL,0,"numberofnodes"));62 Fetch Data(&elements,NULL,&elements_width,mxGetAssignedField(MODEL,0,"elements"));59 FetchMatlabData(&dim,mxGetAssignedField(MODEL,0,"dim")); 60 FetchMatlabData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements")); 61 FetchMatlabData(&numberofnodes,mxGetAssignedField(MODEL,0,"numberofnodes")); 62 FetchMatlabData(&elements,NULL,&elements_width,mxGetAssignedField(MODEL,0,"elements")); 63 63 64 64 if (dim==3){ 65 65 66 Fetch Data(&numberofelements2d,mxGetAssignedField(MODEL,0,"numberofelements2d"));67 Fetch Data(&numberofnodes2d,mxGetAssignedField(MODEL,0,"numberofnodes2d"));68 Fetch Data(&elements2d,NULL,NULL,mxGetAssignedField(MODEL,0,"elements2d"));66 FetchMatlabData(&numberofelements2d,mxGetAssignedField(MODEL,0,"numberofelements2d")); 67 FetchMatlabData(&numberofnodes2d,mxGetAssignedField(MODEL,0,"numberofnodes2d")); 68 FetchMatlabData(&elements2d,NULL,NULL,mxGetAssignedField(MODEL,0,"elements2d")); 69 69 70 70 } 71 Fetch Data(&numlayers,mxGetAssignedField(MODEL,0,"numlayers"));72 Fetch Data(&numareas,NUMAREAS);71 FetchMatlabData(&numlayers,mxGetAssignedField(MODEL,0,"numlayers")); 72 FetchMatlabData(&numareas,NUMAREAS); 73 73 74 74 /*Run partitioning algorithm based on a "clever" use of the Metis partitioner: */ … … 89 89 90 90 /*Write data:*/ 91 Write Data(ELEMENTPARTITIONING,element_partitioning,numberofelements);92 Write Data(NODEPARTITIONING,node_partitioning,numberofnodes);91 WriteMatlabData(ELEMENTPARTITIONING,element_partitioning,numberofelements); 92 WriteMatlabData(NODEPARTITIONING,node_partitioning,numberofnodes); 93 93 94 94 /*Free ressources:*/ -
issm/trunk/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp
r8306 r8910 53 53 /*Fetch inputs: */ 54 54 //index 55 Fetch Data(&double_index,&nel,&dummy,INDEX);55 FetchMatlabData(&double_index,&nel,&dummy,INDEX); 56 56 if(dummy!=3)_error_(" element triangulation should be of 3 column width!"); 57 57 index=(int*)xmalloc(nel*3*sizeof(int)); … … 62 62 } 63 63 //x and y 64 Fetch Data(&x,&nods,X);65 Fetch Data(&y,&dummy,Y);64 FetchMatlabData(&x,&nods,X); 65 FetchMatlabData(&y,&dummy,Y); 66 66 67 67 //contours … … 94 94 95 95 /* output: */ 96 Write Data(SEGMENTS,segments,numsegs,5);96 WriteMatlabData(SEGMENTS,segments,numsegs,5); 97 97 98 98 /*end module: */ -
issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp
r8330 r8910 34 34 35 35 /*open file input for reading: */ 36 Fetch Data(&inputfilename,INPUTFILE);36 FetchMatlabData(&inputfilename,INPUTFILE); 37 37 IOMODEL= pfopen(inputfilename ,"rb"); 38 38 39 39 /*retrieve solution type and analyses: */ 40 Fetch Data(&solution_type,SOLUTIONTYPE);41 Fetch Data(&double_analyses,&numanalyses,ANALYSES);40 FetchMatlabData(&solution_type,SOLUTIONTYPE); 41 FetchMatlabData(&double_analyses,&numanalyses,ANALYSES); 42 42 analyses=(int*)xmalloc(numanalyses*sizeof(int)); 43 43 for(i=0;i<numanalyses;i++)analyses[i]=(int)double_analyses[i]; … … 47 47 48 48 /*Write output data: */ 49 Write Data(ELEMENTS,elements);50 Write Data(NODES,nodes);51 Write Data(VERTICES,vertices);52 Write Data(CONSTRAINTS,constraints);53 Write Data(LOADS,loads);54 Write Data(MATERIALS,materials);55 Write Params(PARAMETERS,parameters);49 WriteMatlabData(ELEMENTS,elements); 50 WriteMatlabData(NODES,nodes); 51 WriteMatlabData(VERTICES,vertices); 52 WriteMatlabData(CONSTRAINTS,constraints); 53 WriteMatlabData(LOADS,loads); 54 WriteMatlabData(MATERIALS,materials); 55 WriteMatlabData(PARAMETERS,parameters); 56 56 57 57 /*Free ressources: */ -
issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.cpp
r6412 r8910 22 22 23 23 /*Input datasets: */ 24 Fetch Data(&elements,&nel,NULL,ELEMENTS);25 Fetch Data(&nods,NUMNODES);24 FetchMatlabData(&elements,&nel,NULL,ELEMENTS); 25 FetchMatlabData(&nods,NUMNODES); 26 26 27 27 /*!Generate internal degree of freedom numbers: */ … … 29 29 30 30 /*write output datasets: */ 31 Write Data(CONNECTIVITY,connectivity,nods,width);31 WriteMatlabData(CONNECTIVITY,connectivity,nods,width); 32 32 33 33 /*Free ressources: */ -
issm/trunk/src/mex/NodesDof/NodesDof.cpp
r6412 r8910 19 19 20 20 /*Input datasets: */ 21 Fetch Data((DataSet**)&nodes,NODESIN);22 Fetch Params(¶meters,PARAMETERS);21 FetchMatlabData((DataSet**)&nodes,NODESIN); 22 FetchMatlabData(¶meters,PARAMETERS); 23 23 24 24 /*find analysis_type: */ … … 29 29 30 30 /*write output datasets: */ 31 Write Data(NODES,nodes);31 WriteMatlabData(NODES,nodes); 32 32 33 33 /*Free ressources: */ -
issm/trunk/src/mex/Orth/Orth.cpp
r6412 r8910 21 21 22 22 /*Input datasets: */ 23 Fetch Data(&gradj,GRADJ);24 Fetch Data(&oldgradj,OLDGRADJ);23 FetchMatlabData(&gradj,GRADJ); 24 FetchMatlabData(&oldgradj,OLDGRADJ); 25 25 26 26 /*!Reduce load from g to f size: */ … … 28 28 29 29 /*write output datasets: */ 30 Write Data(NEWGRADJ,newgradj);30 WriteMatlabData(NEWGRADJ,newgradj); 31 31 32 32 /*Free ressources: */ -
issm/trunk/src/mex/OutputResults/OutputResults.cpp
r6412 r8910 26 26 27 27 /*Input datasets: */ 28 Fetch Data((DataSet**)&elements,ELEMENTS);29 Fetch Data((DataSet**)&nodes,NODES);30 Fetch Data((DataSet**)&vertices,VERTICES);31 Fetch Data((DataSet**)&loads,LOADS);32 Fetch Data((DataSet**)&materials,MATERIALS);33 Fetch Params(¶meters,PARAMETERS);34 Fetch Data((DataSet**)&results,RESULTS);28 FetchMatlabData((DataSet**)&elements,ELEMENTS); 29 FetchMatlabData((DataSet**)&nodes,NODES); 30 FetchMatlabData((DataSet**)&vertices,VERTICES); 31 FetchMatlabData((DataSet**)&loads,LOADS); 32 FetchMatlabData((DataSet**)&materials,MATERIALS); 33 FetchMatlabData(¶meters,PARAMETERS); 34 FetchMatlabData((DataSet**)&results,RESULTS); 35 35 36 36 /*results might be NILL, allocate: */ -
issm/trunk/src/mex/OutputRifts/OutputRifts.cpp
r6412 r8910 24 24 25 25 /*Input datasets: */ 26 Fetch Data((DataSet**)&loads,LOADS);27 Fetch Data(&numrifts,mxGetField(PARAMETERS,0,"numrifts"));26 FetchMatlabData((DataSet**)&loads,LOADS); 27 FetchMatlabData(&numrifts,mxGetField(PARAMETERS,0,"numrifts")); 28 28 29 29 /*!Call core code: */ … … 31 31 32 32 /*write output : */ 33 Write Data(RIFTPROPERTIES,riftproperties);33 WriteMatlabData(RIFTPROPERTIES,riftproperties); 34 34 35 35 /*Free ressources: */ -
issm/trunk/src/mex/ParameterOutput/ParameterOutput.cpp
r6412 r8910 27 27 28 28 /*Input datasets: */ 29 Fetch Data((DataSet**)&elements,ELEMENTS);30 Fetch Data((DataSet**)&nodes,NODES);31 Fetch Data((DataSet**)&loads,LOADS);32 Fetch Data((DataSet**)&materials,MATERIALS);33 Fetch Data(&results,RESULTS);29 FetchMatlabData((DataSet**)&elements,ELEMENTS); 30 FetchMatlabData((DataSet**)&nodes,NODES); 31 FetchMatlabData((DataSet**)&loads,LOADS); 32 FetchMatlabData((DataSet**)&materials,MATERIALS); 33 FetchMatlabData(&results,RESULTS); 34 34 35 35 /*parameters: */ 36 Fetch Data(&analysis_type,ANALYSIS);37 Fetch Data(&sub_analysis_type,SUBANALYSIS);36 FetchMatlabData(&analysis_type,ANALYSIS); 37 FetchMatlabData(&sub_analysis_type,SUBANALYSIS); 38 38 39 39 /*!Generate internal degree of freedom numbers: */ … … 41 41 42 42 /*write output datasets: */ 43 Write Data(RESULTS,results,0,0,"DataSet",NULL);43 WriteMatlabData(RESULTS,results,0,0,"DataSet",NULL); 44 44 45 45 /*Free ressources: */ -
issm/trunk/src/mex/ParsePetscOptions/ParsePetscOptions.cpp
r8330 r8910 19 19 20 20 /*Input datasets: */ 21 Fetch Params(¶meters,PARAMETERS);22 Fetch Data(&petscoptionsfilename,PETSCOPTIONSFILENAME);21 FetchMatlabData(¶meters,PARAMETERS); 22 FetchMatlabData(&petscoptionsfilename,PETSCOPTIONSFILENAME); 23 23 24 24 petscoptionsfid=fopen(petscoptionsfilename,"r"); … … 28 28 29 29 /*write output datasets: */ 30 Write Params(PARAMETERSOUT,parameters);30 WriteMatlabData(PARAMETERSOUT,parameters); 31 31 32 32 /*Free ressources: */ -
issm/trunk/src/mex/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
r7650 r8910 26 26 27 27 /*Fetch inputs: */ 28 Fetch Data(&x,&nods,NULL,XHANDLE);29 Fetch Data(&y,NULL,NULL,YHANDLE);30 Fetch Data(&mindistance,MINDISTANCE);31 Fetch Data(&multithread,MULTITHREAD);28 FetchMatlabData(&x,&nods,NULL,XHANDLE); 29 FetchMatlabData(&y,NULL,NULL,YHANDLE); 30 FetchMatlabData(&mindistance,MINDISTANCE); 31 FetchMatlabData(&multithread,MULTITHREAD); 32 32 33 33 /*Run core routine: */ … … 35 35 36 36 /* output: */ 37 Write Data(FLAGS,flags);37 WriteMatlabData(FLAGS,flags); 38 38 39 39 /*end module: */ -
issm/trunk/src/mex/ProcessParams/ProcessParams.cpp
r6412 r8910 17 17 18 18 /*Input datasets: */ 19 Fetch Data((DataSet**)¶meters,PARAMETERS);19 FetchMatlabData((DataSet**)¶meters,PARAMETERS); 20 20 21 21 /*write output datasets: */ 22 Write Params(PARAMETERSOUT,parameters);22 WriteMatlabData(PARAMETERSOUT,parameters); 23 23 24 24 /*Free ressources: */ -
issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
r4453 r8910 22 22 23 23 /*Input datasets: */ 24 Fetch Data(&connectivity,&nel,&dummy,CONNECTIVITY);25 Fetch Data(&pool,&dummy,POOL);26 Fetch Data(&index,INDEX);27 Fetch Data(&flags,&dummy,FLAGS);24 FetchMatlabData(&connectivity,&nel,&dummy,CONNECTIVITY); 25 FetchMatlabData(&pool,&dummy,POOL); 26 FetchMatlabData(&index,INDEX); 27 FetchMatlabData(&flags,&dummy,FLAGS); 28 28 29 29 /*!Generate internal degree of freedom numbers: */ … … 31 31 32 32 /*write output datasets: */ 33 Write Data(POOLOUT,pool,nel);33 WriteMatlabData(POOLOUT,pool,nel); 34 34 35 35 /*Free ressources: */ -
issm/trunk/src/mex/Qmu/Qmu.cpp
r6412 r8910 33 33 34 34 /*Fetch parameters from femmodel structure: */ 35 Fetch Params(¶meters,PARAMETERS);35 FetchMatlabData(¶meters,PARAMETERS); 36 36 37 37 /*!Generate internal degree of freedom numbers: */ -
issm/trunk/src/mex/Reduceload/Reduceload.cpp
r6579 r8910 23 23 24 24 /*Input datasets: */ 25 Fetch Data(&pf,PF);26 Fetch Data(&Kfs,KFS);27 Fetch Data(&ys,YS);25 FetchMatlabData(&pf,PF); 26 FetchMatlabData(&Kfs,KFS); 27 FetchMatlabData(&ys,YS); 28 28 29 29 /*!Reduce load from g to f size: */ 30 30 if(nrhs==4){ 31 Fetch Data(&flag_ys0,YSFLAG);31 FetchMatlabData(&flag_ys0,YSFLAG); 32 32 Reduceloadx(pf, Kfs, ys,flag_ys0); 33 33 } … … 37 37 38 38 /*write output datasets: */ 39 Write Data(PFOUT,pf);39 WriteMatlabData(PFOUT,pf); 40 40 41 41 /*Free ressources: */ -
issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.cpp
r8801 r8910 22 22 23 23 /*Input datasets: */ 24 Fetch Data(&ug,UG);25 Fetch Data((DataSet**)&nodes,NODES);26 Fetch Params(¶meters,PARAMETERS);24 FetchMatlabData(&ug,UG); 25 FetchMatlabData((DataSet**)&nodes,NODES); 26 FetchMatlabData(¶meters,PARAMETERS); 27 27 28 28 /*!Reduce vector: */ … … 30 30 31 31 /*write output datasets: */ 32 Write Data(UF,uf);32 WriteMatlabData(UF,uf); 33 33 34 34 /*Free ressources: */ -
issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.cpp
r8801 r8910 22 22 23 23 /*Input datasets: */ 24 Fetch Data(&yg,YG);25 Fetch Data((DataSet**)&nodes,NODES);26 Fetch Params(¶meters,PARAMETERS);24 FetchMatlabData(&yg,YG); 25 FetchMatlabData((DataSet**)&nodes,NODES); 26 FetchMatlabData(¶meters,PARAMETERS); 27 27 28 28 /*!Reduce vector: */ … … 30 30 31 31 /*write output datasets: */ 32 Write Data(YS,ys);32 WriteMatlabData(YS,ys); 33 33 34 34 /*Free ressources: */ -
issm/trunk/src/mex/Response/Response.cpp
r8607 r8910 28 28 29 29 /*Input datasets: */ 30 Fetch Data((DataSet**)&elements,ELEMENTS);31 Fetch Data((DataSet**)&nodes,NODES);32 Fetch Data((DataSet**)&vertices,VERTICES);33 Fetch Data((DataSet**)&loads,LOADS);34 Fetch Data((DataSet**)&materials,MATERIALS);35 Fetch Params(¶meters,PARAMETERS);36 Fetch Data(&response,RESPONSE);37 Fetch Data(&process_units,PROCESSUNITS);38 Fetch Data(&weight_index,WEIGHTINDEX);30 FetchMatlabData((DataSet**)&elements,ELEMENTS); 31 FetchMatlabData((DataSet**)&nodes,NODES); 32 FetchMatlabData((DataSet**)&vertices,VERTICES); 33 FetchMatlabData((DataSet**)&loads,LOADS); 34 FetchMatlabData((DataSet**)&materials,MATERIALS); 35 FetchMatlabData(¶meters,PARAMETERS); 36 FetchMatlabData(&response,RESPONSE); 37 FetchMatlabData(&process_units,PROCESSUNITS); 38 FetchMatlabData(&weight_index,WEIGHTINDEX); 39 39 40 40 /*configure: */ … … 47 47 48 48 /*write output : */ 49 Write Data(OUTPUT,resp);49 WriteMatlabData(OUTPUT,resp); 50 50 51 51 /*Free ressources: */ -
issm/trunk/src/mex/Solver/Solver.cpp
r8264 r8910 28 28 29 29 /*parameters: */ 30 Fetch Params(¶meters,PARAMETERS);30 FetchMatlabData(¶meters,PARAMETERS); 31 31 32 32 /*In serial mode, we have no set any petsc options, do it now: */ … … 43 43 44 44 /*Input datasets: */ 45 Fetch Data(&Kff,KFF);46 Fetch Data(&pf,PF);47 Fetch Data(&uf0,UF0);48 Fetch Data(&df,DF);45 FetchMatlabData(&Kff,KFF); 46 FetchMatlabData(&pf,PF); 47 FetchMatlabData(&uf0,UF0); 48 FetchMatlabData(&df,DF); 49 49 50 50 /*Core module: */ … … 52 52 53 53 /*Write output*/ 54 Write Data(UF,uf);54 WriteMatlabData(UF,uf); 55 55 } 56 56 else{ -
issm/trunk/src/mex/SpcNodes/SpcNodes.cpp
r6412 r8910 20 20 21 21 /*Input datasets: */ 22 Fetch Data((DataSet**)&nodes,NODESIN);23 Fetch Data((DataSet**)&constraints,CONSTRAINTS);24 Fetch Data(&analysis_type,ANALYSISTYPE);22 FetchMatlabData((DataSet**)&nodes,NODESIN); 23 FetchMatlabData((DataSet**)&constraints,CONSTRAINTS); 24 FetchMatlabData(&analysis_type,ANALYSISTYPE); 25 25 26 26 /*!Generate internal degree of freedom numbers: */ … … 28 28 29 29 /*write output datasets: */ 30 Write Data(NODES,nodes);30 WriteMatlabData(NODES,nodes); 31 31 32 32 /*Free ressources: */ -
issm/trunk/src/mex/StringToEnum/StringToEnum.cpp
r8370 r8910 16 16 17 17 /*Fetch inputs: */ 18 Fetch Data(&name,NAME);18 FetchMatlabData(&name,NAME); 19 19 20 20 /*Run core function: */ … … 22 22 23 23 /* output: */ 24 Write Data(ENUMOUT,enum_out);24 WriteMatlabData(ENUMOUT,enum_out); 25 25 } 26 26 -
issm/trunk/src/mex/SurfaceArea/SurfaceArea.cpp
r6412 r8910 22 22 23 23 /*Input datasets: */ 24 Fetch Data((DataSet**)&elements,ELEMENTS);25 Fetch Data((DataSet**)&nodes,NODES);26 Fetch Data((DataSet**)&vertices,VERTICES);27 Fetch Data((DataSet**)&loads,LOADS);28 Fetch Data((DataSet**)&materials,MATERIALS);29 Fetch Params(¶meters,PARAMETERS);24 FetchMatlabData((DataSet**)&elements,ELEMENTS); 25 FetchMatlabData((DataSet**)&nodes,NODES); 26 FetchMatlabData((DataSet**)&vertices,VERTICES); 27 FetchMatlabData((DataSet**)&loads,LOADS); 28 FetchMatlabData((DataSet**)&materials,MATERIALS); 29 FetchMatlabData(¶meters,PARAMETERS); 30 30 31 31 /*configure: */ … … 38 38 39 39 /*write output : */ 40 Write Data(ELEMENTSOUT,elements);40 WriteMatlabData(ELEMENTSOUT,elements); 41 41 42 42 /*Free ressources: */ -
issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp
r8801 r8910 34 34 35 35 /*Input datasets: */ 36 Fetch Data((DataSet**)&elements,ELEMENTS);37 Fetch Data((DataSet**)&nodes,NODES);38 Fetch Data((DataSet**)&vertices,VERTICES);39 Fetch Data((DataSet**)&loads,LOADS);40 Fetch Data((DataSet**)&materials,MATERIALS);41 Fetch Params(¶meters,PARAMETERS);36 FetchMatlabData((DataSet**)&elements,ELEMENTS); 37 FetchMatlabData((DataSet**)&nodes,NODES); 38 FetchMatlabData((DataSet**)&vertices,VERTICES); 39 FetchMatlabData((DataSet**)&loads,LOADS); 40 FetchMatlabData((DataSet**)&materials,MATERIALS); 41 FetchMatlabData(¶meters,PARAMETERS); 42 42 43 43 /*configure: */ … … 49 49 /*!Generate internal degree of freedom numbers: */ 50 50 if(nrhs==10){ 51 Fetch Data(&kflag,KFLAG);52 Fetch Data(&pflag,PFLAG);53 Fetch Data(&penalty_kflag,PENALTYKFLAG);54 Fetch Data(&penalty_pflag,PENALTYPFLAG);51 FetchMatlabData(&kflag,KFLAG); 52 FetchMatlabData(&pflag,PFLAG); 53 FetchMatlabData(&penalty_kflag,PENALTYKFLAG); 54 FetchMatlabData(&penalty_pflag,PENALTYPFLAG); 55 55 SystemMatricesx(&Kff,&Kfs,&pf,&df,&kmax,elements,nodes,vertices,loads,materials,parameters,kflag,pflag,penalty_kflag,penalty_pflag); 56 56 } … … 59 59 60 60 /*write output datasets: */ 61 Write Data(KFF,Kff);62 Write Data(KFS,Kfs);63 Write Data(PF,pf);64 Write Data(DF,df);65 Write Data(KMAX,kmax);61 WriteMatlabData(KFF,Kff); 62 WriteMatlabData(KFS,Kfs); 63 WriteMatlabData(PF,pf); 64 WriteMatlabData(DF,df); 65 WriteMatlabData(KMAX,kmax); 66 66 67 67 /*Free ressources: */ -
issm/trunk/src/mex/TimeAdapt/TimeAdapt.cpp
r6412 r8910 25 25 26 26 /*Input datasets: */ 27 Fetch Data((DataSet**)&elements,ELEMENTSIN);28 Fetch Data((DataSet**)&nodes,NODESIN);29 Fetch Data((DataSet**)&vertices,VERTICESIN);30 Fetch Data((DataSet**)&loads,LOADSIN);31 Fetch Data((DataSet**)&materials,MATERIALSIN);32 Fetch Params(¶meters,PARAMETERSIN);27 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 28 FetchMatlabData((DataSet**)&nodes,NODESIN); 29 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 30 FetchMatlabData((DataSet**)&loads,LOADSIN); 31 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 32 FetchMatlabData(¶meters,PARAMETERSIN); 33 33 34 34 /*configure: */ … … 41 41 42 42 /*write output datasets: */ 43 Write Data(DT,dt);43 WriteMatlabData(DT,dt); 44 44 45 45 /*Free ressources: */ -
issm/trunk/src/mex/TriaSearch/TriaSearch.cpp
r8306 r8910 31 31 32 32 /*Input datasets: */ 33 Fetch Data(&index,&nel,&dummy,INDEXHANDLE);34 Fetch Data(&x,&nods,XHANDLE);35 Fetch Data(&y,&nods,YHANDLE);36 Fetch Data(&x0,&numberofnodes,X0HANDLE);37 Fetch Data(&y0,&numberofnodes,Y0HANDLE);33 FetchMatlabData(&index,&nel,&dummy,INDEXHANDLE); 34 FetchMatlabData(&x,&nods,XHANDLE); 35 FetchMatlabData(&y,&nods,YHANDLE); 36 FetchMatlabData(&x0,&numberofnodes,X0HANDLE); 37 FetchMatlabData(&y0,&numberofnodes,Y0HANDLE); 38 38 39 39 /* Echo: {{{1*/ … … 48 48 49 49 /*Write data: */ 50 Write Data(TRIA,tria,numberofnodes);50 WriteMatlabData(TRIA,tria,numberofnodes); 51 51 52 52 /*end module: */ -
issm/trunk/src/mex/UpdateSpcs/UpdateSpcs.cpp
r8801 r8910 20 20 21 21 /*Input datasets: */ 22 Fetch Data((DataSet**)&nodes,NODESIN);23 Fetch Params((Parameters**)¶meters,PARAMETERS);24 Fetch Data(&ys,YS);22 FetchMatlabData((DataSet**)&nodes,NODESIN); 23 FetchMatlabData((Parameters**)¶meters,PARAMETERS); 24 FetchMatlabData(&ys,YS); 25 25 26 26 /*!Generate internal degree of freedom numbers: */ … … 28 28 29 29 /*write output datasets: */ 30 Write Data(NODESOUT,nodes);30 WriteMatlabData(NODESOUT,nodes); 31 31 32 32 /*Free ressources: */ -
issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.cpp
r6412 r8910 22 22 23 23 /*Input datasets: */ 24 Fetch Data((DataSet**)&elements,ELEMENTSIN);25 Fetch Data((DataSet**)&nodes,NODESIN);26 Fetch Data((DataSet**)&vertices,VERTICESIN);27 Fetch Data((DataSet**)&loads,LOADSIN);28 Fetch Data((DataSet**)&materials,MATERIALSIN);29 Fetch Params(¶meters,PARAMETERSIN);24 FetchMatlabData((DataSet**)&elements,ELEMENTSIN); 25 FetchMatlabData((DataSet**)&nodes,NODESIN); 26 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 27 FetchMatlabData((DataSet**)&loads,LOADSIN); 28 FetchMatlabData((DataSet**)&materials,MATERIALSIN); 29 FetchMatlabData(¶meters,PARAMETERSIN); 30 30 31 31 /*configure: */ … … 38 38 39 39 /*write output datasets: */ 40 Write Data(ELEMENTS,elements);41 Write Data(NODES,nodes);42 Write Data(VERTICES,vertices);43 Write Data(LOADS,loads);44 Write Data(MATERIALS,materials);45 Write Params(PARAMETERS,parameters);40 WriteMatlabData(ELEMENTS,elements); 41 WriteMatlabData(NODES,nodes); 42 WriteMatlabData(VERTICES,vertices); 43 WriteMatlabData(LOADS,loads); 44 WriteMatlabData(MATERIALS,materials); 45 WriteMatlabData(PARAMETERS,parameters); 46 46 47 47 /*Free ressources: */ -
issm/trunk/src/mex/VerticesDof/VerticesDof.cpp
r6412 r8910 18 18 19 19 /*Input datasets: */ 20 Fetch Data((DataSet**)&vertices,VERTICESIN);21 Fetch Params(¶meters,PARAMETERS);20 FetchMatlabData((DataSet**)&vertices,VERTICESIN); 21 FetchMatlabData(¶meters,PARAMETERS); 22 22 23 23 /*!Generate internal degree of freedom numbers: */ … … 25 25 26 26 /*write output datasets: */ 27 Write Data(VERTICES,vertices);27 WriteMatlabData(VERTICES,vertices); 28 28 29 29 /*Free ressources: */ -
issm/trunk/src/mex/Xy2ll/Xy2ll.cpp
r8717 r8910 35 35 /*Input datasets: */ 36 36 if (verbose) printf("Fetching inputs:\n"); 37 Fetch Data(&x,&nx,X_IN);37 FetchMatlabData(&x,&nx,X_IN); 38 38 if (verbose) 39 39 if (nx == 1) printf(" x=%g\n",x[0]); 40 40 else printf(" x=[%d values]\n",nx); 41 41 // for (i=0; i<nx; i++) printf(" x[%d]=%g\n",i,x[i]); 42 Fetch Data(&y,&ny,Y_IN);42 FetchMatlabData(&y,&ny,Y_IN); 43 43 if (verbose) 44 44 if (ny == 1) printf(" y=%g\n",y[0]); 45 45 else printf(" y=[%d values]\n",ny); 46 46 // for (i=0; i<ny; i++) printf(" y[%d]=%g\n",i,y[i]); 47 Fetch Data(&sgn,SGN_IN);47 FetchMatlabData(&sgn,SGN_IN); 48 48 if (verbose) printf(" sgn=%d\n",sgn); 49 49 … … 84 84 85 85 /*Write data: */ 86 Write Data(LAT_OUT,lat,ncoord);87 Write Data(LON_OUT,lon,ncoord);86 WriteMatlabData(LAT_OUT,lat,ncoord); 87 WriteMatlabData(LON_OUT,lon,ncoord); 88 88 89 89 /*Clean-up*/
Note:
See TracChangeset
for help on using the changeset viewer.