Changeset 7760

Timestamp:

04/01/11 15:22:11 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added Get for double arrays

Location:

issm/trunk/src/c

Files:

• Container/Options.cpp (modified) (1 diff)
• Container/Options.h (modified) (1 diff)
• objects/Options/Option.h (modified) (1 diff)
• objects/Options/OptionCell.h (modified) (1 diff)
• objects/Options/OptionChar.h (modified) (1 diff)
• objects/Options/OptionDouble.cpp (modified) (1 diff)
• objects/Options/OptionDouble.h (modified) (1 diff)
• objects/Options/OptionLogical.h (modified) (1 diff)
• objects/Options/OptionStruct.h (modified) (1 diff)

issm/trunk/src/c/Container/Options.cpp ¶

@@ -215 +215 @@
         }
 
+}
+/*}}}*/
+/*FUNCTION Options::Get(double** pvalue,int* numel,const char* name){{{1*/
+void Options::Get(double** pvalue,int* numel,const char* name){
+
+        vector<Object*>::iterator object;
+        Option* option=NULL;
+
+        /*Get option*/
+        option=GetOption(name);
+
+        /*If the pointer is not NULL, the option has been found*/
+        if(option){
+                option->Get(pvalue,numel);
+        }
+        /*Else, the Option does not exist, no default provided*/
+        else{
+                _error_("option of name \"%s\" not found, and no default value has been provided",name);
+        }
 }
 /*}}}*/

issm/trunk/src/c/Container/Options.h ¶

@@ -23 +23 @@
                 int  AddOption(Option* in_oobject);
                 Option* GetOption(const char* name);
-                void Get(double* pvalue,const char* name);
-                void Get(double* pvalue,const char* name,double default_value);
-                void Get(bool*   pvalue,const char* name);
-                void Get(bool*   pvalue,const char* name,bool default_value);
-                void Get(char**  pvalue,const char* name);
-                void Get(char**  pvalue,const char* name,const char* default_value);
+                void Get(double*  pvalue,const char* name);
+                void Get(double*  pvalue,const char* name,double default_value);
+                void Get(bool*    pvalue,const char* name);
+                void Get(bool*    pvalue,const char* name,bool default_value);
+                void Get(char**   pvalue,const char* name);
+                void Get(char**   pvalue,const char* name,const char* default_value);
+                void Get(double** pvalue,int* numel,const char* name);
 };
 

issm/trunk/src/c/objects/Options/Option.h ¶

@@ -48 +48 @@
                 virtual void  Get(bool* pvalue)=0;
                 virtual void  Get(char** pvalue)=0;
+                virtual void  Get(double** pvalue,int *pnumel)=0;
 
 };

issm/trunk/src/c/objects/Options/OptionCell.h ¶

@@ -45 +45 @@
                 void  Get(bool* pvalue){  _error_("An OptionCell object cannot return a bool");};
                 void  Get(char** pvalue){ _error_("An OptionCell object cannot return a string");};
+                void  Get(double** pvalue,int *pnumel){ _error_("An OptionCell object cannot return a double vec");};
 
 };

issm/trunk/src/c/objects/Options/OptionChar.h ¶

@@ -45 +45 @@
                 void  Get(bool* pvalue){  _error_("An OptionChar object cannot return a bool");};
                 void  Get(char** pvalue);
+                void  Get(double** pvalue,int *pnumel){ _error_("An OptionChar object cannot return a double vec");};
 
 };

issm/trunk/src/c/objects/Options/OptionDouble.cpp ¶

@@ -131 +131 @@
 }
 /*}}}*/
+/*FUNCTION OptionDouble::Get(double** pvalue,int* numel) {{{1*/
+void OptionDouble::Get(double** pvalue,int* numel){
+
+        /*We should first check that the size is one*/
+        if(this->NumEl()<=0){
+                _error_("option \"%s\" is empty and cannot return a double vector",this->name);
+        }
+
+        /*Copy vector*/
+        double* outvalue=(double*)xmalloc(this->NumEl()*sizeof(double));
+        for(int i=0;i<this->NumEl();i++) outvalue[i]=this->values[i];
+
+        /*Assign output pointer*/
+        *pvalue=outvalue;
+        if(numel) *numel=this->NumEl();
+}
+/*}}}*/

issm/trunk/src/c/objects/Options/OptionDouble.h ¶

@@ -45 +45 @@
                 void  Get(bool* pvalue){  _error_("An OptionDouble object cannot return a bool");};
                 void  Get(char** pvalue){ _error_("An OptionDouble object cannot return a string");};
+                void  Get(double** pvalue,int* pnumel);
 
 };

issm/trunk/src/c/objects/Options/OptionLogical.h ¶

@@ -45 +45 @@
                 void  Get(bool* pvalue);
                 void  Get(char** pvalue){ _error_("An OptionLogical object cannot return a string");};
+                void  Get(double** pvalue,int *pnumel){ _error_("An OptionLogical object cannot return a double vec");};
 
 };

issm/trunk/src/c/objects/Options/OptionStruct.h ¶

@@ -42 +42 @@
                 int   NDims();
                 int*  Size();
-                void  Get(double* pvalue){_error_("An OptionCell object cannot return a double");};
-                void  Get(bool* pvalue){  _error_("An OptionCell object cannot return a bool");};
-                void  Get(char** pvalue){ _error_("An OptionCell object cannot return a string");};
+                void  Get(double* pvalue){_error_("An OptionStruct object cannot return a double");};
+                void  Get(bool* pvalue){  _error_("An OptionStruct object cannot return a bool");};
+                void  Get(char** pvalue){ _error_("An OptionStruct object cannot return a string");};
+                void  Get(double** pvalue,int *pnumel){ _error_("An OptionStruct object cannot return a double vec");};
 
 };