Changeset 8646 for issm/trunk/src/c/objects/Params/DoubleMatParam.cpp

Timestamp:

06/16/11 14:13:46 (14 years ago)

Author:

Mathieu Morlighem

Message:

Deleted noisedmp, use DragCoefficientAbsGradientEnum as a cost function instead

File:

• issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (modified) (2 diffs)

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

@@ -152 +152 @@
 
 /*DoubleMatParam virtual functions definitions: */
-/*FUNCTION DoubleMatParam::GetParameterValue{{{1*/
+/*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/
 void  DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
         double* output=NULL;
@@ -163 +163 @@
         if(pN) *pN=N;
         *pdoublearray=output;
+}
+/*}}}*/
+/*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/
+void  DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){
+#ifdef _SERIAL_
+        int* output=NULL;
+        int  i;
+
+        output=(int*)xmalloc((int)(M*N*sizeof(int)));
+        for(i=0;i<M*N;i++) output[i]=(int)value[i];
+
+        /*Assign output pointers:*/
+        if(pM) *pM=M;
+        if(pN) *pN=N;
+        *pintarray=output;
+#else
+        _error_("DoubleMat of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type));
+#endif
 }
 /*}}}*/