Index: /issm/trunk-jpl/src/c/datastructures/DataSet.cpp
===================================================================
--- /issm/trunk-jpl/src/c/datastructures/DataSet.cpp	(revision 20645)
+++ /issm/trunk-jpl/src/c/datastructures/DataSet.cpp	(revision 20646)
@@ -161,87 +161,4 @@
 				this->AddObject(vertex);
 			}
-			//else if(obj_enum==DoubleParamEnum){
-			//	DoubleParam* doubleparam=NULL;
-			//	doubleparam=new DoubleParam();
-			//	doubleparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(doubleparam);
-			//}
-			//else if(obj_enum==IntParamEnum){
-			//	IntParam* intparam=NULL;
-			//	intparam=new IntParam();
-			//	intparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(intparam);
-			//}
-			//else if(obj_enum==IntMatParamEnum){
-			//	IntMatParam* intmparam=NULL;
-			//	intmparam=new IntMatParam();
-			//	intmparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(intmparam);
-			//}
-			//else if(obj_enum==IntVecParamEnum){
-			//	IntVecParam* intvparam=NULL;
-			//	intvparam=new IntVecParam();
-			//	intvparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(intvparam);
-			//}
-			//else if(obj_enum==BoolParamEnum){
-			//	BoolParam* boolparam=NULL;
-			//	boolparam=new BoolParam();
-			//	boolparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(boolparam);
-			//}
-			//else if(obj_enum==DataSetParamEnum){
-			//	DataSetParam* dsparam=NULL;
-			//	dsparam=new DataSetParam();
-			//	dsparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(dsparam);
-			//}
-			//else if(obj_enum==DoubleMatArrayParamEnum){
-			//	DoubleMatArrayParam* dmaparam=NULL;
-			//	dmaparam=new DoubleMatArrayParam();
-			//	dmaparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(dmaparam);
-			//}
-			//else if(obj_enum==DoubleMatParamEnum){
-			//	DoubleMatParam* dmparam=NULL;
-			//	dmparam=new DoubleMatParam();
-			//	dmparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(dmparam);
-			//}
-			//else if(obj_enum==DoubleVecParamEnum){
-			//	DoubleVecParam* dvparam=NULL;
-			//	dvparam=new DoubleVecParam();
-			//	dvparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(dvparam);
-			//}
-			//else if(obj_enum==FileParamEnum){
-			//	FileParam* fileparam=NULL;
-			//	fileparam=new FileParam();
-			//	fileparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	delete fileparam;
-			//	/* No need to add this object, the pointer is not valid             
-			//	   The FemModel should reset all FileParams in the restart function */
-			//}
-			//else if(obj_enum==StringParamEnum){
-			//	StringParam* sparam=NULL;
-			//	sparam=new StringParam();
-			//	sparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(sparam);
-			//}
-			//else if(obj_enum==StringArrayParamEnum){
-			//	StringArrayParam* saparam=NULL;
-			//	saparam=new StringArrayParam();
-			//	saparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(saparam);
-			//}
-			//else if(obj_enum==TransientParamEnum){
-			//	TransientParam* transparam=NULL;
-			//	transparam=new TransientParam();
-			//	transparam->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-			//	this->AddObject(transparam);
-			//}
-			//else if(obj_enum==GenericParamEnum){
-			//	/*Skip for now (we don't want to Marhsall Comms*/
-			//}
 			else if(obj_enum==MaticeEnum){
 				Matice* matice=NULL;