Changeset 10584

Timestamp:

11/10/11 15:33:39 (13 years ago)

Author:

schlegel

Message:

Handle passing M,N in to get DoubleVecParam

Location:

issm/trunk/src/c/objects/Params

Files:

• DoubleVecParam.cpp (modified) (1 diff)
• DoubleVecParam.h (modified) (1 diff)

issm/trunk/src/c/objects/Params/DoubleVecParam.cpp

@@ -162 +162 @@
 }
 /*}}}*/
+/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/
+void  DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
+        double* output=NULL;
+        int M;
+        int N;
+
+        N=1;
+        M=this->M;
+        output=(double*)xmalloc(M*sizeof(double));
+        memcpy(output,values,M*sizeof(double));
+
+        /*Assign output pointers:*/
+        if(pM) *pM=M;
+        if(pN) *pN=N;
+        *pdoublearray=output;
+}
+/*}}}*/
 /*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{1*/
 void  DoubleVecParam::GetParameterValue(int** pintarray,int* pM){

issm/trunk/src/c/objects/Params/DoubleVecParam.h

@@ -55 +55 @@
                 void  GetParameterValue(int* pinteger){_error_("DoubleVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));}
                 void  GetParameterValue(int** pintarray,int* pM);
-                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));};
+                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));};
                 void  GetParameterValue(double* pdouble){_error_("DoubleVec param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));}
                 void  GetParameterValue(char** pstring){_error_("DoubleVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));}
                 void  GetParameterValue(char*** pstringarray,int* pM){_error_("DoubleVec param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));}
                 void  GetParameterValue(double** pdoublearray,int* pM);
-                void  GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("DoubleVec param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));}
+                void  GetParameterValue(double** pdoublearray,int* pM, int* pN);
                 void  GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("DoubleVec param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));}
                 void  GetParameterValue(Vec* pvec){_error_("DoubleVec param of enum %i (%s) cannot return a Vec",enum_type,EnumToStringx(enum_type));}