Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 25497)
@@ -2243,5 +2243,5 @@
 
 	_assert_(this);
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		nodes = NULL;
 	}
Index: /issm/trunk-jpl/src/c/classes/Elements/ElementHook.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/ElementHook.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Elements/ElementHook.cpp	(revision 25497)
@@ -75,5 +75,5 @@
 
 	/*preliminary, before marshall starts: */
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction==MARSHALLING_SIZE){
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction==MARSHALLING_SIZE){
 		if(this->hneighbors)hneighbors_null=false;
 		if(this->hnodes){
@@ -94,5 +94,5 @@
 	MARSHALLING_DYNAMIC(hnodesi_null,bool,numanalyses);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 
 		if (!hnodes_null)this->hnodes = new Hook*[numanalyses];
Index: /issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h	(revision 25497)
@@ -62,5 +62,5 @@
 			/*Marshal result name*/
 			int size = 0;
-			if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE) size=strlen(result_name)+1;
+			if(marshall_direction==MARSHALLING_WRITE || marshall_direction == MARSHALLING_SIZE) size=strlen(result_name)+1;
 			MARSHALLING(size);
 			MARSHALLING_DYNAMIC(result_name,char,size);
@@ -69,5 +69,5 @@
 			this->value=0;
 			bool isnull=true;
-			if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE){
+			if(marshall_direction==MARSHALLING_WRITE || marshall_direction == MARSHALLING_SIZE){
 				if(value) isnull=false;
 			}
@@ -347,5 +347,5 @@
 	int size = 0;
 
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;
 
 	MARSHALLING(id);
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 25497)
@@ -259,5 +259,5 @@
 
 	/*Marshall:*/
-	this->Marshall(&femmodel_buffer,NULL,MARSHALLING_FORWARD);
+	this->Marshall(&femmodel_buffer,NULL,MARSHALLING_WRITE);
 
 	/*Reset position of buffer: */
@@ -487,5 +487,5 @@
 	int       analysis_type;
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		delete this->materials;
 		delete this->parameters;
@@ -531,5 +531,5 @@
 	this->elements->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->constraints_list = xNew<Constraints*>(this->nummodels);
 		for(i=0;i<nummodels;i++) this->constraints_list[i] = new Constraints();
@@ -546,5 +546,5 @@
 	}
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		/*reset hooks for elements, loads and nodes:*/
 		this->elements->ResetHooks();
@@ -609,5 +609,5 @@
 
 	/*Create new FemModel by demarshalling the buffer: */
-	this->Marshall(&femmodel_buffer,NULL,MARSHALLING_BACKWARD);
+	this->Marshall(&femmodel_buffer,NULL,MARSHALLING_LOAD);
 
 	/*Reset position of buffer: */
Index: /issm/trunk-jpl/src/c/classes/Hook.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Hook.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Hook.cpp	(revision 25497)
@@ -122,5 +122,5 @@
 void Hook::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
 
-	if(marshall_direction==MARSHALLING_BACKWARD) reset();
+	if(marshall_direction==MARSHALLING_LOAD) reset();
 
 	MARSHALLING_ENUM(HookEnum);
Index: /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.cpp	(revision 25497)
@@ -89,5 +89,5 @@
 	MARSHALLING(this->numberofvertices_local);
 	MARSHALLING_DYNAMIC(ids,int,numids);
-	//if (marshall_direction == MARSHALLING_BACKWARD) inputs = new Inputs();
+	//if (marshall_direction == MARSHALLING_LOAD) inputs = new Inputs();
 	//inputs->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
 	_error_("not implemented");
