Changeset 12330 for issm/trunk/src/c/objects/Params/DoubleVecParam.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (modified) (3 diffs)

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

@@ -75 +75 @@
 }
 /*}}}*/
-#ifdef _SERIAL_
-/*FUNCTION DoubleVecParam::Marshall{{{1*/
-void  DoubleVecParam::Marshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-        int   enum_value=0;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*get enum value of DoubleVecParam: */
-        enum_value=DoubleVecParamEnum;
-        
-        /*marshall enum: */
-        memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value);
-        
-        /*marshall DoubleVecParam data: */
-        memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
-        memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M);
-        memcpy(marshalled_dataset,values,M*sizeof(double));marshalled_dataset+=M*sizeof(double);
-
-        *pmarshalled_dataset=marshalled_dataset;
-}
-/*}}}*/
-/*FUNCTION DoubleVecParam::MarshallSize{{{1*/
-int   DoubleVecParam::MarshallSize(){
-        
-        return sizeof(M)
-                +M*sizeof(double)
-                +sizeof(enum_type)+
-                +sizeof(int); //sizeof(int) for enum value
-}
-/*}}}*/
-/*FUNCTION DoubleVecParam::Demarshall{{{1*/
-void  DoubleVecParam::Demarshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-        int   i;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*this time, no need to get enum type, the pointer directly points to the beginning of the 
-         *object data (thanks to DataSet::Demarshall):*/
-        memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
-        
-        /*data: */
-        memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M);
-        values=(double*)xmalloc(M*sizeof(double));
-        memcpy(values,marshalled_dataset,M*sizeof(double));marshalled_dataset+=M*sizeof(double);
-
-        /*return: */
-        *pmarshalled_dataset=marshalled_dataset;
-        return;
-}
-/*}}}*/
-#endif
 /*FUNCTION DoubleVecParam::ObjectEnum{{{1*/
 int DoubleVecParam::ObjectEnum(void){
@@ -181 +124 @@
 /*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{1*/
 void  DoubleVecParam::GetParameterValue(int** pintarray,int* pM){
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-        int* output=NULL;
-        int i;
-
-        /*Cast values into integers*/
-        output=(int*)xmalloc(M*sizeof(int));
-        for(i=0;i<M;i++) output[i]=(int)values[i];
-
-        /*Assign output pointers:*/
-        if(pM) *pM=M;
-        *pintarray=output;
-#else
         _error_("DoubleVec param of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type));
-#endif
 }
 /*}}}*/
@@ -201 +131 @@
         EnumToStringx(pname,this->enum_type);
 }
-/*}}}*/
-/*FUNCTION DoubleVecParam::SetMatlabField{{{1*/
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-void  DoubleVecParam::SetMatlabField(mxArray* dataref){
-
-        char* name=NULL;
-        double* doublevec=NULL;
-        mxArray* pfield=NULL;
-
-        this->GetParameterValue(&doublevec,NULL);
-        this->GetParameterName(&name);
-                                
-        pfield=mxCreateDoubleMatrix(0,0,mxREAL);
-        mxSetM(pfield,M);
-        mxSetN(pfield,1);
-        mxSetPr(pfield,doublevec);
-        
-        mxSetField( dataref, 0, name, pfield);
-}
-#endif
 /*}}}*/
 /*FUNCTION DoubleVecParam::SetValue{{{1*/