Changeset 12051

Timestamp:

04/18/12 15:18:37 (13 years ago)

Author:

Mathieu Morlighem

Message:

no more weird constructor for Options, use FetchData

Location:

issm/trunk-jpl/src/c

Files:

• Container/Options.h (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• matlab/Container (deleted)
• matlab/io/FetchMatlabData.cpp (modified) (1 diff)
• matlab/io/matlabio.h (modified) (1 diff)

issm/trunk-jpl/src/c/Container/Options.h

@@ -15 +15 @@
                 /*constructors, destructors*/
                 Options();
-                Options(int istart, int nrhs, void* module_references);
                 ~Options();
 

issm/trunk-jpl/src/c/Makefile.am

@@ -750 +750 @@
                                          ./matlab/io/MatlabVectorToDoubleVector.cpp\
                                          ./matlab/io/MatlabMatrixToDoubleMatrix.cpp\
-                                         ./matlab/Container/Options.cpp\
                                          ./matlab/io/MatlabMatrixToPetscMatrix.cpp\
                                          ./matlab/io/MatlabVectorToPetscVector.cpp\

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

@@ -612 +612 @@
 }
 /*}}}*/
+/*FUNCTION FetchData(Options** poptions,const mxArray* dataref){{{1*/
+void FetchData(Options** poptions,int istart, int nrhs,const mxArray** pdataref){
+
+        char   *name   = NULL;
+        Option *option = NULL;
+
+        /*Initialize output*/
+        Options* options=new Options();
+
+        /*Fetch all options*/
+        for (i=istart; i<nrhs; i=i+2){
+                if (!mxIsClass(pdataref[i],"char")) _error_("Argument %d must be name of option",i+1);
+
+                FetchData(&name,pdataref[i]);
+                if(i+1 == nrhs) _error_("Argument %d must exist and be value of option \"%s\".",i+2,name);
+
+                option=(Option*)OptionParse(name,&pdataref[i+1]);
+                options->AddOption(option);
+                option=NULL;
+        }
+
+        /*Assign output pointers:*/
+        *poptions=options;
+}
+/*}}}*/

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

@@ -49 +49 @@
 void FetchData(BamgMesh** bamgmesh,const mxArray* dataref);
 void FetchData(BamgOpts** bamgopts,const mxArray* dataref);
+void FetchData(Options** poptions,int istart, int nrhs,const mxArray** pdataref);
 
 Option* OptionParse(char* name, const mxArray* prhs[]);