Index: /issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp	(revision 25497)
@@ -87,5 +87,5 @@
 	MARSHALLING_ENUM(InputsEnum);
 
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction==MARSHALLING_SIZE){
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction==MARSHALLING_SIZE){
 
 		/*Marshall num_inputs first*/
Index: /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp	(revision 25497)
@@ -141,5 +141,5 @@
 	else this->values = NULL;
 
-	if(marshall_direction == MARSHALLING_BACKWARD){
+	if(marshall_direction == MARSHALLING_LOAD){
 		this->element_values = xNewZeroInit<IssmDouble>(PentaRef::NumberofNodes(this->interpolation));
 	}
Index: /issm/trunk-jpl/src/c/classes/Inputs/SegInput.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Inputs/SegInput.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Inputs/SegInput.cpp	(revision 25497)
@@ -122,5 +122,5 @@
 	else this->values = NULL;
 
-	if(marshall_direction == MARSHALLING_BACKWARD){
+	if(marshall_direction == MARSHALLING_LOAD){
 		this->element_values = xNewZeroInit<IssmDouble>(SegRef::NumberofNodes(this->interpolation));
 	}
Index: /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp	(revision 25497)
@@ -119,5 +119,5 @@
 void TransientInput::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
 
-	if (marshall_direction == MARSHALLING_BACKWARD){
+	if (marshall_direction == MARSHALLING_LOAD){
 		_error_("not implmented");
 		//inputs = new Inputs();
Index: /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp	(revision 25497)
@@ -127,5 +127,5 @@
 	else this->values = NULL;
 
-	if(marshall_direction == MARSHALLING_BACKWARD){
+	if(marshall_direction == MARSHALLING_LOAD){
 		this->element_values = xNewZeroInit<IssmDouble>(TriaRef::NumberofNodes(this->interpolation));
 	}
Index: /issm/trunk-jpl/src/c/classes/Loads/Channel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Channel.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Loads/Channel.cpp	(revision 25497)
@@ -155,5 +155,5 @@
 	MARSHALLING(S);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->hnodes      = new Hook();
 		this->hvertices   = new Hook();
Index: /issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp	(revision 25497)
@@ -117,5 +117,5 @@
 	MARSHALLING(id);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->hnode      = new Hook();
 		this->hvertex      = new Hook();
Index: /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.cpp	(revision 25497)
@@ -133,5 +133,5 @@
 	MARSHALLING(id);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->hnodes      = new Hook();
 		this->hvertices   = new Hook();
Index: /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp	(revision 25497)
@@ -211,5 +211,5 @@
 	MARSHALLING(flux_degree);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->hnodes      = new Hook();
 		this->hvertices   = new Hook();
Index: /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp	(revision 25497)
@@ -127,5 +127,5 @@
 	MARSHALLING(id);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->hnode      = new Hook();
 		this->helement   = new Hook();
Index: /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp	(revision 25497)
@@ -92,5 +92,5 @@
 	MARSHALLING(id);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->hnodes = new Hook();
 	}
Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp	(revision 25497)
@@ -200,5 +200,5 @@
 	MARSHALLING(shelf);
 
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		this->hnodes      = new Hook();
 		this->hvertices      = new Hook();
Index: /issm/trunk-jpl/src/c/classes/Materials/Matestar.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Materials/Matestar.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Materials/Matestar.cpp	(revision 25497)
@@ -103,5 +103,5 @@
 void      Matestar::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
 
-	if(marshall_direction==MARSHALLING_BACKWARD)helement=new Hook(); 
+	if(marshall_direction==MARSHALLING_LOAD)helement=new Hook(); 
 
 	MARSHALLING_ENUM(MatestarEnum);
Index: /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp	(revision 25497)
@@ -161,5 +161,5 @@
 void      Matice::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
 
-	if(marshall_direction==MARSHALLING_BACKWARD)helement=new Hook(); 
+	if(marshall_direction==MARSHALLING_LOAD)helement=new Hook(); 
 
 	MARSHALLING_ENUM(MaticeEnum);
Index: /issm/trunk-jpl/src/c/classes/Nodes.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Nodes.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Nodes.cpp	(revision 25497)
@@ -117,5 +117,5 @@
 	DataSet::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
 
-	if(marshall_direction == MARSHALLING_BACKWARD){
+	if(marshall_direction == MARSHALLING_LOAD){
 		this->common_recv_ids = xNew<int*>(num_procs);
 		this->common_send_ids = xNew<int*>(num_procs);
Index: /issm/trunk-jpl/src/c/classes/Params/DataSetParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/DataSetParam.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/DataSetParam.cpp	(revision 25497)
@@ -54,5 +54,5 @@
 void DataSetParam::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
 
-	if(marshall_direction==MARSHALLING_BACKWARD)value=new DataSet();
+	if(marshall_direction==MARSHALLING_LOAD)value=new DataSet();
 
 	MARSHALLING_ENUM(DataSetParamEnum);
Index: /issm/trunk-jpl/src/c/classes/Params/DoubleMatArrayParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/DoubleMatArrayParam.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/DoubleMatArrayParam.cpp	(revision 25497)
@@ -125,5 +125,5 @@
 		MARSHALLING_DYNAMIC(mdim_array,int,M);
 		MARSHALLING_DYNAMIC(ndim_array,int,M);
-		if(marshall_direction==MARSHALLING_BACKWARD && M) array=xNew<IssmDouble*>(M);
+		if(marshall_direction==MARSHALLING_LOAD && M) array=xNew<IssmDouble*>(M);
 		for(int i=0;i<M;i++){
 			MARSHALLING_DYNAMIC(array[i],IssmDouble,mdim_array[i]*ndim_array[i]);
Index: /issm/trunk-jpl/src/c/classes/Params/FileParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/FileParam.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/FileParam.cpp	(revision 25497)
@@ -55,5 +55,5 @@
 	MARSHALLING(value);
 
-	if(marshall_direction==MARSHALLING_BACKWARD) value=NULL; //meaningless file pointer!
+	if(marshall_direction==MARSHALLING_LOAD) value=NULL; //meaningless file pointer!
 
 }
Index: /issm/trunk-jpl/src/c/classes/Params/Parameters.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/Parameters.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/Parameters.cpp	(revision 25497)
@@ -118,5 +118,5 @@
 	MARSHALLING_ENUM(ParametersEnum);
 
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction==MARSHALLING_SIZE){
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction==MARSHALLING_SIZE){
 
 		/*Marshall num_params first*/
Index: /issm/trunk-jpl/src/c/classes/Params/StringArrayParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/StringArrayParam.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/StringArrayParam.cpp	(revision 25497)
@@ -77,5 +77,5 @@
 	int* sizes=NULL;
 
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction==MARSHALLING_SIZE){
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction==MARSHALLING_SIZE){
 		if(numstrings)sizes=xNew<int>(numstrings);
 		for(int i=0;i<numstrings;i++)sizes[i]=strlen(value[i])+1;
@@ -89,5 +89,5 @@
 	if(numstrings){
 		MARSHALLING_DYNAMIC(sizes,int,numstrings);
-		if(marshall_direction==MARSHALLING_BACKWARD) value=xNew<char*>(numstrings);
+		if(marshall_direction==MARSHALLING_LOAD) value=xNew<char*>(numstrings);
 		for(int i=0;i<numstrings;i++)MARSHALLING_DYNAMIC(value[i],char,sizes[i]);
 	}
Index: /issm/trunk-jpl/src/c/classes/Params/StringParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/StringParam.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/StringParam.cpp	(revision 25497)
@@ -54,5 +54,5 @@
 	int size = 0;
 
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;
 
 	MARSHALLING_ENUM(StringParamEnum);
Index: /issm/trunk-jpl/src/c/classes/Params/TransientArrayParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/TransientArrayParam.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/TransientArrayParam.cpp	(revision 25497)
@@ -81,5 +81,5 @@
 	MARSHALLING(M);
 	MARSHALLING(N);
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		values    = xNew<IssmDouble>(M*N);
 		timesteps = xNew<IssmDouble>(N);
Index: /issm/trunk-jpl/src/c/classes/Params/TransientParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Params/TransientParam.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Params/TransientParam.cpp	(revision 25497)
@@ -75,5 +75,5 @@
 	MARSHALLING(interpolation);
 	MARSHALLING(N);
-	if(marshall_direction==MARSHALLING_BACKWARD){
+	if(marshall_direction==MARSHALLING_LOAD){
 		values=xNew<IssmDouble>(N);
 		timesteps=xNew<IssmDouble>(N);
Index: /issm/trunk-jpl/src/c/classes/Vertices.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Vertices.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/classes/Vertices.cpp	(revision 25497)
@@ -122,5 +122,5 @@
 	MARSHALLING_DYNAMIC(this->common_recv,int,num_procs);
 	MARSHALLING_DYNAMIC(this->common_send,int,num_procs);
-	if(marshall_direction == MARSHALLING_BACKWARD){
+	if(marshall_direction == MARSHALLING_LOAD){
 		this->common_recv_ids = xNew<int*>(num_procs);
 		this->common_send_ids = xNew<int*>(num_procs);
Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/transient_core.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/cores/transient_core.cpp	(revision 25497)
@@ -53,7 +53,7 @@
 	#if defined(_HAVE_BAMG_) && !defined(_HAVE_AD_)
 	if(amr_frequency){
-	  femmodel->parameters->FindParam(&amr_restart,AmrRestartEnum);
-	  if(amr_restart) femmodel->ReMesh();
-  }
+		femmodel->parameters->FindParam(&amr_restart,AmrRestartEnum);
+		if(amr_restart) femmodel->ReMesh();
+	}
 	#endif
 
@@ -325,5 +325,5 @@
 	double *Xb = xNewZeroInit<double>(Xsize);
 	double *Yb  = xNewZeroInit<double>(Ysize);
-	double *Yin = xNewZeroInit<double>(Ysize);
+	int    *Yin = xNewZeroInit<int>(Ysize);
 
 	/*Start tracing*/
@@ -400,5 +400,5 @@
 	xDelete<IssmDouble>(Y);
 	xDelete<double>(Yb);
-	xDelete<double>(Yin);
+	xDelete<int>(Yin);
 }/*}}}*/
 #endif
Index: /issm/trunk-jpl/src/c/datastructures/DataSet.cpp
===================================================================
--- /issm/trunk-jpl/src/c/datastructures/DataSet.cpp	(revision 25496)
+++ /issm/trunk-jpl/src/c/datastructures/DataSet.cpp	(revision 25497)
@@ -98,5 +98,5 @@
 	int i;
 
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction==MARSHALLING_SIZE){
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction==MARSHALLING_SIZE){
 		obj_size=objects.size();
 	}
@@ -112,5 +112,5 @@
 
 	/*Now branch according to direction of marshalling: */
-	if(marshall_direction==MARSHALLING_FORWARD || marshall_direction==MARSHALLING_SIZE){
+	if(marshall_direction==MARSHALLING_WRITE || marshall_direction==MARSHALLING_SIZE){
 		if(!(this->sorted && numsorted>0 && this->id_offsets)){
 			sorted_ids=NULL;
Index: /issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h	(revision 25496)
+++ /issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h	(revision 25497)
@@ -7,6 +7,6 @@
 
 enum marshall_directions{
-	MARSHALLING_FORWARD,
-	MARSHALLING_BACKWARD,
+	MARSHALLING_WRITE,
+	MARSHALLING_LOAD,
 	MARSHALLING_SIZE
 };
@@ -14,5 +14,5 @@
 #define MARSHALLING_ENUM(EN)\
 	int type_enum=EN;\
-	if(marshall_direction==MARSHALLING_FORWARD){\
+	if(marshall_direction==MARSHALLING_WRITE){\
 		memcpy(*pmarshalled_data,&type_enum,sizeof(int));\
 		*pmarshalled_data+=sizeof(int);\
@@ -21,5 +21,5 @@
 		*pmarshalled_data_size+=sizeof(int);\
 	}\
-	else if(marshall_direction==MARSHALLING_BACKWARD){\
+	else if(marshall_direction==MARSHALLING_LOAD){\
 		*pmarshalled_data+=sizeof(int);\
 	}\
@@ -29,5 +29,5 @@
 #define MARSHALLING(FIELD)\
 	\
-	if(marshall_direction==MARSHALLING_FORWARD){\
+	if(marshall_direction==MARSHALLING_WRITE){\
 		memcpy(*pmarshalled_data,&FIELD,sizeof(FIELD));\
 		*pmarshalled_data+=sizeof(FIELD);\
@@ -36,5 +36,5 @@
 		*pmarshalled_data_size+=sizeof(FIELD);\
 	}\
-	else if(marshall_direction==MARSHALLING_BACKWARD){\
+	else if(marshall_direction==MARSHALLING_LOAD){\
 		memcpy(&FIELD,*pmarshalled_data,sizeof(FIELD));\
 		*pmarshalled_data+=sizeof(FIELD);\
@@ -51,5 +51,5 @@
 		\
 		if(!field_null){\
-			if(marshall_direction==MARSHALLING_FORWARD){\
+			if(marshall_direction==MARSHALLING_WRITE){\
 					memcpy(*pmarshalled_data,FIELD,SIZE*sizeof(TYPE));\
 					*pmarshalled_data+=SIZE*sizeof(TYPE);\
@@ -58,5 +58,5 @@
 				*pmarshalled_data_size+=SIZE*sizeof(TYPE);\
 			}\
-			else if(marshall_direction==MARSHALLING_BACKWARD){\
+			else if(marshall_direction==MARSHALLING_LOAD){\
 				FIELD=xNew<TYPE>(SIZE);\
 				memcpy(FIELD,*pmarshalled_data,SIZE*sizeof(TYPE));\