Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 15069)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 15070)
@@ -55,5 +55,4 @@
 					./classes/Vertices.h\
 					./classes/Vertices.cpp\
-					./classes/Bucket.h\
 					./classes/Node.h\
 					./classes/Node.cpp\
@@ -228,4 +227,5 @@
 					./toolkits/issm/IssmSolver.h\
 					./toolkits/issm/IssmSolver.cpp\
+					./toolkits/issm/Bucket.h\
 					./toolkits/adolc/adolcincludes.h\
 					./toolkits/adolc/AdolcEdf.h\
Index: sm/trunk-jpl/src/c/classes/Bucket.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Bucket.h	(revision 15069)
+++ 	(revision )
@@ -1,242 +1,0 @@
-/*!\file Bucket.h
- * \brief: header file for Bucket object
- */
-
-#ifndef _BUCKET_H
-#define _BUCKET_H
-
-/*Headers:*/
-/*{{{*/
-#include "../datastructures/datastructures.h"
-#include "../shared/MemOps/MemOps.h"
-#include "../toolkits/toolkitsenums.h"
-/*}}}*/
-
-/*how many MPI_Isend requests does it take to transfer the contents of a bucket to another cpu?*/
-#define MATRIXBUCKETSIZEOFREQUESTS 7 
-#define VECTORBUCKETSIZEOFREQUESTS 5 
-typedef enum {VECTOR_BUCKET, MATRIX_BUCKET} BucketType;
-template <class doubletype> class Bucket: public Object{
-
-	private: 
-		int type; //either a VECTOR_BUCKET or MATRIX_BUCKET
-		int m,n; /*size of local matrix we are storing*/
-		/*row and column indices of the matrix we are storing*/
-		int* idxm;
-		int* idxn; 
-		doubletype* values; /*local matrix*/
-		InsMode mode; /*mode of insertion for this bucket*/
-
-	public: 
-
-		/*constructors, destructors: */
-		Bucket(){ /*{{{*/
-			this->Initialize();
-		} /*}}}*/
-		Bucket(int min,int* idxmin,int nin,int* idxnin,doubletype* valuesin,InsMode modein){ /*{{{*/
-
-			this->Initialize();
-
-			this->type=MATRIX_BUCKET;
-			this->m=min;
-			this->n=nin;
-			this->mode=modein;
-			if(this->m){
-				this->idxm=xNew<int>(this->m); 
-				xMemCpy(this->idxm,idxmin,this->m);
-			}
-			if(this->n){
-				this->idxn=xNew<int>(this->n); 
-				xMemCpy(this->idxn,idxnin,this->n);
-			}
-			if(this->m*this->n){
-				this->values=xNew<doubletype>(this->n*this->m);
-				xMemCpy(this->values,valuesin,this->n*this->m);
-			}
-		} /*}}}*/
-		Bucket(int min,int* idxmin,doubletype* valuesin,InsMode modein){ /*{{{*/ 
-			this->Initialize();
-
-			this->type=VECTOR_BUCKET; 
-			this->m=min;
-			this->mode=modein;
-			if(this->m){
-				this->idxm=xNew<int>(this->m); 
-				xMemCpy(this->idxm,idxmin,this->m);
-
-				this->values=xNew<doubletype>(this->m);
-				xMemCpy(this->values,valuesin,this->m);
-			}
-		} /*}}}*/
-		~Bucket(){ /*{{{*/
-			xDelete<int>(idxm);
-			xDelete<int>(idxn);
-			xDelete<doubletype>(values);
-		} /*}}}*/
-		void Initialize(void){ /*{{{*/
-
-			this->type=0;
-			this->m=0;
-			this->n=0;
-			this->idxm=NULL;
-			this->idxn=NULL;
-			this->values=NULL;
-			mode=INS_VAL;
-
-		} /*}}}*/
-
-		/*object virtual functions definitions:*/
-		void    Echo(){ /*{{{*/
-			_printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
-			_printLine_("bucket type: " << type);
-			_printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
-		} /*}}}*/
-		void    DeepEcho(){ /*{{{*/
-			int i,j;
-
-			_printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
-			_printLine_("bucket type: " << type);
-			_printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
-			if(type==MATRIX_BUCKET){
-				for (i=0;i<this->m;i++){
-					_printLine_("row "<<this->idxm[i]<<", column indices: ");
-					for (j=0;j<this->n;j++){
-						_printLine_(" "<<this->idxn[j]);
-					}
-					_printLine_("values: ");
-					for (j=0;j<this->n;j++){
-						_printLine_(" "<<this->values[m*i+j]);
-					}
-				}
-			}
-			else if(type==VECTOR_BUCKET){
-				for (i=0;i<this->m;i++){
-					_printLine_("row "<<this->idxm[i]<<", value " << this->values[i]);
-				}
-			}
-			else _error_("unknown type of bucket!");
-		}
-		/*}}}*/
-		int     Id(){ /*{{{*/
-			return -1;
-		} /*}}}*/
-		int     ObjectEnum(){ /*{{{*/
-			return -1;
-		} /*}}}*/
-		Object *copy()        {/*{{{*/
-			_error_("Not implemented yet (similar to Elements)"); };
-		/*}}}*/
-
-		/*specific routines of Bucket: */
-		void SpawnBucketsPerCpu(DataSet* bucketsofcpu_i,int rank_i,int* rowranks){ /*{{{*/
-
-			int i,j;
-
-			/*go through our idxm index of rows this bucket owns, and spawn buckets  
-			 *if these rows belong to cpu rank_i. Use rowranks to determine this.*/
-			for(i=0;i<m;i++){
-				if (rowranks[idxm[i]]==rank_i){
-					/*This row belongs to cpu rank_i, so spawn a bucket with this row, and add it to the bucketsofcpu_i dataset: */
-					if(type==MATRIX_BUCKET){
-						bucketsofcpu_i->AddObject(new Bucket(1,idxm+i,n,idxn,values+n*i,mode));
-					}
-					else{
-						bucketsofcpu_i->AddObject(new Bucket(1,idxm+i,values+i,mode));
-					}
-				}
-			}
-
-		};
-		/*}}}*/
-		int BucketType(void){ /*{{{*/
-
-			return type;
-		};
-		/*}}}*/
-		void Marshall(int** prow_indices_forcpu,int** pcol_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu){ /*{{{*/
-
-			/*intermediary: */
-			int         i;
-			int         j;
-
-			/*buffers: */
-			int        *row_indices_forcpu = NULL;
-			int        *col_indices_forcpu = NULL;
-			doubletype *values_forcpu      = NULL;
-			int        *modes_forcpu       = NULL;
-
-			/*initialize buffers: */
-			row_indices_forcpu=*prow_indices_forcpu;
-			col_indices_forcpu=*pcol_indices_forcpu;
-			values_forcpu=*pvalues_forcpu;
-			modes_forcpu=*pmodes_forcpu;
-
-			/*fill buffers with out values and indices and modes: */
-			for(i=0;i<m;i++){
-				for(j=0;j<n;j++){
-					row_indices_forcpu[i*n+j]=idxm[i];
-					col_indices_forcpu[i*n+j]=idxn[j];
-					values_forcpu[i*n+j]=values[i*n+j];
-					modes_forcpu[i*n+j]=mode;
-				}
-			}
-
-			/*increment buffer for next Bucket who will marshall his data: */
-			row_indices_forcpu+=(m*n);
-			col_indices_forcpu+=(m*n);
-			values_forcpu+=(m*n);
-			modes_forcpu+=(m*n);
-
-			/*output modified buffers: */
-			*prow_indices_forcpu=row_indices_forcpu;
-			*pcol_indices_forcpu=col_indices_forcpu;
-			*pvalues_forcpu=values_forcpu;
-			*pmodes_forcpu=modes_forcpu;
-		};
-		/*}}}*/
-		void Marshall(int** prow_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu){ /*{{{*/
-
-			/*intermediary: */
-			int         i;
-
-			/*buffers: */
-			int        *row_indices_forcpu = NULL;
-			doubletype *values_forcpu      = NULL;
-			int        *modes_forcpu       = NULL;
-
-			/*initialize buffers: */
-			row_indices_forcpu=*prow_indices_forcpu;
-			values_forcpu=*pvalues_forcpu;
-			modes_forcpu=*pmodes_forcpu;
-
-			/*fill buffers with out values and indices and modes: */
-			for(i=0;i<m;i++){
-				row_indices_forcpu[i]=idxm[i];
-				values_forcpu[i]=values[i];
-				modes_forcpu[i]=mode;
-			}
-
-			/*increment buffer for next Bucket who will marshall his data: */
-			row_indices_forcpu+=m;
-			values_forcpu+=m;
-			modes_forcpu+=m;
-
-			/*output modified buffers: */
-			*prow_indices_forcpu=row_indices_forcpu;
-			*pvalues_forcpu=values_forcpu;
-			*pmodes_forcpu=modes_forcpu;
-		};
-		/*}}}*/
-		int MarshallSize(void){ /*{{{*/
-
-			if(type==MATRIX_BUCKET){
-				return m*n;
-			}
-			else{
-				return m;
-			}
-		};
-		/*}}}*/
-};
-
-#endif  /* _BUCKET_H */
Index: /issm/trunk-jpl/src/c/classes/classes.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/classes.h	(revision 15069)
+++ /issm/trunk-jpl/src/c/classes/classes.h	(revision 15070)
@@ -17,5 +17,4 @@
 #include "./IndependentObject.h"
 #include "./Segment.h"
