Changeset 13267

Timestamp:

09/05/12 13:55:27 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: enable Double option (not merged with DoubleArray options)

Location:

issm/trunk-jpl/src/c

Files:

• Container/Observations.cpp (modified) (1 diff)
• classes/IoModel.cpp (modified) (1 diff)
• classes/objects/Options/Option.h (modified) (1 diff)
• matlab/io/OptionParse.cpp (modified) (2 diffs)
• matlab/io/matlabio.h (modified) (1 diff)
• solutions/kriging.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Container/Observations.cpp

@@ -42 +42 @@
         int          i,j,maxdepth,level,counter,index;
         int          xi,yi;
-        IssmPDouble       xmin,xmax,ymin,ymax;
-        IssmPDouble       offset,minlength,minspacing,mintrimming,maxtrimming;
+        IssmPDouble  xmin,xmax,ymin,ymax;
+        IssmPDouble  offset,minlength,minspacing,mintrimming,maxtrimming;
         Observation *observation = NULL;
 

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -888 +888 @@
         switch(code){
                 case 3: {//IssmDouble
-                                        GenericOption<IssmDouble*>* option;
-                                        IssmDouble *value = NULL;
-                                        value=xNew<IssmDouble>(1);
-                                        FetchData(value,index+1);
-                                        option = new GenericOption<IssmDouble*>();
+                                        GenericOption<IssmDouble>* option;
+                                        IssmPDouble value;
+                                        FetchData(&value,index+1);
+                                        option = new GenericOption<IssmDouble>();
                                         option->value = value;
                                         option->name  = name;

issm/trunk-jpl/src/c/classes/objects/Options/Option.h

@@ -23 +23 @@
                 ~Option(){};
                 /*}}}*/
-                
                 /*Object virtual functions definitions:{{{*/
-                virtual void  Echo()=0;
-                virtual void  DeepEcho()=0;
-                virtual void  DeepEcho(char* indent)=0;
-                int   Id(){_error_("Not implemented yet");};
-                int   MyRank(){_error_("Not implemented yet");};
-                int   ObjectEnum(){return OptionEnum;};
-                Object* copy(){_error_("Not implemented yet");};
+                virtual void  Echo()= 0;
+                virtual void  DeepEcho()= 0;
+                virtual void  DeepEcho(char  *indent)=0;
+                int           Id(){_error_("Not implemented yet"); };
+                int           MyRank(){_error_("Not implemented yet"); };
+                int           ObjectEnum(){return OptionEnum;              };
+                Object       *copy(){_error_("Not implemented yet"); };
                 /*}}}*/
 

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

@@ -15 +15 @@
 #include "./matlabio.h"
 
-GenericOption<double*>* OptionDoubleParse( char* name, const mxArray* prhs[]){ /*{{{*/
+GenericOption<double>* OptionDoubleParse( char* name, const mxArray* prhs[]){ /*{{{*/
+
+        GenericOption<double> *odouble = NULL;
+
+        /*check and parse the name  */
+        odouble=new GenericOption<double>();
+        odouble->name =xNew<char>(strlen(name)+1);
+        memcpy(odouble->name,name,(strlen(name)+1)*sizeof(char));
+        FetchData(&odouble->value,prhs[0]);
+        odouble->numel=1;
+        odouble->ndims=1;
+        odouble->size=NULL;
+
+        return(odouble);
+}/*}}}*/
+GenericOption<double*>* OptionDoubleArrayParse( char* name, const mxArray* prhs[]){ /*{{{*/
 
         GenericOption<double*> *odouble = NULL;
@@ -160 +175 @@
 Option* OptionParse(char* name, const mxArray* prhs[]){ /*{{{*/
 
-        Option *option = NULL;
-        mxArray       *lhs[1];
+        Option  *option = NULL;
+        mxArray *lhs[1];
 
         /*parse the value according to the matlab data type  */
-        if     (mxIsClass(prhs[0],"double"))  option=(Option*)OptionDoubleParse(name,prhs);
-        else if(mxIsClass(prhs[0],"logical")) option=(Option*)OptionLogicalParse(name,prhs);
-        else if(mxIsClass(prhs[0],"char"))    option=(Option*)OptionCharParse(name,prhs);
-        else if(mxIsClass(prhs[0],"struct"))  option=(Option*)OptionStructParse(name,prhs);
-        else if(mxIsClass(prhs[0],"cell"))    option=(Option*)OptionCellParse(name,prhs);
+        if     (mxIsClass(prhs[0],"double")  && (mxGetNumberOfElements(prhs[0])==1))
+         option=(Option*)OptionDoubleParse(name,prhs);
+        else if(mxIsClass(prhs[0],"double")  && (mxGetNumberOfElements(prhs[0])!=1))
+         option=(Option*)OptionDoubleArrayParse(name,prhs);
+        else if(mxIsClass(prhs[0],"logical"))
+         option=(Option*)OptionLogicalParse(name,prhs);
+        else if(mxIsClass(prhs[0],"char"))
+         option=(Option*)OptionCharParse(name,prhs);
+        else if(mxIsClass(prhs[0],"struct"))
+         option=(Option*)OptionStructParse(name,prhs);
+        else if(mxIsClass(prhs[0],"cell"))
+         option=(Option*)OptionCellParse(name,prhs);
         else {
                 _pprintLine_("  Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\".");

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

@@ -51 +51 @@
 
 Option* OptionParse(char* name, const mxArray* prhs[]);
-GenericOption<double*>*   OptionDoubleParse( char* name, const mxArray* prhs[]);
+GenericOption<double>*    OptionDoubleParse( char* name, const mxArray* prhs[]);
+GenericOption<double*>*   OptionDoubleArrayParse( char* name, const mxArray* prhs[]);
 GenericOption<bool*>*     OptionLogicalParse( char* name, const mxArray* prhs[]);
 GenericOption<char*>*     OptionCharParse( char* name, const mxArray* prhs[]);

issm/trunk-jpl/src/c/solutions/kriging.cpp

@@ -23 +23 @@
 
         /*Input*/
-        int      ninterp,nobs;
-        IssmDouble  *x        = NULL;
-        IssmDouble  *y        = NULL;
-        IssmDouble  *data     = NULL;
-        IssmDouble  *x_interp = NULL;
-        IssmDouble  *y_interp = NULL;
-        Options *options  = NULL;
+        int         ninterp,nobs;
+        IssmDouble *x        = NULL;
+        IssmDouble *y        = NULL;
+        IssmDouble *data     = NULL;
+        IssmDouble *x_interp = NULL;
+        IssmDouble *y_interp = NULL;
+        Options    *options  = NULL;
 
         /*Output*/