Index: /issm/trunk-jpl/src/c/objects/Bamg/QuadTree.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/QuadTree.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Bamg/QuadTree.h (revision 12014) @@ -33,9 +33,4 @@ int Id(){_error_("not implemented yet");}; int MyRank(){_error_("not implemented yet");}; - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset){_error_("not implemented yet");}; - int MarshallSize(){_error_("not implemented yet");}; - void Demarshall(char** pmarshalled_dataset){_error_("not implemented yet");}; - #endif int ObjectEnum(){_error_("not implemented yet");}; Object* copy(){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12014) @@ -72,68 +72,4 @@ } /*}}}1*/ -#ifdef _SERIAL_ -/*FUNCTION SpcDynamic::Marshall {{{1*/ -void SpcDynamic::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of SpcDynamic: */ - enum_type=SpcDynamicEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall SpcDynamic data: */ - memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(marshalled_dataset,&nodeid,sizeof(nodeid));marshalled_dataset+=sizeof(nodeid); - memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(marshalled_dataset,&isset,sizeof(isset));marshalled_dataset+=sizeof(isset); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -/*FUNCTION SpcDynamic::MarshallSize {{{1*/ -int SpcDynamic::MarshallSize(){ - - return sizeof(sid) - +sizeof(nodeid) - +sizeof(dof) - +sizeof(value) - +sizeof(isset) - +sizeof(analysis_type) - +sizeof(int); //sizeof(int) for enum type -} -/*}}}1*/ -/*FUNCTION SpcDynamic::Demarshall {{{1*/ -void SpcDynamic::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(&nodeid,marshalled_dataset,sizeof(nodeid));marshalled_dataset+=sizeof(nodeid); - memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(&isset,marshalled_dataset,sizeof(isset));marshalled_dataset+=sizeof(isset); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -#endif /*FUNCTION SpcDynamic::ObjectEnum{{{1*/ int SpcDynamic::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.h (revision 12014) @@ -34,9 +34,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12014) @@ -75,65 +75,4 @@ } /*}}}1*/ -#ifdef _SERIAL_ -/*FUNCTION SpcStatic::Marshall {{{1*/ -void SpcStatic::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of SpcStatic: */ - enum_type=SpcStaticEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall SpcStatic data: */ - memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(marshalled_dataset,&nodeid,sizeof(nodeid));marshalled_dataset+=sizeof(nodeid); - memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -/*FUNCTION SpcStatic::MarshallSize {{{1*/ -int SpcStatic::MarshallSize(){ - - return sizeof(sid) - +sizeof(nodeid) - +sizeof(dof) - +sizeof(value) - +sizeof(analysis_type) - +sizeof(int); //sizeof(int) for enum type -} -/*}}}1*/ -/*FUNCTION SpcStatic::Demarshall {{{1*/ -void SpcStatic::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(&nodeid,marshalled_dataset,sizeof(nodeid));marshalled_dataset+=sizeof(nodeid); - memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -#endif /*FUNCTION SpcStatic::ObjectEnum{{{1*/ int SpcStatic::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.h (revision 12014) @@ -33,9 +33,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12014) @@ -87,76 +87,4 @@ } /*}}}1*/ -#ifdef _SERIAL_ -/*FUNCTION SpcTransient::Marshall {{{1*/ -void SpcTransient::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of SpcTransient: */ - enum_type=SpcTransientEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall SpcTransient data: */ - memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(marshalled_dataset,&nodeid,sizeof(nodeid));marshalled_dataset+=sizeof(nodeid); - memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(marshalled_dataset,&nsteps,sizeof(nsteps));marshalled_dataset+=sizeof(nsteps); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - if(nsteps){ - memcpy(marshalled_dataset,values,nsteps*sizeof(double));marshalled_dataset+=nsteps*sizeof(double); - memcpy(marshalled_dataset,times,nsteps*sizeof(double));marshalled_dataset+=nsteps*sizeof(double); - } - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -/*FUNCTION SpcTransient::MarshallSize {{{1*/ -int SpcTransient::MarshallSize(){ - - return sizeof(sid) - +sizeof(nodeid) - +sizeof(dof) - +sizeof(nsteps) - +nsteps*2*sizeof(double) - +sizeof(analysis_type) - +sizeof(int); //sizeof(int) for enum type -} -/*}}}1*/ -/*FUNCTION SpcTransient::Demarshall {{{1*/ -void SpcTransient::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(&nodeid,marshalled_dataset,sizeof(nodeid));marshalled_dataset+=sizeof(nodeid); - memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(&nsteps,marshalled_dataset,sizeof(nsteps));marshalled_dataset+=sizeof(nsteps); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - if(nsteps){ - values=(double*)xmalloc(nsteps*sizeof(double)); - times=(double*)xmalloc(nsteps*sizeof(double)); - memcpy(values,marshalled_dataset,nsteps*sizeof(double));marshalled_dataset+=nsteps*sizeof(double); - memcpy(times,marshalled_dataset,nsteps*sizeof(double));marshalled_dataset+=nsteps*sizeof(double); - } - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -#endif /*FUNCTION SpcTransient::ObjectEnum{{{1*/ int SpcTransient::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.h (revision 12014) @@ -35,9 +35,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Contour.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Contour.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Contour.cpp (revision 12014) @@ -79,71 +79,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Contour::Marshall{{{1*/ -void Contour::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputssize; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Contour: */ - enum_type=ContourEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Contour data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&nods,sizeof(nods));marshalled_dataset+=sizeof(nods); - memcpy(marshalled_dataset,&closed,sizeof(closed));marshalled_dataset+=sizeof(closed); - memcpy(marshalled_dataset,x,nods*sizeof(double));marshalled_dataset+=nods*sizeof(double); - memcpy(marshalled_dataset,y,nods*sizeof(double));marshalled_dataset+=nods*sizeof(double); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Contour::MarshallSize{{{1*/ -int Contour::MarshallSize(){ - - return sizeof(id)+ - sizeof(nods)+ - sizeof(closed)+ - 2*nods*sizeof(double)+ - sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Contour::Demarshall{{{1*/ -void Contour::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&nods,marshalled_dataset,sizeof(nods));marshalled_dataset+=sizeof(nods); - memcpy(&closed,marshalled_dataset,sizeof(closed));marshalled_dataset+=sizeof(closed); - - if(nods){ - this->x=(double*)xmalloc(nods*sizeof(double)); - this->y=(double*)xmalloc(nods*sizeof(double)); - memcpy(x,marshalled_dataset,nods*sizeof(double));marshalled_dataset+=nods*sizeof(double); - memcpy(y,marshalled_dataset,nods*sizeof(double));marshalled_dataset+=nods*sizeof(double); - } - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Contour::ObjectEnum{{{1*/ int Contour::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Contour.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Contour.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Contour.h (revision 12014) @@ -34,9 +34,4 @@ int Id(void); int MyRank(void); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(void); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(void); Object* copy(void); Index: /issm/trunk-jpl/src/c/objects/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12014) @@ -208,128 +208,3 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DofIndexing::Marshall{{{1*/ -void DofIndexing::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - bool flagdoftype; //to indicate if there are some doftype or if NULL - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*preliminary: */ - if(this->doftype)flagdoftype=true; - else flagdoftype=false; - - /*get enum type of DofIndexing: */ - enum_type=DofIndexingEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall DofIndexing data: */ - memcpy(marshalled_dataset,&gsize,sizeof(gsize));marshalled_dataset+=sizeof(gsize); - memcpy(marshalled_dataset,&fsize,sizeof(fsize));marshalled_dataset+=sizeof(fsize); - memcpy(marshalled_dataset,&ssize,sizeof(ssize));marshalled_dataset+=sizeof(ssize); - memcpy(marshalled_dataset,&flagdoftype,sizeof(flagdoftype));marshalled_dataset+=sizeof(flagdoftype); - memcpy(marshalled_dataset,&clone,sizeof(clone));marshalled_dataset+=sizeof(clone); - - if(this->gsize>0){ - memcpy(marshalled_dataset,f_set,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool); - memcpy(marshalled_dataset,s_set,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool); - memcpy(marshalled_dataset,svalues,gsize*sizeof(double)); marshalled_dataset+=gsize*sizeof(double); - if(flagdoftype){ memcpy(marshalled_dataset,doftype,gsize*sizeof(int)); marshalled_dataset+=gsize*sizeof(int); } - memcpy(marshalled_dataset,gdoflist,gsize*sizeof(int)); marshalled_dataset+=gsize*sizeof(int); - } - if(this->fsize>0 && this->fsize!=UNDEF){ memcpy(marshalled_dataset,fdoflist,fsize*sizeof(int)); marshalled_dataset+=fsize*sizeof(int);} - if(this->ssize>0 && this->ssize!=UNDEF){ memcpy(marshalled_dataset,sdoflist,ssize*sizeof(int)); marshalled_dataset+=ssize*sizeof(int);} - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION DofIndexing::MarshallSize{{{1*/ -int DofIndexing::MarshallSize(){ - - int size=0; - - size+=4*sizeof(int)+sizeof(bool); - if(this->gsize>0){ - size+= 2*this->gsize*sizeof(bool)+ - this->gsize*sizeof(double)+ - this->gsize*sizeof(int); - if(this->doftype)size+=this->gsize*sizeof(int); - } - if(this->fsize>0 && this->fsize!=UNDEF)size+=this->fsize*sizeof(int); - if(this->ssize>0 && this->ssize!=UNDEF)size+=this->ssize*sizeof(int); - - size+=sizeof(int); //sizeof(int) for enum type - - return size; -} -/*}}}*/ -/*FUNCTION DofIndexing::Demarshall{{{1*/ -void DofIndexing::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type; - bool flagdoftype; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of object since DofIndexing is not directly called by DataSet: */ - memcpy(&enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); - - /*easy part: */ - memcpy(&gsize,marshalled_dataset,sizeof(gsize));marshalled_dataset+=sizeof(gsize); - memcpy(&fsize,marshalled_dataset,sizeof(fsize));marshalled_dataset+=sizeof(fsize); - memcpy(&ssize,marshalled_dataset,sizeof(ssize));marshalled_dataset+=sizeof(ssize); - memcpy(&flagdoftype,marshalled_dataset,sizeof(flagdoftype));marshalled_dataset+=sizeof(flagdoftype); - memcpy(&clone,marshalled_dataset,sizeof(clone));marshalled_dataset+=sizeof(clone); - - /*Allocate: */ - if(this->gsize>0){ - this->f_set=(bool*)xmalloc(this->gsize*sizeof(bool)); - this->s_set=(bool*)xmalloc(this->gsize*sizeof(bool)); - this->svalues=(double*)xmalloc(this->gsize*sizeof(double)); - if(flagdoftype)this->doftype=(int*)xmalloc(this->gsize*sizeof(int)); - else this->doftype=NULL; - this->gdoflist=(int*)xmalloc(this->gsize*sizeof(int)); - } - else{ - this->f_set=NULL; - this->s_set=NULL; - this->svalues=NULL; - this->doftype=NULL; - this->gdoflist=NULL; - } - if(this->fsize>0) - this->fdoflist=(int*)xmalloc(this->fsize*sizeof(int)); - else - this->fdoflist=NULL; - if(this->ssize>0) - this->sdoflist=(int*)xmalloc(this->ssize*sizeof(int)); - else - this->sdoflist=NULL; - - /*Copy arrays: */ - if(this->gsize>0){ - memcpy(f_set,marshalled_dataset,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool); - memcpy(s_set,marshalled_dataset,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool); - memcpy(svalues,marshalled_dataset,gsize*sizeof(double));marshalled_dataset+=gsize*sizeof(double); - if(flagdoftype){memcpy(doftype,marshalled_dataset,gsize*sizeof(int));marshalled_dataset+=gsize*sizeof(int); } - memcpy(gdoflist,marshalled_dataset,gsize*sizeof(int));marshalled_dataset+=gsize*sizeof(int); - } - - if(this->fsize>0 && this->fsize!=UNDEF){ memcpy(this->fdoflist,marshalled_dataset,this->fsize*sizeof(int));marshalled_dataset+=this->fsize*sizeof(int); } - if(this->ssize>0 && this->ssize!=UNDEF){ memcpy(this->sdoflist,marshalled_dataset,this->ssize*sizeof(int));marshalled_dataset+=this->ssize*sizeof(int); } - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif - + Index: /issm/trunk-jpl/src/c/objects/DofIndexing.h =================================================================== --- /issm/trunk-jpl/src/c/objects/DofIndexing.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/DofIndexing.h (revision 12014) @@ -43,9 +43,4 @@ void Echo(void); void DeepEcho(void); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif void copy(DofIndexing* properties); /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12014) @@ -64,61 +64,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION BoolElementResult::Marshall{{{1*/ -void BoolElementResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of BoolElementResult: */ - enum_value=BoolElementResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall BoolElementResult data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION BoolElementResult::Demarshall{{{1*/ -void BoolElementResult::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION BoolElementResult::MarshallSize{{{1*/ -int BoolElementResult::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type) - +sizeof(time) - +sizeof(step) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -#endif /*FUNCTION BoolElementResult::ObjectEnum{{{1*/ int BoolElementResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h (revision 12014) @@ -35,9 +35,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12014) @@ -64,61 +64,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleElementResult::Marshall{{{1*/ -void DoubleElementResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleElementResult: */ - enum_value=DoubleElementResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleElementResult data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleElementResult::Demarshall{{{1*/ -void DoubleElementResult::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION DoubleElementResult::MarshallSize{{{1*/ -int DoubleElementResult::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type) - +sizeof(time) - +sizeof(step) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -#endif /*FUNCTION DoubleElementResult::ObjectEnum{{{1*/ int DoubleElementResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 12014) @@ -35,9 +35,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 12014) @@ -67,61 +67,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION PentaP1ElementResult::Marshall{{{1*/ -void PentaP1ElementResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of PentaP1ElementResult: */ - enum_value=PentaP1ElementResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall PentaP1ElementResult data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION PentaP1ElementResult::MarshallSize{{{1*/ -int PentaP1ElementResult::MarshallSize(){ - - return sizeof(values)+ - +sizeof(enum_type) - +sizeof(time) - +sizeof(step) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION PentaP1ElementResult::Demarshall{{{1*/ -void PentaP1ElementResult::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); - memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION PentaP1ElementResult::ObjectEnum{{{1*/ int PentaP1ElementResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (revision 12014) @@ -34,9 +34,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12014) @@ -66,62 +66,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION TriaP1ElementResult::Marshall{{{1*/ -void TriaP1ElementResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of TriaP1ElementResult: */ - enum_value=TriaP1ElementResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall TriaP1ElementResult data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION TriaP1ElementResult::MarshallSize{{{1*/ -int TriaP1ElementResult::MarshallSize(){ - - return sizeof(values) - +sizeof(enum_type) - +sizeof(time) - +sizeof(step) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION TriaP1ElementResult::Demarshall{{{1*/ -void TriaP1ElementResult::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); - memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION TriaP1ElementResult::ObjectEnum{{{1*/ int TriaP1ElementResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (revision 12014) @@ -33,9 +33,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12014) @@ -142,161 +142,4 @@ } /*}}}*/ - -/*Marshall*/ -#ifdef _SERIAL_ -/*FUNCTION Penta::Marshall {{{1*/ -void Penta::Marshall(char** pmarshalled_dataset){ - - int i; - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - char* marshalled_results=NULL; - int marshalled_results_size; - int flaghook; //to indicate if hook is NULL or exists - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Penta: */ - enum_type=PentaEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Penta data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(marshalled_dataset,&numanalyses,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses); - - /*Mershall Ref: */ - for(i=0;iMarshall(&marshalled_dataset); - } - else{ - /*Set flag to 0 and do not marshall flag as there is no Hook */ - flaghook=0; - memcpy(marshalled_dataset,&flaghook,sizeof(flaghook));marshalled_dataset+=sizeof(flaghook); - } - } - hmatice->Marshall(&marshalled_dataset); - hmatpar->Marshall(&marshalled_dataset); - hneighbors->Marshall(&marshalled_dataset); - - /*Marshall inputs and results: */ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - marshalled_results_size=results->MarshallSize(); - marshalled_results=results->Marshall(); - memcpy(marshalled_dataset,marshalled_results,marshalled_results_size*sizeof(char)); - marshalled_dataset+=marshalled_results_size; - - /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/ - - xfree((void**)&marshalled_inputs); - xfree((void**)&marshalled_results); - - /*marshall horizontal neighbors: */ - memcpy(marshalled_dataset,horizontalneighborsids,3*sizeof(int));marshalled_dataset+=3*sizeof(int); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Penta::MarshallSize {{{1*/ -int Penta::MarshallSize(){ - - int i; - int hnodes_size=0;; - - for(i=0;iMarshallSize(); - } - - return sizeof(id) - +sizeof(sid) - +hnodes_size - +sizeof(numanalyses) - +numanalyses*sizeof(int) //element_type_lists - +hmatice->MarshallSize() - +hmatpar->MarshallSize() - +hneighbors->MarshallSize() - +inputs->MarshallSize() - +results->MarshallSize() - +3*sizeof(int) - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Penta::Demarshall {{{1*/ -void Penta::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - int flaghook; - - /*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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(&numanalyses,marshalled_dataset,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses); - - /*demarshall Ref: */ - this->element_type_list=(int*)xmalloc(this->numanalyses*sizeof(int)); - for(i=0;ihnodes=new Hook*[this->numanalyses]; - /*demarshall hooks: */ - for(i=0;iDemarshall(&marshalled_dataset); - } - else hnodes[i]=NULL; //There is no hook so it is NULL - } - hmatice=new Hook(); hmatice->Demarshall(&marshalled_dataset); - hmatpar=new Hook(); hmatpar->Demarshall(&marshalled_dataset); - hneighbors=new Hook(); hneighbors->Demarshall(&marshalled_dataset); - - /*pointers are garbage, until configuration is carried out: */ - nodes=NULL; - matice=NULL; - matpar=NULL; - verticalneighbors=NULL; - - /*demarshall inputs and results: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - results=(Results*)DataSetDemarshallRaw(&marshalled_dataset); - - /*parameters: may not exist even yet, so let Configure handle it: */ - this->parameters=NULL; - - /*neighbors: */ - memcpy(&this->horizontalneighborsids,marshalled_dataset,3*sizeof(int));marshalled_dataset+=3*sizeof(int); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*Other*/ Index: /issm/trunk-jpl/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Penta.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Elements/Penta.h (revision 12014) @@ -55,9 +55,4 @@ int ObjectEnum(); int Id(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int MyRank(); /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12014) @@ -122,158 +122,4 @@ } /*}}}*/ - -/*Marshall*/ -#ifdef _SERIAL_ -/*FUNCTION Tria::Marshall {{{1*/ -void Tria::Marshall(char** pmarshalled_dataset){ - - int i; - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - char* marshalled_results=NULL; - int marshalled_results_size; - int flaghook; //to indicate if hook is NULL or exists - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Tria: */ - enum_type=TriaEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Tria data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(marshalled_dataset,&numanalyses,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses); - - /*Mershall Ref: */ - for(i=0;iMarshall(&marshalled_dataset); - } - else{ - /*Set flag to 0 and do not marshall flag as there is no Hook */ - flaghook=0; - memcpy(marshalled_dataset,&flaghook,sizeof(flaghook));marshalled_dataset+=sizeof(flaghook); - } - } - hmatice->Marshall(&marshalled_dataset); - hmatpar->Marshall(&marshalled_dataset); - - /*Marshall inputs: */ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - /*Marshall results: */ - marshalled_results_size=results->MarshallSize(); - marshalled_results=results->Marshall(); - memcpy(marshalled_dataset,marshalled_results,marshalled_results_size*sizeof(char)); - marshalled_dataset+=marshalled_results_size; - - /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/ - - xfree((void**)&marshalled_inputs); - xfree((void**)&marshalled_results); - - /*marshall horizontal neighbors: */ - memcpy(marshalled_dataset,horizontalneighborsids,3*sizeof(int));marshalled_dataset+=3*sizeof(int); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Tria::MarshallSize {{{1*/ -int Tria::MarshallSize(){ - - int i; - int hnodes_size=0;; - - for(i=0;iMarshallSize(); - } - - return sizeof(id) - +sizeof(sid) - +hnodes_size - +sizeof(numanalyses) - +numanalyses*sizeof(int) //element_type_lists - +hmatice->MarshallSize() - +hmatpar->MarshallSize() - +inputs->MarshallSize() - +results->MarshallSize() - +3*sizeof(int) - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Tria::Demarshall {{{1*/ -void Tria::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - int flaghook; - - /*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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(&numanalyses,marshalled_dataset,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses); - - /*demarshall Ref: */ - this->element_type_list=(int*)xmalloc(this->numanalyses*sizeof(int)); - for(i=0;ihnodes=new Hook*[this->numanalyses]; - /*demarshall hooks: */ - for(i=0;iDemarshall(&marshalled_dataset); - } - else hnodes[i]=NULL; //There is no hook so it is NULL - } - hmatice=new Hook(); hmatice->Demarshall(&marshalled_dataset); - hmatpar=new Hook(); hmatpar->Demarshall(&marshalled_dataset); - - /*pointers are garbabe, until configuration is carried out: */ - nodes=NULL; - matice=NULL; - matpar=NULL; - - /*demarshall inputs: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - results=(Results*)DataSetDemarshallRaw(&marshalled_dataset); - - /*parameters: may not exist even yet, so let Configure handle it: */ - this->parameters=NULL; - - /*neighbors: */ - memcpy(&this->horizontalneighborsids,marshalled_dataset,3*sizeof(int));marshalled_dataset+=3*sizeof(int); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*Other*/ Index: /issm/trunk-jpl/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Tria.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Elements/Tria.h (revision 12014) @@ -51,9 +51,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12014) @@ -68,64 +68,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION BoolExternalResult::Marshall{{{1*/ -void BoolExternalResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of BoolExternalResult: */ - enum_value=BoolExternalResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall BoolExternalResult data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION BoolExternalResult::MarshallSize{{{1*/ -int BoolExternalResult::MarshallSize(){ - - return sizeof(value)+ - +sizeof(id) - +sizeof(enum_type) - +sizeof(step) - +sizeof(time) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION BoolExternalResult::Demarshall{{{1*/ -void BoolExternalResult::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION BoolExternalResult::ObjectEnum{{{1*/ int BoolExternalResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h (revision 12014) @@ -15,9 +15,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include -#endif - #include "./ExternalResult.h" @@ -47,9 +42,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); @@ -62,3 +52,3 @@ /*}}}*/ }; -#endif /* _BOOLEXTERNALRESULT_H */ +#endif Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12014) @@ -68,64 +68,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleExternalResult::Marshall{{{1*/ -void DoubleExternalResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleExternalResult: */ - enum_value=DoubleExternalResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleExternalResult data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleExternalResult::MarshallSize{{{1*/ -int DoubleExternalResult::MarshallSize(){ - - return sizeof(value)+ - +sizeof(id) - +sizeof(enum_type) - +sizeof(step) - +sizeof(time) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION DoubleExternalResult::Demarshall{{{1*/ -void DoubleExternalResult::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DoubleExternalResult::ObjectEnum{{{1*/ int DoubleExternalResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 12014) @@ -14,8 +14,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -48,9 +44,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12014) @@ -96,73 +96,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleMatExternalResult::Marshall{{{1*/ -void DoubleMatExternalResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleMatExternalResult: */ - enum_value=DoubleMatExternalResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleMatExternalResult data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - 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,&N,sizeof(N));marshalled_dataset+=sizeof(N); - memcpy(marshalled_dataset,values,M*sizeof(double));marshalled_dataset+=M*sizeof(double); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleMatExternalResult::MarshallSize{{{1*/ -int DoubleMatExternalResult::MarshallSize(){ - - return sizeof(M) - +sizeof(N) - +M*N*sizeof(double) - +sizeof(id) - +sizeof(enum_type) - +sizeof(step) - +sizeof(time) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION DoubleMatExternalResult::Demarshall{{{1*/ -void DoubleMatExternalResult::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*data: */ - memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M); - memcpy(&N,marshalled_dataset,sizeof(N));marshalled_dataset+=sizeof(N); - values=(double*)xmalloc(M*N*sizeof(double)); - memcpy(values,marshalled_dataset,M*N*sizeof(double));marshalled_dataset+=M*N*sizeof(double); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DoubleMatExternalResult::ObjectEnum{{{1*/ int DoubleMatExternalResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h (revision 12014) @@ -14,9 +14,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include -#endif - #include "./ExternalResult.h" @@ -49,9 +44,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12014) @@ -87,70 +87,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleVecExternalResult::Marshall{{{1*/ -void DoubleVecExternalResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleVecExternalResult: */ - enum_value=DoubleVecExternalResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleVecExternalResult data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - 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); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleVecExternalResult::MarshallSize{{{1*/ -int DoubleVecExternalResult::MarshallSize(){ - - return sizeof(M) - +M*sizeof(double) - +sizeof(id) - +sizeof(enum_type) - +sizeof(step) - +sizeof(time) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION DoubleVecExternalResult::Demarshall{{{1*/ -void DoubleVecExternalResult::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - 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); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DoubleVecExternalResult::ObjectEnum{{{1*/ int DoubleVecExternalResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 12014) @@ -14,9 +14,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include -#endif - #include "./ExternalResult.h" @@ -48,9 +43,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h (revision 12014) @@ -14,8 +14,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif Index: /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12014) @@ -68,64 +68,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION IntExternalResult::Marshall{{{1*/ -void IntExternalResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of IntExternalResult: */ - enum_value=IntExternalResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall IntExternalResult data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION IntExternalResult::MarshallSize{{{1*/ -int IntExternalResult::MarshallSize(){ - - return sizeof(value)+ - +sizeof(id) - +sizeof(enum_type) - +sizeof(step) - +sizeof(time) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION IntExternalResult::Demarshall{{{1*/ -void IntExternalResult::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION IntExternalResult::ObjectEnum{{{1*/ int IntExternalResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h (revision 12014) @@ -14,8 +14,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -46,9 +42,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12014) @@ -80,108 +80,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION PetscVecExternalResult::Marshall{{{1*/ -void PetscVecExternalResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - int M; - double* serial_value=NULL; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of PetscVecExternalResult: */ - enum_value=PetscVecExternalResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall PetscVecExternalResult data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - - if(value){ - VecGetSize(value,&M); - VecToMPISerial(&serial_value,value); - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - memcpy(marshalled_dataset,serial_value,M*sizeof(double));marshalled_dataset+=(M*sizeof(double)); - } - else{ - M=0; - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - } - /*Free ressources:*/ - xfree((void**)&serial_value); - - /*return:*/ - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION PetscVecExternalResult::MarshallSize{{{1*/ -int PetscVecExternalResult::MarshallSize(){ - - int M=0; - if(value)VecGetSize(value,&M); - - return sizeof(M)+M*sizeof(double) - +sizeof(id) - +sizeof(enum_type) - +sizeof(step) - +sizeof(time) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION PetscVecExternalResult::Demarshall{{{1*/ -void PetscVecExternalResult::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - int M; - double* serial_vec=NULL; - int* idxm=NULL; - - /*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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*data: */ - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M); - if(M){ - serial_vec=(double*)xmalloc(M*sizeof(double)); - memcpy(serial_vec,marshalled_dataset,M*sizeof(double));marshalled_dataset+=(M*sizeof(double)); - - value=NewVec(M); - idxm=(int*)xmalloc(M*sizeof(int)); - for(i=0;i -#endif - #include "./ExternalResult.h" @@ -48,9 +43,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12014) @@ -71,77 +71,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION StringExternalResult::Marshall{{{1*/ -void StringExternalResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - int stringsize; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of StringExternalResult: */ - enum_value=StringExternalResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - stringsize=strlen(this->value)+1; - - memcpy(marshalled_dataset,&stringsize,sizeof(stringsize));marshalled_dataset+=sizeof(stringsize); - memcpy(marshalled_dataset,this->value,stringsize*sizeof(char));marshalled_dataset+=stringsize*sizeof(char); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION StringExternalResult::MarshallSize{{{1*/ -int StringExternalResult::MarshallSize(){ - - int stringsize; - stringsize=strlen(this->value)+1; - - return sizeof(int)+ - +stringsize*sizeof(char) - +sizeof(id) - +sizeof(enum_type) - +sizeof(step) - +sizeof(time) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION StringExternalResult::Demarshall{{{1*/ -void StringExternalResult::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - int stringsize; - - /*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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - memcpy(&stringsize,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - - this->value=(char*)xmalloc(stringsize*sizeof(char)); - memcpy(value,marshalled_dataset,stringsize*sizeof(char));marshalled_dataset+=stringsize*sizeof(char); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION StringExternalResult::ObjectEnum{{{1*/ int StringExternalResult::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h (revision 12014) @@ -15,9 +15,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include -#endif - #include "./ExternalResult.h" @@ -48,9 +43,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Hook.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12014) @@ -118,91 +118,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Hook::Marshall{{{1*/ -void Hook::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - int i; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Hook: */ - enum_type=HookEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Hook data: */ - memcpy(marshalled_dataset,&num,sizeof(num));marshalled_dataset+=sizeof(num); - for(i=0;iids[i],sizeof(int));marshalled_dataset+=sizeof(int); - memcpy(marshalled_dataset,&this->offsets[i],sizeof(int));marshalled_dataset+=sizeof(int); - } - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Hook::MarshallSize{{{1*/ -int Hook::MarshallSize(){ - - return - sizeof(num)+ - num*sizeof(int)+ - num*sizeof(int)+ - sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Hook::Demarshall{{{1*/ -void Hook::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - int enum_type; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of object since Hook is not directly called by DataSet: */ - memcpy(&enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); - - memcpy(&num,marshalled_dataset,sizeof(num));marshalled_dataset+=sizeof(num); - - /*allocate: */ - if (num<0){ - _error_("cannot demarshall Hook as num<=0"); - } - else if (num==0){ - this->ids=NULL; - this->offsets=NULL; - this->objects=NULL; - } - else{ - - this->ids=(int*)xmalloc(num*sizeof(int)); - this->offsets=(int*)xmalloc(num*sizeof(int)); - - /*demarshall allocated ids and offsets: */ - _assert_(num<1000); - for (i=0;iids[i],marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - memcpy(&this->offsets[i],marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - } - - /*nullify object pointers */ - this->objects=(Object**)xmalloc(num*sizeof(Object*)); - for (i=0;iobjects[i]=NULL; - } - } - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Hook::copy {{{1*/ Object* Hook::copy(void){ Index: /issm/trunk-jpl/src/c/objects/Hook.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Hook.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Hook.h (revision 12014) @@ -34,9 +34,4 @@ void Echo(void); void DeepEcho(void); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif Object* copy(void); /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12014) @@ -59,55 +59,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION BoolInput::Marshall{{{1*/ -void BoolInput::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of BoolInput: */ - enum_value=BoolInputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall BoolInput data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION BoolInput::MarshallSize{{{1*/ -int BoolInput::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION BoolInput::Demarshall{{{1*/ -void BoolInput::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION BoolInput::ObjectEnum{{{1*/ int BoolInput::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h (revision 12014) @@ -31,9 +31,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12014) @@ -90,212 +90,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION ControlInput::Marshall{{{1*/ -void ControlInput::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - int flag; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of ControlInput: */ - enum_value=ControlInputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall enum_type: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&control_id,sizeof(control_id));marshalled_dataset+=sizeof(control_id); - - /*marshal values*/ - if(!values){ - flag=0; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - } - else{ - flag=1; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - this->values->Marshall(&marshalled_dataset); - } - - /*marshal savedvalues*/ - if(!savedvalues){ - flag=0; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - } - else{ - flag=1; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - this->savedvalues->Marshall(&marshalled_dataset); - } - - /*marshal minvalues*/ - if(!minvalues){ - flag=0; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - } - else{ - flag=1; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - this->minvalues->Marshall(&marshalled_dataset); - } - - /*marshal maxvalues*/ - if(!maxvalues){ - flag=0; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - } - else{ - flag=1; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - this->maxvalues->Marshall(&marshalled_dataset); - } - - /*marshal gradient*/ - if(!gradient){ - flag=0; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - } - else{ - flag=1; - memcpy(marshalled_dataset,&flag,sizeof(flag));marshalled_dataset+=sizeof(flag); - this->gradient->Marshall(&marshalled_dataset); - } - - /*clean up and assign output pointer*/ - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION ControlInput::MarshallSize{{{1*/ -int ControlInput::MarshallSize(){ - - int size=0; - - size=sizeof(enum_type)+ - +sizeof(control_id) - +5*sizeof(int) //5 flags - +sizeof(int); //sizeof(int) for enum value - - if(values) size+=values->MarshallSize(); - if(savedvalues)size+=savedvalues->MarshallSize(); - if(minvalues)size+=minvalues->MarshallSize(); - if(maxvalues)size+=maxvalues->MarshallSize(); - if(gradient) size+=gradient->MarshallSize(); - return size; -} -/*}}}*/ -/*FUNCTION ControlInput::Demarshall{{{1*/ -void ControlInput::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int flag,input_enum_type; - - /*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); - memcpy(&control_id,marshalled_dataset,sizeof(control_id));marshalled_dataset+=sizeof(control_id); - - /*Demarshal values*/ - memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - if(flag){ - memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); - if(input_enum_type==PentaP1InputEnum){ - values=new PentaP1Input(); - values->Demarshall(&marshalled_dataset); - } - else if(input_enum_type==TriaP1InputEnum){ - values=new TriaP1Input(); - values->Demarshall(&marshalled_dataset); - } - else _error_("Not supported yet"); - } - else{ - values=NULL; - } - - /*Demarshal savedvalues*/ - memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - if(flag){ - memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); - if(input_enum_type==PentaP1InputEnum){ - savedvalues=new PentaP1Input(); - savedvalues->Demarshall(&marshalled_dataset); - } - else if(input_enum_type==TriaP1InputEnum){ - savedvalues=new TriaP1Input(); - savedvalues->Demarshall(&marshalled_dataset); - } - else _error_("Not supported yet"); - } - else{ - savedvalues=NULL; - } - - /*Demarshal minvalues*/ - memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - if(flag){ - memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); - if(input_enum_type==PentaP1InputEnum){ - minvalues=new PentaP1Input(); - minvalues->Demarshall(&marshalled_dataset); - } - else if(input_enum_type==TriaP1InputEnum){ - minvalues=new TriaP1Input(); - minvalues->Demarshall(&marshalled_dataset); - } - else _error_("Not supported yet"); - } - else{ - minvalues=NULL; - } - - /*Demarshal maxvalues*/ - memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - if(flag){ - memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); - if(input_enum_type==PentaP1InputEnum){ - maxvalues=new PentaP1Input(); - maxvalues->Demarshall(&marshalled_dataset); - } - else if(input_enum_type==TriaP1InputEnum){ - maxvalues=new TriaP1Input(); - maxvalues->Demarshall(&marshalled_dataset); - } - else _error_("Not supported yet"); - } - else{ - maxvalues=NULL; - } - - /*Demarshal gradient*/ - memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - if(flag){ - memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); - if(input_enum_type==PentaP1InputEnum){ - gradient=new PentaP1Input(); - gradient->Demarshall(&marshalled_dataset); - } - else if(input_enum_type==TriaP1InputEnum){ - gradient=new TriaP1Input(); - gradient->Demarshall(&marshalled_dataset); - } - else _error_("Not supported yet"); - } - else{ - gradient=NULL; - } - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION ControlInput::ObjectEnum{{{1*/ int ControlInput::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 12014) @@ -35,9 +35,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12014) @@ -61,68 +61,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DatasetInput::Marshall{{{1*/ -void DatasetInput::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DatasetInput: */ - enum_value=DatasetInputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall enum_type: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshal inputs*/ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - /*clean up and assign output pointer*/ - xfree((void**)&marshalled_inputs); - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DatasetInput::MarshallSize{{{1*/ -int DatasetInput::MarshallSize(){ - - int size=0; - - size=sizeof(enum_type)+ - +inputs->MarshallSize() - +sizeof(int); //sizeof(int) for enum value - - return size; -} -/*}}}*/ -/*FUNCTION DatasetInput::Demarshall{{{1*/ -void DatasetInput::Demarshall(char** pmarshalled_dataset){ - char* marshalled_dataset=NULL; - - /*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); - - /*Demarshal values*/ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DatasetInput::ObjectEnum{{{1*/ int DatasetInput::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.h (revision 12014) @@ -31,9 +31,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12014) @@ -59,55 +59,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleInput::Marshall{{{1*/ -void DoubleInput::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleInput: */ - enum_value=DoubleInputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleInput data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleInput::MarshallSize{{{1*/ -int DoubleInput::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION DoubleInput::Demarshall{{{1*/ -void DoubleInput::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DoubleInput::ObjectEnum{{{1*/ int DoubleInput::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h (revision 12014) @@ -30,9 +30,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12014) @@ -54,55 +54,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION IntInput::Marshall{{{1*/ -void IntInput::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of IntInput: */ - enum_value=IntInputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall IntInput data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION IntInput::MarshallSize{{{1*/ -int IntInput::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION IntInput::Demarshall{{{1*/ -void IntInput::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION IntInput::ObjectEnum{{{1*/ int IntInput::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/IntInput.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/IntInput.h (revision 12014) @@ -31,9 +31,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12014) @@ -70,55 +70,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION PentaP1Input::Marshall{{{1*/ -void PentaP1Input::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of PentaP1Input: */ - enum_value=PentaP1InputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall PentaP1Input data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION PentaP1Input::MarshallSize{{{1*/ -int PentaP1Input::MarshallSize(){ - - return sizeof(values)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION PentaP1Input::Demarshall{{{1*/ -void PentaP1Input::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); - memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION PentaP1Input::ObjectEnum{{{1*/ int PentaP1Input::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 12014) @@ -31,9 +31,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12014) @@ -114,77 +114,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION TransientInput::Marshall{{{1*/ -void TransientInput::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of TransientInput: */ - enum_value=TransientInputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall TransientInput data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&numtimesteps,sizeof(numtimesteps));marshalled_dataset+=sizeof(numtimesteps); - memcpy(marshalled_dataset,timesteps,numtimesteps*sizeof(double));marshalled_dataset+=numtimesteps*sizeof(double); - - /*marshal inputs*/ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - /*clean up and assign output pointer*/ - xfree((void**)&marshalled_inputs); - *pmarshalled_dataset=marshalled_dataset; - -} -/*}}}* -/*FUNCTION TransientInput::MarshallSize{{{1*/ -int TransientInput::MarshallSize(){ - - return - +sizeof(enum_type)+ - +sizeof(numtimesteps)+ - +inputs->MarshallSize() - +numtimesteps*sizeof(double)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION TransientInput::Demarshall{{{1*/ -void TransientInput::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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); - memcpy(&numtimesteps,marshalled_dataset,sizeof(numtimesteps));marshalled_dataset+=sizeof(numtimesteps); - - /*allocate: */ - timesteps=(double*)xmalloc(numtimesteps*sizeof(double)); - memcpy(timesteps,marshalled_dataset,numtimesteps*sizeof(double));marshalled_dataset+=numtimesteps*sizeof(double); - - /*Demarshal values*/ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; - -} -/*}}}*/ -#endif /*FUNCTION TransientInput::ObjectEnum{{{1*/ int TransientInput::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12014) @@ -34,9 +34,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12014) @@ -70,55 +70,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION TriaP1Input::Marshall{{{1*/ -void TriaP1Input::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of TriaP1Input: */ - enum_value=TriaP1InputEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall TriaP1Input data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION TriaP1Input::MarshallSize{{{1*/ -int TriaP1Input::MarshallSize(){ - - return sizeof(values)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION TriaP1Input::Demarshall{{{1*/ -void TriaP1Input::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); - memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION TriaP1Input::ObjectEnum{{{1*/ int TriaP1Input::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 12014) @@ -31,9 +31,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12014) @@ -163,92 +163,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Icefront::Marshall {{{1*/ -void Icefront::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Icefront: */ - enum_type=IcefrontEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Icefront data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*Marshall hooks: */ - hnodes->Marshall(&marshalled_dataset); - helement->Marshall(&marshalled_dataset); - hmatpar->Marshall(&marshalled_dataset); - - /*Marshall inputs: */ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/ - - xfree((void**)&marshalled_inputs); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION Icefront::MarshallSize {{{1*/ -int Icefront::MarshallSize(){ - - return sizeof(id) - +sizeof(analysis_type) - +hnodes->MarshallSize() - +helement->MarshallSize() - +hmatpar->MarshallSize() - +inputs->MarshallSize() - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Icefront::Demarshall {{{1*/ -void Icefront::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*demarshall hooks: */ - hnodes=new Hook(); hnodes->Demarshall(&marshalled_dataset); - helement=new Hook(); helement->Demarshall(&marshalled_dataset); - hmatpar=new Hook(); hmatpar->Demarshall(&marshalled_dataset); - - /*pointers are garbabe, until configuration is carried out: */ - nodes=NULL; - element=NULL; - matpar=NULL; - - /*demarshall inputs: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*parameters: may not exist even yet, so let Configure handle it: */ - this->parameters=NULL; - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Icefront::ObjectEnum{{{1*/ int Icefront::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Loads/Icefront.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 12014) @@ -49,9 +49,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp (revision 12014) @@ -189,87 +189,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Numericalflux::Marshall {{{1*/ -void Numericalflux::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Numericalflux: */ - enum_type=NumericalfluxEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Numericalflux data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*Marshall hooks: */ - hnodes->Marshall(&marshalled_dataset); - helement->Marshall(&marshalled_dataset); - - /*Marshall inputs: */ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/ - - xfree((void**)&marshalled_inputs); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Numericalflux::MarshallSize{{{1*/ -int Numericalflux::MarshallSize(){ - - return sizeof(id) - +sizeof(analysis_type) - +hnodes->MarshallSize() - +helement->MarshallSize() - +inputs->MarshallSize() - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Numericalflux::Demarshall {{{1*/ -void Numericalflux::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*demarshall hooks: */ - hnodes=new Hook(); hnodes->Demarshall(&marshalled_dataset); - helement=new Hook(); helement->Demarshall(&marshalled_dataset); - - /*demarshall inputs: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*parameters: may not exist even yet, so let Configure handle it: */ - this->parameters=NULL; - this->element=NULL; - this->nodes=NULL; - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Numericalflux::ObjectEnum{{{1*/ int Numericalflux::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h (revision 12014) @@ -45,9 +45,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12014) @@ -132,98 +132,4 @@ } /*}}}1*/ -#ifdef _SERIAL_ -/*FUNCTION Pengrid::Marshall {{{1*/ -void Pengrid::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Tria: */ - enum_type=PengridEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Tria data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - memcpy(marshalled_dataset,&active,sizeof(active));marshalled_dataset+=sizeof(active); - memcpy(marshalled_dataset,&zigzag_counter,sizeof(zigzag_counter));marshalled_dataset+=sizeof(zigzag_counter); - - /*Marshall hooks: */ - hnode->Marshall(&marshalled_dataset); - helement->Marshall(&marshalled_dataset); - hmatpar->Marshall(&marshalled_dataset); - - /*Marshall inputs: */ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/ - - xfree((void**)&marshalled_inputs); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Pengrid::MarshallSize {{{1*/ -int Pengrid::MarshallSize(){ - - return sizeof(id) - +sizeof(analysis_type) - +sizeof(active) - +sizeof(zigzag_counter) - +hnode->MarshallSize() - +helement->MarshallSize() - +hmatpar->MarshallSize() - +inputs->MarshallSize() - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Pengrid::Demarshall {{{1*/ -void Pengrid::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - memcpy(&active,marshalled_dataset,sizeof(active));marshalled_dataset+=sizeof(active); - memcpy(&zigzag_counter,marshalled_dataset,sizeof(zigzag_counter));marshalled_dataset+=sizeof(zigzag_counter); - - /*demarshall hooks: */ - hnode=new Hook(); hnode->Demarshall(&marshalled_dataset); - helement=new Hook(); helement->Demarshall(&marshalled_dataset); - hmatpar=new Hook(); hmatpar->Demarshall(&marshalled_dataset); - - /*demarshall inputs: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*parameters: may not exist even yet, so let Configure handle it: */ - this->parameters=NULL; - this->node=NULL; - this->element=NULL; - this->matpar=NULL; - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Pengrid::ObjectEnum{{{1*/ int Pengrid::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h (revision 12014) @@ -50,9 +50,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12014) @@ -85,67 +85,4 @@ } /*}}}1*/ -#ifdef _SERIAL_ -/*FUNCTION Penpair::Marshall {{{1*/ -void Penpair::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Penpair: */ - enum_type=PenpairEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Penpair data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*Marshall hooks*/ - hnodes->Marshall(&marshalled_dataset); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -/*FUNCTION Penpair::MarshallSize {{{1*/ -int Penpair::MarshallSize(){ - - return sizeof(id)+ - +sizeof(analysis_type) - +hnodes->MarshallSize() - +sizeof(int); //sizeof(int) for enum type -} -/*}}}1*/ -/*FUNCTION Penpair::Demarshall {{{1*/ -void Penpair::Demarshall(char** pmarshalled_dataset){ - - int i; - char* marshalled_dataset=NULL; - - /*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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - - /*demarshall hooks: */ - hnodes=new Hook(); hnodes->Demarshall(&marshalled_dataset); - - /*pointers are garbabe, until configuration is carried out: */ - nodes=NULL; - parameters=NULL; - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -#endif /*FUNCTION Penpair::ObjectEnum{{{1*/ int Penpair::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Loads/Penpair.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Penpair.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Penpair.h (revision 12014) @@ -37,9 +37,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12014) @@ -192,123 +192,4 @@ } /*}}}1*/ -#ifdef _SERIAL_ -/*FUNCTION Riftfront::Marshall {{{1*/ -void Riftfront::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Riftfront: */ - enum_type=RiftfrontEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Riftfront data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - memcpy(marshalled_dataset,&active,sizeof(active));marshalled_dataset+=sizeof(active); - memcpy(marshalled_dataset,&normal,sizeof(normal));marshalled_dataset+=sizeof(normal); - memcpy(marshalled_dataset,&length,sizeof(length));marshalled_dataset+=sizeof(length); - memcpy(marshalled_dataset,&fraction,sizeof(fraction));marshalled_dataset+=sizeof(fraction); - memcpy(marshalled_dataset,&frozen,sizeof(frozen));marshalled_dataset+=sizeof(frozen); - memcpy(marshalled_dataset,&state,sizeof(state));marshalled_dataset+=sizeof(state); - memcpy(marshalled_dataset,&counter,sizeof(counter));marshalled_dataset+=sizeof(counter); - memcpy(marshalled_dataset,&prestable,sizeof(prestable));marshalled_dataset+=sizeof(prestable); - memcpy(marshalled_dataset,&penalty_lock,sizeof(penalty_lock));marshalled_dataset+=sizeof(penalty_lock); - memcpy(marshalled_dataset,&material_converged,sizeof(material_converged));marshalled_dataset+=sizeof(material_converged); - - /*Marshall hooks: */ - hnodes->Marshall(&marshalled_dataset); - helements->Marshall(&marshalled_dataset); - hmatpar->Marshall(&marshalled_dataset); - - /*Marshall inputs: */ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/ - - xfree((void**)&marshalled_inputs); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Riftfront::MarshallSize {{{1*/ -int Riftfront::MarshallSize(){ - - return sizeof(id) - +sizeof(analysis_type) - +sizeof(active) - +sizeof(normal) - +sizeof(length) - +sizeof(fraction) - +sizeof(frozen) - +sizeof(state) - +sizeof(counter) - +sizeof(prestable) - +sizeof(penalty_lock) - +sizeof(material_converged) - +hnodes->MarshallSize() - +helements->MarshallSize() - +hmatpar->MarshallSize() - +inputs->MarshallSize() - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Riftfront::Demarshall {{{1*/ -void Riftfront::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - memcpy(&active,marshalled_dataset,sizeof(active));marshalled_dataset+=sizeof(active); - memcpy(&normal,marshalled_dataset,sizeof(normal));marshalled_dataset+=sizeof(normal); - memcpy(&length,marshalled_dataset,sizeof(length));marshalled_dataset+=sizeof(length); - memcpy(&fraction,marshalled_dataset,sizeof(fraction));marshalled_dataset+=sizeof(fraction); - memcpy(&frozen,marshalled_dataset,sizeof(frozen));marshalled_dataset+=sizeof(frozen); - memcpy(&state,marshalled_dataset,sizeof(state));marshalled_dataset+=sizeof(state); - memcpy(&counter,marshalled_dataset,sizeof(counter));marshalled_dataset+=sizeof(counter); - memcpy(&prestable,marshalled_dataset,sizeof(prestable));marshalled_dataset+=sizeof(prestable); - memcpy(&penalty_lock,marshalled_dataset,sizeof(penalty_lock));marshalled_dataset+=sizeof(penalty_lock); - memcpy(&material_converged,marshalled_dataset,sizeof(material_converged));marshalled_dataset+=sizeof(material_converged); - - /*demarshall hooks: */ - hnodes=new Hook(); hnodes->Demarshall(&marshalled_dataset); - helements=new Hook(); helements->Demarshall(&marshalled_dataset); - hmatpar=new Hook(); hmatpar->Demarshall(&marshalled_dataset); - - /*pointers are garbabe, until configuration is carried out: */ - nodes=NULL; - elements=NULL; - matpar=NULL; - - /*demarshall inputs: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*parameters: may not exist even yet, so let Configure handle it: */ - this->parameters=NULL; - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -#endif /*FUNCTION Riftfront::ObjectEnum{{{1*/ int Riftfront::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 12014) @@ -57,9 +57,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12014) @@ -88,74 +88,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Matice::Marshall {{{1*/ -void Matice::Marshall(char** pmarshalled_dataset){ - - /*Intermediaries*/ - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputs_size; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Matice: */ - enum_type=MaticeEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Matice data: */ - memcpy(marshalled_dataset,&mid,sizeof(mid));marshalled_dataset+=sizeof(mid); - - /*Marshall hooks: */ - helement->Marshall(&marshalled_dataset); - - /*Marshall inputs: */ - marshalled_inputs_size=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char)); - marshalled_dataset+=marshalled_inputs_size; - - *pmarshalled_dataset=marshalled_dataset; - - /*clean up and return*/ - xfree((void**)&marshalled_inputs); -} -/*}}}*/ -/*FUNCTION Matice::MarshallSize{{{1*/ -int Matice::MarshallSize(){ - - return sizeof(mid) - +helement->MarshallSize() - +inputs->MarshallSize() - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Matice::Demarshall {{{1*/ -void Matice::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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(&mid,marshalled_dataset,sizeof(mid));marshalled_dataset+=sizeof(mid); - - /*demarshall hooks: */ - helement=new Hook(); helement->Demarshall(&marshalled_dataset); - - /*demarshall inputs: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Matice::ObjectEnum{{{1*/ int Matice::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Materials/Matice.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matice.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Materials/Matice.h (revision 12014) @@ -35,9 +35,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12014) @@ -102,89 +102,4 @@ } /*}}}1*/ -#ifdef _SERIAL_ -/*FUNCTION Matpar::Marshall {{{1*/ -void Matpar::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Matpar: */ - enum_type=MatparEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Matpar data: */ - memcpy(marshalled_dataset,&mid,sizeof(mid));marshalled_dataset+=sizeof(mid); - memcpy(marshalled_dataset,&rho_ice,sizeof(rho_ice));marshalled_dataset+=sizeof(rho_ice); - memcpy(marshalled_dataset,&rho_water,sizeof(rho_water));marshalled_dataset+=sizeof(rho_water); - memcpy(marshalled_dataset,&mu_water,sizeof(mu_water));marshalled_dataset+=sizeof(mu_water); - memcpy(marshalled_dataset,&heatcapacity,sizeof(heatcapacity));marshalled_dataset+=sizeof(heatcapacity); - memcpy(marshalled_dataset,&thermalconductivity,sizeof(thermalconductivity));marshalled_dataset+=sizeof(thermalconductivity); - memcpy(marshalled_dataset,&latentheat,sizeof(latentheat));marshalled_dataset+=sizeof(latentheat); - memcpy(marshalled_dataset,&beta,sizeof(beta));marshalled_dataset+=sizeof(beta); - memcpy(marshalled_dataset,&meltingpoint,sizeof(meltingpoint));marshalled_dataset+=sizeof(meltingpoint); - memcpy(marshalled_dataset,&referencetemperature,sizeof(referencetemperature));marshalled_dataset+=sizeof(referencetemperature); - memcpy(marshalled_dataset,&mixed_layer_capacity,sizeof(mixed_layer_capacity));marshalled_dataset+=sizeof(mixed_layer_capacity); - memcpy(marshalled_dataset,&thermal_exchange_velocity,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity); - memcpy(marshalled_dataset,&g,sizeof(g));marshalled_dataset+=sizeof(g); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -/*FUNCTION Matpar::MarshallSize {{{1*/ -int Matpar::MarshallSize(){ - - return sizeof(mid)+ - sizeof(rho_ice)+ - sizeof(rho_water)+ - sizeof(mu_water)+ - sizeof(heatcapacity)+ - sizeof(thermalconductivity)+ - sizeof(latentheat)+ - sizeof(beta)+ - sizeof(meltingpoint)+ - sizeof(referencetemperature)+ - sizeof(mixed_layer_capacity)+ - sizeof(thermal_exchange_velocity)+ - sizeof(g)+ - sizeof(int); //sizeof(int) for enum type -} -/*}}}1*/ -/*FUNCTION Matpar::Demarshall {{{1*/ -void Matpar::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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(&mid,marshalled_dataset,sizeof(mid));marshalled_dataset+=sizeof(mid); - memcpy(&rho_ice,marshalled_dataset,sizeof(rho_ice));marshalled_dataset+=sizeof(rho_ice); - memcpy(&rho_water,marshalled_dataset,sizeof(rho_water));marshalled_dataset+=sizeof(rho_water); - memcpy(&mu_water,marshalled_dataset,sizeof(mu_water));marshalled_dataset+=sizeof(mu_water); - memcpy(&heatcapacity,marshalled_dataset,sizeof(heatcapacity));marshalled_dataset+=sizeof(heatcapacity); - memcpy(&thermalconductivity,marshalled_dataset,sizeof(thermalconductivity));marshalled_dataset+=sizeof(thermalconductivity); - memcpy(&latentheat,marshalled_dataset,sizeof(latentheat));marshalled_dataset+=sizeof(latentheat); - memcpy(&beta,marshalled_dataset,sizeof(beta));marshalled_dataset+=sizeof(beta); - memcpy(&meltingpoint,marshalled_dataset,sizeof(meltingpoint));marshalled_dataset+=sizeof(meltingpoint); - memcpy(&referencetemperature,marshalled_dataset,sizeof(referencetemperature));marshalled_dataset+=sizeof(referencetemperature); - memcpy(&mixed_layer_capacity,marshalled_dataset,sizeof(mixed_layer_capacity));marshalled_dataset+=sizeof(mixed_layer_capacity); - memcpy(&thermal_exchange_velocity,marshalled_dataset,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity); - memcpy(&g,marshalled_dataset,sizeof(g));marshalled_dataset+=sizeof(g); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}1*/ -#endif /*FUNCTION Matpar::ObjectEnum{{{1*/ int Matpar::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Materials/Matpar.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matpar.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Materials/Matpar.h (revision 12014) @@ -46,9 +46,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Node.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Node.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Node.cpp (revision 12014) @@ -193,87 +193,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Node::Marshall{{{1*/ -void Node::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - char* marshalled_inputs=NULL; - int marshalled_inputssize; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Node: */ - enum_type=NodeEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Node data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - memcpy(marshalled_dataset,&coord_system,9*sizeof(double));marshalled_dataset+=9*sizeof(double); - - /*marshall objects: */ - indexing.Marshall(&marshalled_dataset); - hvertex->Marshall(&marshalled_dataset); - - /*Marshall inputs: */ - marshalled_inputssize=inputs->MarshallSize(); - marshalled_inputs=inputs->Marshall(); - memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputssize*sizeof(char)); - marshalled_dataset+=marshalled_inputssize; - - /*Free ressources:*/ - xfree((void**)&marshalled_inputs); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Node::MarshallSize{{{1*/ -int Node::MarshallSize(){ - - return sizeof(id)+ - sizeof(sid)+ - indexing.MarshallSize()+ - hvertex->MarshallSize()+ - inputs->MarshallSize()+ - sizeof(analysis_type)+ - 9*sizeof(double)+ - sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Node::Demarshall{{{1*/ -void Node::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - - /*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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type); - memcpy(&coord_system,marshalled_dataset,9*sizeof(double));marshalled_dataset+=9*sizeof(double); - - /*demarshall objects: */ - indexing.Demarshall(&marshalled_dataset); - hvertex=new Hook(); hvertex->Demarshall(&marshalled_dataset); - - /*demarshall inputs: */ - inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Node::ObjectEnum{{{1*/ int Node::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Node.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Node.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Node.h (revision 12014) @@ -44,9 +44,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(){_error_("Not implemented yet (similar to Elements)");}; Index: /issm/trunk-jpl/src/c/objects/Numerics/Vector.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/Vector.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Numerics/Vector.h (revision 12014) @@ -21,8 +21,4 @@ #endif -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include "mex.h" -#endif - /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Object.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Object.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Object.h (revision 12014) @@ -21,9 +21,4 @@ virtual int Id()=0; virtual int MyRank()=0; - #ifdef _SERIAL_ - virtual void Marshall(char** pmarshalled_dataset)=0; - virtual int MarshallSize()=0; - virtual void Demarshall(char** pmarshalled_dataset)=0; - #endif virtual int ObjectEnum()=0; virtual Object* copy()=0; Index: /issm/trunk-jpl/src/c/objects/Options/Option.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/Option.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Options/Option.h (revision 12014) @@ -33,9 +33,4 @@ int Id(){_error_("Not implemented yet");}; int MyRank(){_error_("Not implemented yet");}; - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - int MarshallSize(){_error_("Not implemented yet");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - #endif int ObjectEnum(){return OptionEnum;}; Object* copy(){_error_("Not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Options/OptionCell.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionCell.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Options/OptionCell.h (revision 12014) @@ -30,9 +30,4 @@ int Id(){_error_("Not implemented yet");}; int MyRank(){_error_("Not implemented yet");}; - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - int MarshallSize(){_error_("Not implemented yet");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - #endif int ObjectEnum(){return OptionCellEnum;}; Object* copy(){_error_("Not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Options/OptionChar.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionChar.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Options/OptionChar.h (revision 12014) @@ -30,9 +30,4 @@ int Id(){_error_("Not implemented yet");}; int MyRank(){_error_("Not implemented yet");}; - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - int MarshallSize(){_error_("Not implemented yet");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - #endif int ObjectEnum(){return OptionCharEnum;}; Object* copy(){_error_("Not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Options/OptionDouble.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionDouble.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Options/OptionDouble.h (revision 12014) @@ -30,9 +30,4 @@ int Id(){_error_("Not implemented yet");}; int MyRank(){_error_("Not implemented yet");}; - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - int MarshallSize(){_error_("Not implemented yet");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - #endif int ObjectEnum(){return OptionDoubleEnum;}; Object* copy(){_error_("Not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Options/OptionLogical.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionLogical.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Options/OptionLogical.h (revision 12014) @@ -30,9 +30,4 @@ int Id(){_error_("Not implemented yet");}; int MyRank(){_error_("Not implemented yet");}; - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - int MarshallSize(){_error_("Not implemented yet");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - #endif int ObjectEnum(){return OptionLogicalEnum;}; Object* copy(){_error_("Not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Options/OptionStruct.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionStruct.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Options/OptionStruct.h (revision 12014) @@ -30,9 +30,4 @@ int Id(){_error_("Not implemented yet");}; int MyRank(){_error_("Not implemented yet");}; - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - int MarshallSize(){_error_("Not implemented yet");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; - #endif int ObjectEnum(){return OptionStructEnum;}; Object* copy(){_error_("Not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12014) @@ -62,55 +62,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION BoolParam::Marshall{{{1*/ -void BoolParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of BoolParam: */ - enum_value=BoolParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall BoolParam data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION BoolParam::MarshallSize{{{1*/ -int BoolParam::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION BoolParam::Demarshall{{{1*/ -void BoolParam::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION BoolParam::ObjectEnum{{{1*/ int BoolParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/BoolParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -41,9 +37,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12014) @@ -127,111 +127,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleMatArrayParam::Marshall{{{1*/ -void DoubleMatArrayParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - int i; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleMatArrayParam: */ - enum_value=DoubleMatArrayParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleMatArrayParam data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - if(M){ - memcpy(marshalled_dataset,mdim_array,M*sizeof(int));marshalled_dataset+=M*sizeof(int); - memcpy(marshalled_dataset,ndim_array,M*sizeof(int));marshalled_dataset+=M*sizeof(int); - for(i=0;iarray[i]; - int m=this->mdim_array[i]; - int n=this->ndim_array[i]; - memcpy(marshalled_dataset,&m,sizeof(m));marshalled_dataset+=sizeof(m); - memcpy(marshalled_dataset,&n,sizeof(n));marshalled_dataset+=sizeof(n); - if(m*n)memcpy(marshalled_dataset,matrix,m*n*sizeof(double));marshalled_dataset+=m*n*sizeof(double); - } - } - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleMatArrayParam::MarshallSize{{{1*/ -int DoubleMatArrayParam::MarshallSize(){ - - int size=0; - int i; - - size+=sizeof(enum_type)+ - sizeof(M)+ - M*sizeof(int)+ - M*sizeof(int); - - for(i=0;imdim_array[i]; - int n=this->ndim_array[i]; - size+=sizeof(m)+sizeof(n)+m*n*sizeof(double); - } - size+=sizeof(int); //sizeof(int) for enum value - - return size; -} -/*}}}*/ -/*FUNCTION DoubleMatArrayParam::Demarshall{{{1*/ -void DoubleMatArrayParam::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - double* matrix=NULL; - int m,n; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*this time, no need to get enum value, the pointer directly points to the beginning of the - *object data (thanks to DataSet::Demarshall):*/ - - /*data: */ - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M); - if(M){ - this->mdim_array=(int*)xmalloc(M*sizeof(int)); - this->ndim_array=(int*)xmalloc(M*sizeof(int)); - memcpy(this->mdim_array,marshalled_dataset,M*sizeof(int));marshalled_dataset+=M*sizeof(int); - memcpy(this->ndim_array,marshalled_dataset,M*sizeof(int));marshalled_dataset+=M*sizeof(int); - - this->array=(double**)xmalloc(M*sizeof(double*)); - for(i=0;iarray[i]=matrix; - } - } - else{ - this->array=NULL; - this->mdim_array=NULL; - this->ndim_array=NULL; - } - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DoubleMatArrayParam::ObjectEnum{{{1*/ int DoubleMatArrayParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -44,9 +40,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12014) @@ -78,64 +78,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleMatParam::Marshall{{{1*/ -void DoubleMatParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleMatParam: */ - enum_value=DoubleMatParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleMatParam 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,&N,sizeof(N));marshalled_dataset+=sizeof(N); - memcpy(marshalled_dataset,value,M*N*sizeof(double));marshalled_dataset+=M*N*sizeof(double); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleMatParam::MarshallSize{{{1*/ -int DoubleMatParam::MarshallSize(){ - - return sizeof(M) - +sizeof(N) - +M*N*sizeof(double) - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION DoubleMatParam::Demarshall{{{1*/ -void DoubleMatParam::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); - memcpy(&N,marshalled_dataset,sizeof(N));marshalled_dataset+=sizeof(N); - value=(double*)xmalloc(M*N*sizeof(double)); - memcpy(value,marshalled_dataset,M*N*sizeof(double));marshalled_dataset+=M*N*sizeof(double); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DoubleMatParam::ObjectEnum{{{1*/ int DoubleMatParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -43,9 +39,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12014) @@ -59,55 +59,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION DoubleParam::Marshall{{{1*/ -void DoubleParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleParam: */ - enum_value=DoubleParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleParam data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleParam::MarshallSize{{{1*/ -int DoubleParam::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION DoubleParam::Demarshall{{{1*/ -void DoubleParam::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION DoubleParam::ObjectEnum{{{1*/ int DoubleParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -42,9 +38,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif Index: /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12014) @@ -75,61 +75,4 @@ } /*}}}*/ -#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){ Index: /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -42,9 +38,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/FileParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12014) @@ -62,22 +62,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION FileParam::Marshall{{{1*/ -void FileParam::Marshall(char** pmarshalled_dataset){ - - _error_("FileParam is a pointer and cannot be marshalled"); -} -/*}}}*/ -/*FUNCTION FileParam::MarshallSize{{{1*/ -int FileParam::MarshallSize(){ - _error_("FileParam is a pointer and cannot be marshalled"); -} -/*}}}*/ -/*FUNCTION FileParam::Demarshall{{{1*/ -void FileParam::Demarshall(char** pmarshalled_dataset){ - _error_("FileParam is a pointer and cannot be marshalled"); -} -/*}}}*/ -#endif /*FUNCTION FileParam::ObjectEnum{{{1*/ int FileParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/FileParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/FileParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/FileParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -41,9 +37,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12014) @@ -78,64 +78,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION IntMatParam::Marshall{{{1*/ -void IntMatParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of IntMatParam: */ - enum_value=IntMatParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall IntMatParam 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,&N,sizeof(N));marshalled_dataset+=sizeof(N); - memcpy(marshalled_dataset,value,M*N*sizeof(int));marshalled_dataset+=M*N*sizeof(int); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION IntMatParam::MarshallSize{{{1*/ -int IntMatParam::MarshallSize(){ - - return sizeof(M) - +sizeof(N) - +M*N*sizeof(int) - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION IntMatParam::Demarshall{{{1*/ -void IntMatParam::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); - memcpy(&N,marshalled_dataset,sizeof(N));marshalled_dataset+=sizeof(N); - value=(int*)xmalloc(M*N*sizeof(int)); - memcpy(value,marshalled_dataset,M*N*sizeof(int));marshalled_dataset+=M*N*sizeof(int); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION IntMatParam::ObjectEnum{{{1*/ int IntMatParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -43,9 +39,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12014) @@ -62,55 +62,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION IntParam::Marshall{{{1*/ -void IntParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of IntParam: */ - enum_value=IntParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall IntParam data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION IntParam::MarshallSize{{{1*/ -int IntParam::MarshallSize(){ - - return sizeof(value)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION IntParam::Demarshall{{{1*/ -void IntParam::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); - memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION IntParam::ObjectEnum{{{1*/ int IntParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/IntParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/IntParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -42,9 +38,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12014) @@ -91,63 +91,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION IntVecParam::Marshall{{{1*/ -void IntVecParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of IntVecParam: */ - enum_value=IntVecParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall IntVecParam data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - if(M)memcpy(marshalled_dataset,values,M*sizeof(int));marshalled_dataset+=M*sizeof(int); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION IntVecParam::MarshallSize{{{1*/ -int IntVecParam::MarshallSize(){ - - return sizeof(M)+ - +M*sizeof(int) - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION IntVecParam::Demarshall{{{1*/ -void IntVecParam::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); - if(M) { - values=(int*)xmalloc(M*sizeof(int)); - memcpy(values,marshalled_dataset,M*sizeof(int));marshalled_dataset+=M*sizeof(int); - } - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION IntVecParam::ObjectEnum{{{1*/ int IntVecParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/IntVecParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -43,9 +39,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12014) @@ -70,93 +70,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION MatrixParam::Marshall{{{1*/ -void MatrixParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - int M,N; - double* serial_mat=NULL; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of MatrixParam: */ - enum_value=MatrixParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall MatrixParam data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - if(value){ - value->GetSize(&M,&N); - serial_mat=value->ToSerial(); - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - memcpy(marshalled_dataset,&N,sizeof(N));marshalled_dataset+=sizeof(N); - memcpy(marshalled_dataset,serial_mat,M*N*sizeof(double));marshalled_dataset+=(M*N*sizeof(double)); - } - else{ - M=0; - N=0; - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - memcpy(marshalled_dataset,&N,sizeof(N));marshalled_dataset+=sizeof(N); - } - - /*Free ressources:*/ - xfree((void**)&serial_mat); - - /*return:*/ - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION MatrixParam::MarshallSize{{{1*/ -int MatrixParam::MarshallSize(){ - - int M=0; - int N=0; - if(value)value->GetSize(&M,&N); - - return sizeof(M)+ - sizeof(N)+ - M*N*sizeof(double)+ - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION MatrixParam::Demarshall{{{1*/ -void MatrixParam::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int M,N; - double* serial_mat=NULL; - - /*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); - memcpy(&N,marshalled_dataset,sizeof(N));marshalled_dataset+=sizeof(N); - if(M!=0 && N!=0){ - serial_mat=(double*)xmalloc(M*N*sizeof(double)); - memcpy(serial_mat,marshalled_dataset,M*N*sizeof(double));marshalled_dataset+=(M*N*sizeof(double)); - value=new Matrix(serial_mat,M,N,.001); - } - else{ - value=NULL; - } - - /*Free ressources:*/ - xfree((void**)&serial_mat); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -#endif /*FUNCTION MatrixParam::ObjectEnum{{{1*/ int MatrixParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/MatrixParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/MatrixParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/MatrixParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -42,9 +38,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/Param.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/Param.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/Param.h (revision 12014) @@ -14,8 +14,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif Index: /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12014) @@ -92,96 +92,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION StringArrayParam::Marshall{{{1*/ -void StringArrayParam::Marshall(char** pmarshalled_dataset){ - - int i; - char* marshalled_dataset=NULL; - int enum_value=0; - int stringsize; - char* string=NULL; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of StringArrayParam: */ - enum_value=StringArrayParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&numstrings,sizeof(numstrings));marshalled_dataset+=sizeof(numstrings); - for(i=0;ivalue[i]; - stringsize=strlen(string)+1; - - memcpy(marshalled_dataset,&stringsize,sizeof(stringsize));marshalled_dataset+=sizeof(stringsize); - memcpy(marshalled_dataset,string,stringsize*sizeof(char));marshalled_dataset+=stringsize*sizeof(char); - } - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION StringArrayParam::MarshallSize{{{1*/ -int StringArrayParam::MarshallSize(){ - - int i; - int marshallsize=0; - int stringsize; - char* string=NULL; - - marshallsize+=sizeof(numstrings); - - for(i=0;ivalue[i]; - stringsize=strlen(string)+1; - marshallsize+=sizeof(stringsize); - marshallsize+=stringsize*sizeof(char); - } - - marshallsize+=sizeof(enum_type); - marshallsize+=sizeof(int); //sizeof(int) for enum value - - return marshallsize; -} -/*}}}*/ -/*FUNCTION StringArrayParam::Demarshall{{{1*/ -void StringArrayParam::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - int stringsize; - char* string=NULL; - - /*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); - - memcpy(&numstrings,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - if(numstrings){ - this->value=(char**)xmalloc(numstrings*sizeof(char*)); - - for(i=0;ivalue[i]=string; - } - } - else this->value=NULL; - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION StringArrayParam::ObjectEnum{{{1*/ int StringArrayParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -44,9 +40,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12014) @@ -64,68 +64,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION StringParam::Marshall{{{1*/ -void StringParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - int stringsize; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of StringParam: */ - enum_value=StringParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - stringsize=strlen(this->value)+1; - - memcpy(marshalled_dataset,&stringsize,sizeof(stringsize));marshalled_dataset+=sizeof(stringsize); - memcpy(marshalled_dataset,this->value,stringsize*sizeof(char));marshalled_dataset+=stringsize*sizeof(char); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION StringParam::MarshallSize{{{1*/ -int StringParam::MarshallSize(){ - - int stringsize; - stringsize=strlen(this->value)+1; - - return sizeof(int)+ - stringsize*sizeof(char)+ - sizeof(enum_type)+ - sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION StringParam::Demarshall{{{1*/ -void StringParam::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - int stringsize; - - /*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); - - memcpy(&stringsize,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); - - this->value=(char*)xmalloc(stringsize*sizeof(char)); - memcpy(this->value,marshalled_dataset,stringsize*sizeof(char));marshalled_dataset+=stringsize*sizeof(char); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION StringParam::ObjectEnum{{{1*/ int StringParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/StringParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/StringParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -42,9 +38,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12014) @@ -72,88 +72,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION VectorParam::Marshall{{{1*/ -void VectorParam::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - int M; - double* serial_value=NULL; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of VectorParam: */ - enum_value=VectorParamEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall VectorParam data: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - if(value){ - value->GetSize(&M); - serial_value=value->ToMPISerial(); - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - memcpy(marshalled_dataset,serial_value,M*sizeof(double));marshalled_dataset+=(M*sizeof(double)); - } - else{ - M=0; - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - } - /*Free ressources:*/ - xfree((void**)&serial_value); - - /*return:*/ - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION VectorParam::MarshallSize{{{1*/ -int VectorParam::MarshallSize(){ - - int M=0; - if(value)value->GetSize(&M); - - return sizeof(M)+M*sizeof(double) - +sizeof(enum_type)+ - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION VectorParam::Demarshall{{{1*/ -void VectorParam::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - double* serial_vec=NULL; - int M; - - /*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); - if(M){ - serial_vec=(double*)xmalloc(M*sizeof(double)); - memcpy(serial_vec,marshalled_dataset,M*sizeof(double));marshalled_dataset+=(M*sizeof(double)); - - value=new Vector(serial_vec,M); - } - else{ - value=NULL; - } - - /*Free ressources:*/ - xfree((void**)&serial_vec); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -#endif /*FUNCTION VectorParam::ObjectEnum{{{1*/ int VectorParam::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Params/VectorParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/VectorParam.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Params/VectorParam.h (revision 12014) @@ -13,8 +13,4 @@ #else #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -#include #endif @@ -42,9 +38,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Patch.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Patch.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Patch.cpp (revision 12014) @@ -122,8 +122,4 @@ MPI_Status status; - #ifdef _SERIAL_ - return; //nothing to be done - #endif - /*First, figure out total number of rows combining all the cpus: */ MPI_Reduce(&this->numrows,&total_numrows,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); Index: /issm/trunk-jpl/src/c/objects/Segment.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Segment.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Segment.cpp (revision 12014) @@ -71,22 +71,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Segment::Marshall{{{1*/ -void Segment::Marshall(char** pmarshalled_dataset){ - - _error_(" not supported yet!"); -} -/*}}}*/ -/*FUNCTION Segment::MarshallSize{{{1*/ -int Segment::MarshallSize(){ - _error_(" not supported yet!"); -} -/*}}}*/ -/*FUNCTION Segment::Demarshall{{{1*/ -void Segment::Demarshall(char** pmarshalled_dataset){ - _error_(" not supported yet!"); -} -/*}}}*/ -#endif /*FUNCTION Segment::ObjectEnum{{{1*/ int Segment::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Segment.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Segment.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Segment.h (revision 12014) @@ -30,9 +30,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy(); Index: /issm/trunk-jpl/src/c/objects/Vertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Vertex.cpp (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Vertex.cpp (revision 12014) @@ -92,78 +92,4 @@ } /*}}}*/ -#ifdef _SERIAL_ -/*FUNCTION Vertex::Marshall {{{1*/ -void Vertex::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_type=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum type of Vertex: */ - enum_type=VertexEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - - /*marshall Vertex data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(marshalled_dataset,&x,sizeof(x));marshalled_dataset+=sizeof(x); - memcpy(marshalled_dataset,&y,sizeof(y));marshalled_dataset+=sizeof(y); - memcpy(marshalled_dataset,&z,sizeof(z));marshalled_dataset+=sizeof(z); - memcpy(marshalled_dataset,&sigma,sizeof(sigma));marshalled_dataset+=sizeof(sigma); - memcpy(marshalled_dataset,&connectivity,sizeof(connectivity));marshalled_dataset+=sizeof(connectivity); - memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(marshalled_dataset,&clone,sizeof(clone));marshalled_dataset+=sizeof(clone); - - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION Vertex::MarshallSize {{{1*/ -int Vertex::MarshallSize(){ - - return sizeof(id)+ - sizeof(sid)+ - sizeof(x)+ - sizeof(y)+ - sizeof(z)+ - sizeof(sigma)+ - sizeof(connectivity)+ - sizeof(dof)+ - sizeof(clone)+ - +sizeof(int); //sizeof(int) for enum type -} -/*}}}*/ -/*FUNCTION Vertex::Demarshall {{{1*/ -void Vertex::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(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid); - memcpy(&x,marshalled_dataset,sizeof(x));marshalled_dataset+=sizeof(x); - memcpy(&y,marshalled_dataset,sizeof(y));marshalled_dataset+=sizeof(y); - memcpy(&z,marshalled_dataset,sizeof(z));marshalled_dataset+=sizeof(z); - memcpy(&sigma,marshalled_dataset,sizeof(sigma));marshalled_dataset+=sizeof(sigma); - memcpy(&connectivity,marshalled_dataset,sizeof(connectivity));marshalled_dataset+=sizeof(connectivity); - memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof); - memcpy(&clone,marshalled_dataset,sizeof(clone));marshalled_dataset+=sizeof(clone); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -#endif /*FUNCTION Vertex::ObjectEnum{{{1*/ int Vertex::ObjectEnum(void){ Index: /issm/trunk-jpl/src/c/objects/Vertex.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Vertex.h (revision 12013) +++ /issm/trunk-jpl/src/c/objects/Vertex.h (revision 12014) @@ -47,9 +47,4 @@ int Id(); int MyRank(); - #ifdef _SERIAL_ - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - void Demarshall(char** pmarshalled_dataset); - #endif int ObjectEnum(); Object* copy();