Index: /issm/trunk-jpl/src/c/datastructures/Object.h
===================================================================
--- /issm/trunk-jpl/src/c/datastructures/Object.h	(revision 15334)
+++ /issm/trunk-jpl/src/c/datastructures/Object.h	(revision 15335)
@@ -15,5 +15,5 @@
 	public: 
 
-		virtual       ~Object() {};
+		virtual       ~Object(){};
 		virtual void  Echo()=0;
 		virtual void  DeepEcho()=0;
Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp	(revision 15335)
@@ -10,5 +10,5 @@
 #include "./ContourToMeshx.h"
 
-int ContourToMeshx(double** pin_nod,double** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue) {
+int ContourToMeshx(double** pin_nod,double** pin_elem, double* index, double* x, double* y,Contours* contours,char* interptype,int nel,int nods, int edgevalue) {
 
 	/*Contour:*/
Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h
===================================================================
--- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.h	(revision 15335)
@@ -12,15 +12,15 @@
 typedef struct{
 
-	DataSet *contours;
-	int    nods;
-	int    edgevalue;
-	double* in_nod;
-	double *x;
-	double *y;
+	Contours *contours;
+	int       nods;
+	int       edgevalue;
+	double   *in_nod;
+	double   *x;
+	double   *y;
 
 } ContourToMeshxThreadStruct;
 
 /* local prototypes: */
-int ContourToMeshx(double** pin_nods,double** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue);
+int ContourToMeshx(double** pin_nods,double** pin_elem, double* index, double* x, double* y,Contours* contours,char* interptype,int nel,int nods, int edgevalue);
 
 void* ContourToMeshxt(void* vContourToMeshxThreadStruct);
Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp	(revision 15335)
@@ -26,5 +26,5 @@
 
 	/*Contour:*/
-	DataSet* contours=NULL;
+	Contours* contours=NULL;
 
 	/*parameters: */
Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp	(revision 15335)
@@ -32,5 +32,5 @@
 }
 
-int ContourToNodesx(IssmPDouble** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue){
+int ContourToNodesx(IssmPDouble** pflags,double* x, double* y, int nods, Contours* contours, int edgevalue){
 
 	/*Contour:*/
Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.h
===================================================================
--- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.h	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.h	(revision 15335)
@@ -11,5 +11,5 @@
 /* local prototypes: */
 int ContourToNodesx(IssmPDouble** pflags,double* x, double* y, int nods, Contour<IssmPDouble>** contours,int numcontours,int edgevalue);
-int ContourToNodesx(IssmPDouble** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue);
+int ContourToNodesx(IssmPDouble** pflags,double* x, double* y, int nods, Contours* contours, int edgevalue);
 
 #endif /* _CONTOURTONODESX_H */
Index: /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp	(revision 15335)
@@ -9,5 +9,5 @@
 /*}}}*/
 
-void EdgeDetectionx(DataSet* contours, bool* image, int M, int N){
+void EdgeDetectionx(Contours* contours, bool* image, int M, int N){
 
 	/*intermediary: */
Index: /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.h
===================================================================
--- /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.h	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.h	(revision 15335)
@@ -10,5 +10,5 @@
 
 /* local prototypes: */
-void EdgeDetectionx(DataSet* contours, bool* image, int M, int N);
+void EdgeDetectionx(Contours* contours, bool* image, int M, int N);
 
 #endif  /* _EDGEDETECTIONX_H */
Index: /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp	(revision 15335)
@@ -19,5 +19,5 @@
 /*}}}*/
 
-void TriMeshx(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnsegs,DataSet* domain,DataSet* rifts,double area){
+void TriMeshx(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnsegs,Contours* domain,Contours* rifts,double area){
 
 #if !defined(_HAVE_TRIANGLE_)
Index: /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.h
===================================================================
--- /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.h	(revision 15334)
+++ /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.h	(revision 15335)
@@ -10,4 +10,4 @@
 
 /* local prototypes: */
-void TriMeshx(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnseg,DataSet* domain,DataSet* rifts,double area);
+void TriMeshx(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnseg,Contours* domain,Contours* rifts,double area);
 #endif  /* _TRIMESHX_H */
Index: /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp	(revision 15335)
@@ -30,11 +30,11 @@
 
 	/* required input: */
-	int      edgevalue;
-	int      nel,nods;
-	double  *index       = NULL;
-	double  *x           = NULL;
-	double  *y           = NULL;
-	char    *interptype  = NULL;
-	DataSet *contours    = NULL;
+	int       edgevalue;
+	int       nel,nods;
+	double   *index       = NULL;
+	double   *x           = NULL;
+	double   *y           = NULL;
+	char     *interptype  = NULL;
+	Contours *contours    = NULL;
 
 	/* output: */
Index: /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp	(revision 15335)
@@ -18,9 +18,9 @@
 
 	/* input: */
-	int      edgevalue,nods;
-	double  *x           = NULL;
-	double  *y           = NULL;
-	char    *contourname = NULL;
-	DataSet *contours    = NULL;
+	int       edgevalue,nods;
+	double   *x           = NULL;
+	double   *y           = NULL;
+	char     *contourname = NULL;
+	Contours *contours    = NULL;
 
 	/* output: */
@@ -49,5 +49,5 @@
 	xDelete<double>(y);
 	xDelete<char>(contourname);
-	//delete contours;
+	delete contours;
 
 	/*end module: */
Index: /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.cpp	(revision 15335)
@@ -25,5 +25,5 @@
 
 	/* output: */
-	DataSet* contours=NULL;
+	Contours* contours=NULL;
 
 	/*Boot module: */
@@ -37,5 +37,5 @@
 
 	/*Initialize output: */
-	contours=new DataSet();
+	contours=new Contours();
 
 	/* Run core computations: */
Index: /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp	(revision 15335)
@@ -183,5 +183,5 @@
 		if(newnods>=minimumvertices){
 			_printf_("   Final   number of vertices in contour #"<<counter+1<<": "<<newnods << "\n");
-			newcontour       = xNew<Contour<double> >(1);
+			newcontour       = new Contour<double>();
 			newcontour->nods = newnods;
 			newcontour->x    = xNew<double>(newnods);
Index: /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp	(revision 15335)
@@ -101,5 +101,5 @@
 		for(i=0;i<numcontours;i++){
 			//allocate
-			contouri=xNew<Contour<double> >(1);
+			contouri=new Contour<double>();
 			//retrieve dimension of this contour.
 			contouri->nods=(int)mxGetScalar(mxGetField(matlabstructure,i,"nods"));
Index: /issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp	(revision 15335)
@@ -36,14 +36,14 @@
 	/* required input: */
 	//mesh
-	double* double_index=NULL;
-	int*    index=NULL;
+	double *double_index = NULL;
+	int    *index        = NULL;
 	int     nel;
-	double* x=NULL;
-	double* y=NULL;
+	double *x            = NULL;
+	double *y            = NULL;
 	int     nods;
 	int     dummy;
 
 	//contours
-	DataSet          *domain      = NULL;
+	Contours         *domain      = NULL;
 	Contour<double> **contours=NULL;
 	int               numcontours;
Index: /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp	(revision 15335)
@@ -17,7 +17,7 @@
 
 	/*intermediary: */
-	double   area;
-	DataSet *domain = NULL;
-	DataSet *rifts  = NULL;
+	double    area;
+	Contours *domain = NULL;
+	Contours *rifts  = NULL;
 
 	/* output: */
Index: /issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp	(revision 15335)
@@ -634,10 +634,10 @@
 }
 /*}}}*/
-/*FUNCTION FetchData(DataSet** pcontours,const mxArray* dataref){{{*/
-void FetchData(DataSet** pcontours,const mxArray* dataref){
-
-	int              numcontours,index,test1,test2;
+/*FUNCTION FetchData(Contours** pcontours,const mxArray* dataref){{{*/
+void FetchData(Contours** pcontours,const mxArray* dataref){
+
+	int             numcontours,index,test1,test2;
 	char            *contourname = NULL;
-	Contours         *contours    = NULL;
+	Contours        *contours    = NULL;
 	Contour<double> *contouri    = NULL;
 
@@ -653,5 +653,5 @@
 		for(int i=0;i<numcontours;i++){
 
-			contouri=xNew<Contour<double> >(1);
+			contouri=new Contour<double>();
 
 			index = mxGetFieldNumber(dataref,"nods");
Index: /issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp	(revision 15335)
@@ -360,6 +360,6 @@
 }
 /*}}}*/
-/*FUNCTION WriteData(mxArray** pdataref,DataSet* contours){{{*/
-void WriteData(mxArray** pdataref,DataSet* contours){
+/*FUNCTION WriteData(mxArray** pdataref,Contours* contours){{{*/
+void WriteData(mxArray** pdataref,Contours* contours){
 
 	/*Intermediary*/
Index: /issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h
===================================================================
--- /issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h	(revision 15335)
@@ -32,5 +32,5 @@
 void WriteData(mxArray** pdataref,BamgMesh* bamgmesh);
 void WriteData(mxArray** pdataref,RiftStruct* riftstruct);
-void WriteData(mxArray** pdataref,DataSet* contours);
+void WriteData(mxArray** pdataref,Contours* contours);
 
 void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref);
@@ -54,5 +54,5 @@
 void FetchData(BamgOpts** bamgopts,const mxArray* dataref);
 void FetchData(Options** poptions,int istart, int nrhs,const mxArray** pdataref);
-void FetchData(DataSet** pcontours,const mxArray* dataref);
+void FetchData(Contours** pcontours,const mxArray* dataref);
 
 Option* OptionParse(char* name, const mxArray* prhs[]);
Index: /issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp
===================================================================
--- /issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp	(revision 15335)
@@ -739,10 +739,10 @@
 }
 /*}}}*/
-/*FUNCTION FetchData(DataSet** pcontours,PyObject* py_list){{{*/
-void FetchData(DataSet** pcontours,PyObject* py_list){
+/*FUNCTION FetchData(Contours** pcontours,PyObject* py_list){{{*/
+void FetchData(Contours** pcontours,PyObject* py_list){
 
 	int              numcontours,test1,test2;
 	char            *contourname = NULL;
-	DataSet         *contours    = NULL;
+	Contours         *contours    = NULL;
 	Contour<double> *contouri    = NULL;
 	PyObject        *py_dicti    = NULL;
@@ -755,10 +755,10 @@
 	else if(PyList_Check(py_list)){
 
-		contours=new DataSet(0);
+		contours=new Contours();
 		numcontours=(int)PyList_Size(py_list);
 
 		for(int i=0;i<numcontours;i++){
 
-			contouri=xNew<Contour<double> >(1);
+			contouri=new Contour<double>();
 			py_dicti=PyList_GetItem(py_list,(Py_ssize_t)i);
 
Index: /issm/trunk-jpl/src/wrappers/python/io/pythonio.h
===================================================================
--- /issm/trunk-jpl/src/wrappers/python/io/pythonio.h	(revision 15334)
+++ /issm/trunk-jpl/src/wrappers/python/io/pythonio.h	(revision 15335)
@@ -45,5 +45,5 @@
 void FetchData(BamgOpts** bamgopts,PyObject* py_dict);
 void FetchData(Options** poptions,int istart, int nrhs,PyObject* py_tuple);
-void FetchData(DataSet** pcontours,PyObject* py_list);
+void FetchData(Contours** pcontours,PyObject* py_list);
 
 int CheckNumPythonArguments(PyObject* inputs,int NRHS, void (*function)( void ));