-#include "./Bucket.h"
 
 /*Constraints: */
Index: /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp	(revision 15069)
+++ /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp	(revision 15070)
@@ -11,7 +11,7 @@
 
 #include "../../shared/shared.h"
-#include "../adolc/adolcincludes.h"
 #include "../../classes/Params/GenericParam.h"
 #include "../../classes/Params/Parameters.h"
+#include "../adolc/adolcincludes.h"
 #include "./gslincludes.h"
 
Index: /issm/trunk-jpl/src/c/toolkits/issm/Bucket.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/Bucket.h	(revision 15070)
+++ /issm/trunk-jpl/src/c/toolkits/issm/Bucket.h	(revision 15070)
@@ -0,0 +1,242 @@
+/*!\file Bucket.h
+ * \brief: header file for Bucket object
+ */
+
+#ifndef _BUCKET_H
+#define _BUCKET_H
+
+/*Headers:*/
+/*{{{*/
+#include "../../datastructures/datastructures.h"
+#include "../../shared/shared.h"
+#include "../toolkitsenums.h"
+/*}}}*/
+
+/*how many MPI_Isend requests does it take to transfer the contents of a bucket to another cpu?*/
+#define MATRIXBUCKETSIZEOFREQUESTS 7 
+#define VECTORBUCKETSIZEOFREQUESTS 5 
+typedef enum {VECTOR_BUCKET, MATRIX_BUCKET} BucketType;
+template <class doubletype> class Bucket: public Object{
+
+	private: 
+		int type; //either a VECTOR_BUCKET or MATRIX_BUCKET
+		int m,n; /*size of local matrix we are storing*/
+		/*row and column indices of the matrix we are storing*/
+		int* idxm;
+		int* idxn; 
+		doubletype* values; /*local matrix*/
+		InsMode mode; /*mode of insertion for this bucket*/
+
+	public: 
+
+		/*constructors, destructors: */
+		Bucket(){ /*{{{*/
+			this->Initialize();
+		} /*}}}*/
+		Bucket(int min,int* idxmin,int nin,int* idxnin,doubletype* valuesin,InsMode modein){ /*{{{*/
+
+			this->Initialize();
+
+			this->type=MATRIX_BUCKET;
+			this->m=min;
+			this->n=nin;
+			this->mode=modein;
+			if(this->m){
+				this->idxm=xNew<int>(this->m); 
+				xMemCpy(this->idxm,idxmin,this->m);
+			}
+			if(this->n){
+				this->idxn=xNew<int>(this->n); 
+				xMemCpy(this->idxn,idxnin,this->n);
+			}
+			if(this->m*this->n){
+				this->values=xNew<doubletype>(this->n*this->m);
+				xMemCpy(this->values,valuesin,this->n*this->m);
+			}
+		} /*}}}*/
+		Bucket(int min,int* idxmin,doubletype* valuesin,InsMode modein){ /*{{{*/ 
+			this->Initialize();
+
+			this->type=VECTOR_BUCKET; 
+			this->m=min;
+			this->mode=modein;
+			if(this->m){
+				this->idxm=xNew<int>(this->m); 
+				xMemCpy(this->idxm,idxmin,this->m);
+
+				this->values=xNew<doubletype>(this->m);
+				xMemCpy(this->values,valuesin,this->m);
+			}
+		} /*}}}*/
+		~Bucket(){ /*{{{*/
+			xDelete<int>(idxm);
+			xDelete<int>(idxn);
+			xDelete<doubletype>(values);
+		} /*}}}*/
+		void Initialize(void){ /*{{{*/
+
+			this->type=0;
+			this->m=0;
+			this->n=0;
+			this->idxm=NULL;
+			this->idxn=NULL;
+			this->values=NULL;
+			mode=INS_VAL;
+
+		} /*}}}*/
+
+		/*object virtual functions definitions:*/
+		void    Echo(){ /*{{{*/
+			_printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
+			_printLine_("bucket type: " << type);
+			_printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
+		} /*}}}*/
+		void    DeepEcho(){ /*{{{*/
+			int i,j;
+
+			_printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
+			_printLine_("bucket type: " << type);
+			_printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
+			if(type==MATRIX_BUCKET){
+				for (i=0;i<this->m;i++){
+					_printLine_("row "<<this->idxm[i]<<", column indices: ");
+					for (j=0;j<this->n;j++){
+						_printLine_(" "<<this->idxn[j]);
+					}
+					_printLine_("values: ");
+					for (j=0;j<this->n;j++){
+						_printLine_(" "<<this->values[m*i+j]);
+					}
+				}
+			}
+			else if(type==VECTOR_BUCKET){
+				for (i=0;i<this->m;i++){
+					_printLine_("row "<<this->idxm[i]<<", value " << this->values[i]);
+				}
+			}
+			else _error_("unknown type of bucket!");
+		}
+		/*}}}*/
+		int     Id(){ /*{{{*/
+			return -1;
+		} /*}}}*/
+		int     ObjectEnum(){ /*{{{*/
+			return -1;
+		} /*}}}*/
+		Object *copy()        {/*{{{*/
+			_error_("Not implemented yet (similar to Elements)"); };
+		/*}}}*/
+
+		/*specific routines of Bucket: */
+		void SpawnBucketsPerCpu(DataSet* bucketsofcpu_i,int rank_i,int* rowranks){ /*{{{*/
+
+			int i,j;
+
+			/*go through our idxm index of rows this bucket owns, and spawn buckets  
+			 *if these rows belong to cpu rank_i. Use rowranks to determine this.*/
+			for(i=0;i<m;i++){
+				if (rowranks[idxm[i]]==rank_i){
+					/*This row belongs to cpu rank_i, so spawn a bucket with this row, and add it to the bucketsofcpu_i dataset: */
+					if(type==MATRIX_BUCKET){
+						bucketsofcpu_i->AddObject(new Bucket(1,idxm+i,n,idxn,values+n*i,mode));
+					}
+					else{
+						bucketsofcpu_i->AddObject(new Bucket(1,idxm+i,values+i,mode));
+					}
+				}
+			}
+
+		};
+		/*}}}*/
+		int BucketType(void){ /*{{{*/
+
+			return type;
+		};
+		/*}}}*/
+		void Marshall(int** prow_indices_forcpu,int** pcol_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu){ /*{{{*/
+
+			/*intermediary: */
+			int         i;
+			int         j;
+
+			/*buffers: */
+			int        *row_indices_forcpu = NULL;
+			int        *col_indices_forcpu = NULL;
+			doubletype *values_forcpu      = NULL;
+			int        *modes_forcpu       = NULL;
+
+			/*initialize buffers: */
+			row_indices_forcpu=*prow_indices_forcpu;
+			col_indices_forcpu=*pcol_indices_forcpu;
+			values_forcpu=*pvalues_forcpu;
+			modes_forcpu=*pmodes_forcpu;
+
+			/*fill buffers with out values and indices and modes: */
+			for(i=0;i<m;i++){
+				for(j=0;j<n;j++){
+					row_indices_forcpu[i*n+j]=idxm[i];
+					col_indices_forcpu[i*n+j]=idxn[j];
+					values_forcpu[i*n+j]=values[i*n+j];
+					modes_forcpu[i*n+j]=mode;
+				}
+			}
+
+			/*increment buffer for next Bucket who will marshall his data: */
+			row_indices_forcpu+=(m*n);
+			col_indices_forcpu+=(m*n);
+			values_forcpu+=(m*n);
+			modes_forcpu+=(m*n);
+
+			/*output modified buffers: */
+			*prow_indices_forcpu=row_indices_forcpu;
+			*pcol_indices_forcpu=col_indices_forcpu;
+			*pvalues_forcpu=values_forcpu;
+			*pmodes_forcpu=modes_forcpu;
+		};
+		/*}}}*/
+		void Marshall(int** prow_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu){ /*{{{*/
+
+			/*intermediary: */
+			int         i;
+
+			/*buffers: */
+			int        *row_indices_forcpu = NULL;
+			doubletype *values_forcpu      = NULL;
+			int        *modes_forcpu       = NULL;
+
+			/*initialize buffers: */
+			row_indices_forcpu=*prow_indices_forcpu;
+			values_forcpu=*pvalues_forcpu;
+			modes_forcpu=*pmodes_forcpu;
+
+			/*fill buffers with out values and indices and modes: */
+			for(i=0;i<m;i++){
+				row_indices_forcpu[i]=idxm[i];
+				values_forcpu[i]=values[i];
+				modes_forcpu[i]=mode;
+			}
+
+			/*increment buffer for next Bucket who will marshall his data: */
+			row_indices_forcpu+=m;
+			values_forcpu+=m;
+			modes_forcpu+=m;
+
+			/*output modified buffers: */
+			*prow_indices_forcpu=row_indices_forcpu;
+			*pvalues_forcpu=values_forcpu;
+			*pmodes_forcpu=modes_forcpu;
+		};
+		/*}}}*/
+		int MarshallSize(void){ /*{{{*/
+
+			if(type==MATRIX_BUCKET){
+				return m*n;
+			}
+			else{
+				return m;
+			}
+		};
+		/*}}}*/
+};
+
+#endif  /* _BUCKET_H */
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h	(revision 15069)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h	(revision 15070)
@@ -18,8 +18,6 @@
 
 #include "./IssmSeqVec.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/MemOps.h"
-#include "../../shared/io/Print/Print.h"
-#include "../../toolkits/gsl/gslincludes.h"
+#include "../../shared/shared.h"
+#include "../gsl/gslincludes.h"
 
 #include <math.h>
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 15069)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 15070)
@@ -20,6 +20,6 @@
 #include "../../shared/shared.h"
 #include "../../datastructures/datastructures.h"
-#include "../../classes/Bucket.h"
 #include "../mumps/mumpsincludes.h"
+#include "./Bucket.h"
 #include "./IssmMpiVec.h"
 #include <math.h>