Index: /issm/trunk-jpl/src/mex/AddExternalResult/AddExternalResult.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/AddExternalResult/AddExternalResult.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/AddExternalResult/AddExternalResult.cpp	(revision 11933)
@@ -19,7 +19,7 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&results,RESULTS);
-	FetchMatlabData(&type,TYPE);
-	FetchMatlabData(&value,&nraws,&ncols,VALUE);
+	FetchData(&results,RESULTS);
+	FetchData(&type,TYPE);
+	FetchData(&value,&nraws,&ncols,VALUE);
 
 	/*results might be NILL, allocate: */
@@ -38,5 +38,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(RESULTSOUT,results);
+	WriteData(RESULTSOUT,results);
 	
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/AddExternalResult/AddExternalResult.h
===================================================================
--- /issm/trunk-jpl/src/mex/AddExternalResult/AddExternalResult.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/AddExternalResult/AddExternalResult.h	(revision 11933)
@@ -9,4 +9,5 @@
 void AddExternalResultUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/AverageFilter/AverageFilter.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/AverageFilter/AverageFilter.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/AverageFilter/AverageFilter.cpp	(revision 11933)
@@ -37,6 +37,6 @@
 
 	/*Fetch data: */
-	FetchMatlabData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN);
-	FetchMatlabData(&smooth,SMOOTH);
+	FetchData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN);
+	FetchData(&smooth,SMOOTH);
 	
 	/*Run core hole filler routine: */
@@ -44,5 +44,5 @@
 
 	/* output: */
-	WriteMatlabData(IMAGEOUT,imageout,imagein_rows,imagein_cols);
+	WriteData(IMAGEOUT,imageout,imagein_rows,imagein_cols);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/AverageFilter/AverageFilter.h
===================================================================
--- /issm/trunk-jpl/src/mex/AverageFilter/AverageFilter.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/AverageFilter/AverageFilter.h	(revision 11933)
@@ -11,4 +11,5 @@
 void AverageFilterUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/BamgConvertMesh/BamgConvertMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/BamgConvertMesh/BamgConvertMesh.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/BamgConvertMesh/BamgConvertMesh.cpp	(revision 11933)
@@ -38,7 +38,7 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs\n");
-	FetchMatlabData(&index,&nels,&index_rows,INDEXHANDLE);
-	FetchMatlabData(&x,&nods,&x_cols,XHANDLE);
-	FetchMatlabData(&y,&y_rows,&y_cols,YHANDLE);
+	FetchData(&index,&nels,&index_rows,INDEXHANDLE);
+	FetchData(&x,&nods,&x_cols,XHANDLE);
+	FetchData(&y,&y_rows,&y_cols,YHANDLE);
 
 	/*Check inputs*/
Index: /issm/trunk-jpl/src/mex/BamgConvertMesh/BamgConvertMesh.h
===================================================================
--- /issm/trunk-jpl/src/mex/BamgConvertMesh/BamgConvertMesh.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/BamgConvertMesh/BamgConvertMesh.h	(revision 11933)
@@ -9,4 +9,5 @@
 void BamgConvertMeshUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/BamgMesher/BamgMesher.h
===================================================================
--- /issm/trunk-jpl/src/mex/BamgMesher/BamgMesher.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/BamgMesher/BamgMesher.h	(revision 11933)
@@ -9,4 +9,5 @@
 void BamgMesherUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/BamgTriangulate/BamgTriangulate.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/BamgTriangulate/BamgTriangulate.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/BamgTriangulate/BamgTriangulate.cpp	(revision 11933)
@@ -28,6 +28,6 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs\n");
-	FetchMatlabData(&x,&nods,&x_cols,XHANDLE);
-	FetchMatlabData(&y,&y_rows,&y_cols,YHANDLE);
+	FetchData(&x,&nods,&x_cols,XHANDLE);
+	FetchData(&y,&y_rows,&y_cols,YHANDLE);
 
 	/*Check inputs*/
@@ -41,5 +41,5 @@
 
 	/*Write output*/
-	WriteMatlabData(INDEX,index,nels,3);
+	WriteData(INDEX,index,nels,3);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/BamgTriangulate/BamgTriangulate.h
===================================================================
--- /issm/trunk-jpl/src/mex/BamgTriangulate/BamgTriangulate.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/BamgTriangulate/BamgTriangulate.h	(revision 11933)
@@ -9,4 +9,5 @@
 void BamgTriangulateUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Chaco/Chaco.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Chaco/Chaco.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Chaco/Chaco.cpp	(revision 11933)
@@ -74,17 +74,17 @@
 
 	/*Fetch rest of data: */
-	FetchMatlabData(&vwgts,&nterms,VWGTS_IN); 
+	FetchData(&vwgts,&nterms,VWGTS_IN); 
 
-	FetchMatlabData(&x,&nterms,X_IN); 
-	FetchMatlabData(&y,&nterms,Y_IN); 
-	FetchMatlabData(&z,&nterms,Z_IN); 
+	FetchData(&x,&nterms,X_IN); 
+	FetchData(&y,&nterms,Y_IN); 
+	FetchData(&z,&nterms,Z_IN); 
 	
-	FetchMatlabData(&in_options,&nterms,OPTNS_IN); 
+	FetchData(&in_options,&nterms,OPTNS_IN); 
 	for (i=0;i<(nterms<10?nterms:10);i++) options[i]=in_options[i]; //copy in_options into default options
 	
-	FetchMatlabData(&npart,NPARTS_IN); 
+	FetchData(&npart,NPARTS_IN); 
 	nparts=(int*)xmalloc(sizeof(int)); nparts[0]=npart; //weird Chacox interface ain't it?
 
-	FetchMatlabData(&goal,&nterms,GOAL_IN); 
+	FetchData(&goal,&nterms,GOAL_IN); 
 	
 	/*Some debugging print: {{{*/
@@ -120,5 +120,5 @@
 	doubleassignment=(double*)xmalloc(nvtxs*sizeof(double));
 	for (i=0;i<nvtxs;i++) doubleassignment[i]=(double)assignment[i];
-	WriteMatlabData(ASSGN_OUT,doubleassignment,nvtxs);
+	WriteData(ASSGN_OUT,doubleassignment,nvtxs);
 
 	/*Free ressources:*/
Index: /issm/trunk-jpl/src/mex/Chaco/Chaco.h
===================================================================
--- /issm/trunk-jpl/src/mex/Chaco/Chaco.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Chaco/Chaco.h	(revision 11933)
@@ -13,4 +13,5 @@
 #include <time.h>      /*  clock,time,difftime  */
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ComputeBasalStress/ComputeBasalStress.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ComputeBasalStress/ComputeBasalStress.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ComputeBasalStress/ComputeBasalStress.cpp	(revision 11933)
@@ -26,10 +26,10 @@
         
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -42,5 +42,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(SIGMA,sigma_g);
+	WriteData(SIGMA,sigma_g);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ComputeBasalStress/ComputeBasalStress.h
===================================================================
--- /issm/trunk-jpl/src/mex/ComputeBasalStress/ComputeBasalStress.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ComputeBasalStress/ComputeBasalStress.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ComputeBasalStressUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ConfigureObjects/ConfigureObjects.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ConfigureObjects/ConfigureObjects.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ConfigureObjects/ConfigureObjects.cpp	(revision 11933)
@@ -24,10 +24,10 @@
 	
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*!Configure objects:*/
@@ -35,8 +35,8 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(LOADS,loads);
-	WriteMatlabData(NODESOUT,nodes);
-	WriteMatlabData(PARAMETERSOUT,parameters);
+	WriteData(ELEMENTS,elements);
+	WriteData(LOADS,loads);
+	WriteData(NODESOUT,nodes);
+	WriteData(PARAMETERSOUT,parameters);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ConfigureObjects/ConfigureObjects.h
===================================================================
--- /issm/trunk-jpl/src/mex/ConfigureObjects/ConfigureObjects.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ConfigureObjects/ConfigureObjects.h	(revision 11933)
@@ -11,4 +11,5 @@
 void ConfigureObjectsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ConstraintsState/ConstraintsState.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ConstraintsState/ConstraintsState.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ConstraintsState/ConstraintsState.cpp	(revision 11933)
@@ -26,10 +26,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -42,7 +42,7 @@
 
 	/*write output datasets: */
-	WriteMatlabData(LOADS,loads);
-	WriteMatlabData(CONVERGED,converged);
-	WriteMatlabData(NUMUNSTABLECONSTRAINTS,num_unstable_constraints);
+	WriteData(LOADS,loads);
+	WriteData(CONVERGED,converged);
+	WriteData(NUMUNSTABLECONSTRAINTS,num_unstable_constraints);
 	
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ConstraintsState/ConstraintsState.h
===================================================================
--- /issm/trunk-jpl/src/mex/ConstraintsState/ConstraintsState.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ConstraintsState/ConstraintsState.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ConstraintsStateUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ContourToMesh/ContourToMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ContourToMesh/ContourToMesh.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ContourToMesh/ContourToMesh.cpp	(revision 11933)
@@ -58,8 +58,8 @@
 
 	/*Fetch inputs: */
-	FetchMatlabData(&index,&nel,NULL,INDEXHANDLE);
-	FetchMatlabData(&x,&nods,NULL,XHANDLE);
-	FetchMatlabData(&y,NULL,NULL,YHANDLE);
-	FetchMatlabData(&edgevalue,EDGEVALUEHANDLE);
+	FetchData(&index,&nel,NULL,INDEXHANDLE);
+	FetchData(&x,&nods,NULL,XHANDLE);
+	FetchData(&y,NULL,NULL,YHANDLE);
+	FetchData(&edgevalue,EDGEVALUEHANDLE);
 
 	//Fetch contours
@@ -78,5 +78,5 @@
 
 	/*Fetch  interptype: */
-	FetchMatlabData(&interptype,INTERPTYPEHANDLE);
+	FetchData(&interptype,INTERPTYPEHANDLE);
 
 	/* Debugging of contours :{{{1*/
@@ -96,12 +96,12 @@
 	/* output: */
 	if (strcmp(interptype,"node")==0){
-		WriteMatlabData(PLHS0,in_nod);
+		WriteData(PLHS0,in_nod);
 	}
 	else if (strcmp(interptype,"element")==0){
-		WriteMatlabData(PLHS0,in_elem);
+		WriteData(PLHS0,in_elem);
 	}
 	else if (strcmp(interptype,"element and node")==0){
-		WriteMatlabData(PLHS0,in_nod);
-		WriteMatlabData(PLHS1,in_elem);
+		WriteData(PLHS0,in_nod);
+		WriteData(PLHS1,in_elem);
 	}
 	else _error_(" wrong interpolation type");
Index: /issm/trunk-jpl/src/mex/ContourToMesh/ContourToMesh.h
===================================================================
--- /issm/trunk-jpl/src/mex/ContourToMesh/ContourToMesh.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ContourToMesh/ContourToMesh.h	(revision 11933)
@@ -11,4 +11,5 @@
 void ContourToMeshUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ContourToNodes/ContourToNodes.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ContourToNodes/ContourToNodes.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ContourToNodes/ContourToNodes.cpp	(revision 11933)
@@ -52,7 +52,7 @@
 	
 	/*Fetch inputs: */
-	FetchMatlabData(&x,&nods,NULL,XHANDLE);
-	FetchMatlabData(&y,NULL,NULL,YHANDLE);
-	FetchMatlabData(&edgevalue,EDGEVALUEHANDLE);
+	FetchData(&x,&nods,NULL,XHANDLE);
+	FetchData(&y,NULL,NULL,YHANDLE);
+	FetchData(&edgevalue,EDGEVALUEHANDLE);
 
 	//Fetch contours
@@ -95,5 +95,5 @@
 
 	/* output: */
-	WriteMatlabData(FLAGS,flags);
+	WriteData(FLAGS,flags);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/ContourToNodes/ContourToNodes.h
===================================================================
--- /issm/trunk-jpl/src/mex/ContourToNodes/ContourToNodes.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ContourToNodes/ContourToNodes.h	(revision 11933)
@@ -11,4 +11,5 @@
 void ContourToNodesUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp	(revision 11933)
@@ -25,10 +25,10 @@
 	
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -42,5 +42,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(GRADIENT,gradient);
+	WriteData(GRADIENT,gradient);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h
===================================================================
--- /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ControlInputGetGradientUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp	(revision 11933)
@@ -24,12 +24,12 @@
 
 /*Input datasets: */
-FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-FetchMatlabData((DataSet**)&nodes,NODESIN);
-FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-FetchMatlabData((DataSet**)&loads,LOADSIN);
-FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-FetchMatlabData(&parameters,PARAMETERSIN);
-FetchMatlabData(&norm_list,NULL,NULL,NORMLIST);
-FetchMatlabData(&step,STEP);
+FetchData((DataSet**)&elements,ELEMENTSIN);
+FetchData((DataSet**)&nodes,NODESIN);
+FetchData((DataSet**)&vertices,VERTICESIN);
+FetchData((DataSet**)&loads,LOADSIN);
+FetchData((DataSet**)&materials,MATERIALSIN);
+FetchData(&parameters,PARAMETERSIN);
+FetchData(&norm_list,NULL,NULL,NORMLIST);
+FetchData(&step,STEP);
 
 /*configure: */
@@ -42,10 +42,10 @@
 
 /*write output datasets: */
-WriteMatlabData(ELEMENTS,elements);
-WriteMatlabData(NODES,nodes);
-WriteMatlabData(VERTICES,vertices);
-WriteMatlabData(LOADS,loads);
-WriteMatlabData(MATERIALS,materials);
-WriteMatlabData(PARAMETERS,parameters);
+WriteData(ELEMENTS,elements);
+WriteData(NODES,nodes);
+WriteData(VERTICES,vertices);
+WriteData(LOADS,loads);
+WriteData(MATERIALS,materials);
+WriteData(PARAMETERS,parameters);
 
 /*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h
===================================================================
--- /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ControlInputScaleGradientUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp	(revision 11933)
@@ -23,11 +23,11 @@
 
 /*Input datasets: */
-FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-FetchMatlabData((DataSet**)&nodes,NODESIN);
-FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-FetchMatlabData((DataSet**)&loads,LOADSIN);
-FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-FetchMatlabData(&parameters,PARAMETERSIN);
-FetchMatlabData(&gradient,NULL,GRADIENT);
+FetchData((DataSet**)&elements,ELEMENTSIN);
+FetchData((DataSet**)&nodes,NODESIN);
+FetchData((DataSet**)&vertices,VERTICESIN);
+FetchData((DataSet**)&loads,LOADSIN);
+FetchData((DataSet**)&materials,MATERIALSIN);
+FetchData(&parameters,PARAMETERSIN);
+FetchData(&gradient,NULL,GRADIENT);
 
 /*configure: */
@@ -40,10 +40,10 @@
 
 /*write output datasets: */
-WriteMatlabData(ELEMENTS,elements);
-WriteMatlabData(NODES,nodes);
-WriteMatlabData(VERTICES,vertices);
-WriteMatlabData(LOADS,loads);
-WriteMatlabData(MATERIALS,materials);
-WriteMatlabData(PARAMETERS,parameters);
+WriteData(ELEMENTS,elements);
+WriteData(NODES,nodes);
+WriteData(VERTICES,vertices);
+WriteData(LOADS,loads);
+WriteData(MATERIALS,materials);
+WriteData(PARAMETERS,parameters);
 
 /*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h
===================================================================
--- /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ControlInputSetGradientUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ControlOptimization/ControlOptimization.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ControlOptimization/ControlOptimization.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlOptimization/ControlOptimization.cpp	(revision 11933)
@@ -29,12 +29,12 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&function_name,FUNCTIONNAME);
-	FetchMatlabData(&xmin,XMIN);
-	FetchMatlabData(&xmax,XMAX);
+	FetchData(&function_name,FUNCTIONNAME);
+	FetchData(&xmin,XMIN);
+	FetchData(&xmax,XMAX);
 
 	/*Parameters: */
-	FetchMatlabData(&maxiter,NULL,NULL,mxGetField(OPTIONS,0,"MaxIter"));
-	FetchMatlabData(&threshold,NULL,NULL,mxGetField(PARAMETERS,0,"InversionStepThreshold"));
-	FetchMatlabData(&n_value,STEP);
+	FetchData(&maxiter,NULL,NULL,mxGetField(OPTIONS,0,"MaxIter"));
+	FetchData(&threshold,NULL,NULL,mxGetField(PARAMETERS,0,"InversionStepThreshold"));
+	FetchData(&n_value,STEP);
 
 	optargs.function_name=function_name;
@@ -49,6 +49,6 @@
 
 	/*write output : */
-	WriteMatlabData(SEARCHSCALAR,search_scalar);
-	WriteMatlabData(MISFIT,J);
+	WriteData(SEARCHSCALAR,search_scalar);
+	WriteData(MISFIT,J);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ControlOptimization/ControlOptimization.h
===================================================================
--- /issm/trunk-jpl/src/mex/ControlOptimization/ControlOptimization.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ControlOptimization/ControlOptimization.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ControlOptimizationUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/CostFunction/CostFunction.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/CostFunction/CostFunction.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/CostFunction/CostFunction.cpp	(revision 11933)
@@ -25,10 +25,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -41,5 +41,5 @@
 
 	/*write output : */
-	WriteMatlabData(COST,J);
+	WriteData(COST,J);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/CostFunction/CostFunction.h
===================================================================
--- /issm/trunk-jpl/src/mex/CostFunction/CostFunction.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/CostFunction/CostFunction.h	(revision 11933)
@@ -9,4 +9,5 @@
 void CostFunctionUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp	(revision 11933)
@@ -26,11 +26,11 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
-	FetchMatlabData(&kmax,KMAX);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
+	FetchData(&kmax,KMAX);
 
 	/*configure: */
@@ -44,5 +44,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(JFF,Jff);
+	WriteData(JFF,Jff);
 	
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h
===================================================================
--- /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h	(revision 11933)
@@ -9,4 +9,5 @@
 void CreateJacobianMatrixUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.cpp	(revision 11933)
@@ -21,6 +21,6 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData(&analysis_type,ANALYSISTYPE);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData(&analysis_type,ANALYSISTYPE);
 
 	/*!Reduce vector: */
@@ -28,5 +28,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(YS,ys);
+	WriteData(YS,ys);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.h
===================================================================
--- /issm/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.h	(revision 11933)
@@ -9,4 +9,5 @@
 void CreateNodalConstraintsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Dakota/Dakota.h
===================================================================
--- /issm/trunk-jpl/src/mex/Dakota/Dakota.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Dakota/Dakota.h	(revision 11933)
@@ -11,4 +11,5 @@
 void DakotaUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/DakotaResponses/DakotaResponses.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/DakotaResponses/DakotaResponses.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/DakotaResponses/DakotaResponses.cpp	(revision 11933)
@@ -31,10 +31,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-	FetchMatlabData(&parameters,PARAMETERSIN);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALSIN);
+	FetchData(&parameters,PARAMETERSIN);
 
 	/*number of responses: */
@@ -64,5 +64,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(RESPONSES,responses,numresponses);
+	WriteData(RESPONSES,responses,numresponses);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/DakotaResponses/DakotaResponses.h
===================================================================
--- /issm/trunk-jpl/src/mex/DakotaResponses/DakotaResponses.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/DakotaResponses/DakotaResponses.h	(revision 11933)
@@ -9,4 +9,5 @@
 void DakotaResponsesUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Echo/Echo.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Echo/Echo.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Echo/Echo.cpp	(revision 11933)
@@ -17,5 +17,5 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&dataset,DATASET);
+	FetchData(&dataset,DATASET);
 
 	/*Echo dataset: */
Index: /issm/trunk-jpl/src/mex/Echo/Echo.h
===================================================================
--- /issm/trunk-jpl/src/mex/Echo/Echo.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Echo/Echo.h	(revision 11933)
@@ -9,4 +9,5 @@
 void EchoUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ElementConnectivity/ElementConnectivity.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ElementConnectivity/ElementConnectivity.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ElementConnectivity/ElementConnectivity.cpp	(revision 11933)
@@ -23,6 +23,6 @@
         
 	/*Input datasets: */
-	FetchMatlabData(&elements,&nel,NULL,ELEMENTS);
-	FetchMatlabData(&nodeconnectivity,&nods,&width,NODECONNECTIVITY);
+	FetchData(&elements,&nel,NULL,ELEMENTS);
+	FetchData(&nodeconnectivity,&nods,&width,NODECONNECTIVITY);
 
 	/*!Generate internal degree of freedom numbers: */
@@ -30,5 +30,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTCONNECTIVITY,elementconnectivity,nel,3);
+	WriteData(ELEMENTCONNECTIVITY,elementconnectivity,nel,3);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ElementConnectivity/ElementConnectivity.h
===================================================================
--- /issm/trunk-jpl/src/mex/ElementConnectivity/ElementConnectivity.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ElementConnectivity/ElementConnectivity.h	(revision 11933)
@@ -11,4 +11,5 @@
 void ElementConnectivityUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/EnumToString/EnumToString.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/EnumToString/EnumToString.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/EnumToString/EnumToString.cpp	(revision 11933)
@@ -16,5 +16,5 @@
 
 	/*Fetch inputs: */
-	FetchMatlabData(&enum_in,ENUMIN);
+	FetchData(&enum_in,ENUMIN);
 
 	/*Run core function: */
@@ -22,5 +22,5 @@
 
 	/* output: */
-	WriteMatlabData(NAME,name);
+	WriteData(NAME,name);
 }
 
Index: /issm/trunk-jpl/src/mex/EnumToString/EnumToString.h
===================================================================
--- /issm/trunk-jpl/src/mex/EnumToString/EnumToString.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/EnumToString/EnumToString.h	(revision 11933)
@@ -9,4 +9,5 @@
 void EnumToStringUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Exp2Kml/Exp2Kml.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Exp2Kml/Exp2Kml.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Exp2Kml/Exp2Kml.cpp	(revision 11933)
@@ -35,9 +35,9 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&filexp,EXP_IN);
+	FetchData(&filexp,EXP_IN);
 	if (verbose) printf("  filexp=\"%s\"\n",filexp);
-	FetchMatlabData(&filkml,KML_IN);
+	FetchData(&filkml,KML_IN);
 	if (verbose) printf("  filkml=\"%s\"\n",filkml);
-	FetchMatlabData(&sgn,SGN_IN);
+	FetchData(&sgn,SGN_IN);
 	if (verbose) printf("  sgn=%d\n",sgn);
 
@@ -76,5 +76,5 @@
 
 	/*Write data: */
-	WriteMatlabData(RET_OUT,iret);
+	WriteData(RET_OUT,iret);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/Exp2Kml/Exp2Kml.h
===================================================================
--- /issm/trunk-jpl/src/mex/Exp2Kml/Exp2Kml.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Exp2Kml/Exp2Kml.h	(revision 11933)
@@ -9,4 +9,5 @@
 void Exp2KmlUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.cpp	(revision 11933)
@@ -25,10 +25,10 @@
 	
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -41,5 +41,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(UG,ug);
+	WriteData(UG,ug);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.h
===================================================================
--- /issm/trunk-jpl/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.h	(revision 11933)
@@ -9,4 +9,5 @@
 void GetSolutionFromInputsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/GetVectorFromInputs/GetVectorFromInputs.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/GetVectorFromInputs/GetVectorFromInputs.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/GetVectorFromInputs/GetVectorFromInputs.cpp	(revision 11933)
@@ -27,12 +27,12 @@
 	
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
-	FetchMatlabData(&name_enum,NAMEENUM);
-	FetchMatlabData(&type_enum,TYPEENUM);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
+	FetchData(&name_enum,NAMEENUM);
+	FetchData(&type_enum,TYPEENUM);
 
 	/*configure: */
@@ -45,5 +45,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(UG,ug);
+	WriteData(UG,ug);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/GetVectorFromInputs/GetVectorFromInputs.h
===================================================================
--- /issm/trunk-jpl/src/mex/GetVectorFromInputs/GetVectorFromInputs.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/GetVectorFromInputs/GetVectorFromInputs.h	(revision 11933)
@@ -9,4 +9,5 @@
 void GetVectorFromInputsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Gradj/Gradj.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Gradj/Gradj.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Gradj/Gradj.cpp	(revision 11933)
@@ -27,10 +27,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 	parameters->FindParam(&num_controls,InversionNumControlParametersEnum); 
 
@@ -44,6 +44,6 @@
 
 	/*write output : */
-	WriteMatlabData(NORMLIST,norm_list,num_controls,1);
-	WriteMatlabData(GRADG,gradient);
+	WriteData(NORMLIST,norm_list,num_controls,1);
+	WriteData(GRADG,gradient);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/Gradj/Gradj.h
===================================================================
--- /issm/trunk-jpl/src/mex/Gradj/Gradj.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Gradj/Gradj.h	(revision 11933)
@@ -9,4 +9,5 @@
 void GradjUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/GroundinglineMigration/GroundinglineMigration.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/GroundinglineMigration/GroundinglineMigration.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/GroundinglineMigration/GroundinglineMigration.cpp	(revision 11933)
@@ -22,10 +22,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-	FetchMatlabData(&parameters,PARAMETERSIN);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALSIN);
+	FetchData(&parameters,PARAMETERSIN);
 
 	/*configure: */
@@ -38,10 +38,10 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(NODES,nodes);
-	WriteMatlabData(VERTICES,vertices);
-	WriteMatlabData(LOADS,loads);
-	WriteMatlabData(MATERIALS,materials);
-	WriteMatlabData(PARAMETERS,parameters);
+	WriteData(ELEMENTS,elements);
+	WriteData(NODES,nodes);
+	WriteData(VERTICES,vertices);
+	WriteData(LOADS,loads);
+	WriteData(MATERIALS,materials);
+	WriteData(PARAMETERS,parameters);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/GroundinglineMigration/GroundinglineMigration.h
===================================================================
--- /issm/trunk-jpl/src/mex/GroundinglineMigration/GroundinglineMigration.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/GroundinglineMigration/GroundinglineMigration.h	(revision 11933)
@@ -9,4 +9,5 @@
 void GroundinglineMigrationUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/HoleFiller/HoleFiller.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/HoleFiller/HoleFiller.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/HoleFiller/HoleFiller.cpp	(revision 11933)
@@ -38,6 +38,6 @@
 
 	/*Fetch data: */
-	FetchMatlabData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN);
-	FetchMatlabData(&smooth_flag,SMOOTH);
+	FetchData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN);
+	FetchData(&smooth_flag,SMOOTH);
 	
 	/*Get smooth flag setup: */
@@ -51,5 +51,5 @@
 
 	/* output: */
-	WriteMatlabData(IMAGEOUT,imageout,imagein_rows,imagein_cols);
+	WriteData(IMAGEOUT,imageout,imagein_rows,imagein_cols);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/HoleFiller/HoleFiller.h
===================================================================
--- /issm/trunk-jpl/src/mex/HoleFiller/HoleFiller.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/HoleFiller/HoleFiller.h	(revision 11933)
@@ -11,4 +11,5 @@
 void HoleFillerUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputControlUpdate/InputControlUpdate.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputControlUpdate/InputControlUpdate.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputControlUpdate/InputControlUpdate.cpp	(revision 11933)
@@ -24,12 +24,12 @@
 
 /*Input datasets: */
-FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-FetchMatlabData((DataSet**)&nodes,NODESIN);
-FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-FetchMatlabData((DataSet**)&loads,LOADSIN);
-FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-FetchMatlabData(&parameters,PARAMETERSIN);
-FetchMatlabData(&scalar,SCALAR);
-FetchMatlabData(&update,UPDATE);
+FetchData((DataSet**)&elements,ELEMENTSIN);
+FetchData((DataSet**)&nodes,NODESIN);
+FetchData((DataSet**)&vertices,VERTICESIN);
+FetchData((DataSet**)&loads,LOADSIN);
+FetchData((DataSet**)&materials,MATERIALSIN);
+FetchData(&parameters,PARAMETERSIN);
+FetchData(&scalar,SCALAR);
+FetchData(&update,UPDATE);
 
 /*configure: */
@@ -42,10 +42,10 @@
 
 /*write output datasets: */
-WriteMatlabData(ELEMENTS,elements);
-WriteMatlabData(NODES,nodes);
-WriteMatlabData(VERTICES,vertices);
-WriteMatlabData(LOADS,loads);
-WriteMatlabData(MATERIALS,materials);
-WriteMatlabData(PARAMETERS,parameters);
+WriteData(ELEMENTS,elements);
+WriteData(NODES,nodes);
+WriteData(VERTICES,vertices);
+WriteData(LOADS,loads);
+WriteData(MATERIALS,materials);
+WriteData(PARAMETERS,parameters);
 
 /*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputControlUpdate/InputControlUpdate.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputControlUpdate/InputControlUpdate.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputControlUpdate/InputControlUpdate.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputControlUpdateUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputConvergence/InputConvergence.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputConvergence/InputConvergence.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputConvergence/InputConvergence.cpp	(revision 11933)
@@ -35,17 +35,17 @@
 	CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputConvergenceUsage);
 
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
-	FetchMatlabData(&double_fields,&numfields,FIELDENUMS);
+	FetchData(&double_fields,&numfields,FIELDENUMS);
 	field_enums=(int*)xmalloc(numfields*sizeof(int));
 	for(i=0;i<numfields;i++)field_enums[i]=(int)double_fields[i];
 
-	FetchMatlabData(&double_criterion,&numcriterions,CRITERIONENUMS);
-	FetchMatlabData(&criterion_values,&numcriterions,CRITERIONVALUES);
+	FetchData(&double_criterion,&numcriterions,CRITERIONENUMS);
+	FetchData(&criterion_values,&numcriterions,CRITERIONVALUES);
 	criterion_enums=(int*)xmalloc(numcriterions*sizeof(int));
 	for(i=0;i<numcriterions;i++)criterion_enums[i]=(int)double_criterion[i];
@@ -60,5 +60,5 @@
 
 	/*Write output data: */
-	WriteMatlabData(CONVERGED,converged);
+	WriteData(CONVERGED,converged);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputConvergence/InputConvergence.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputConvergence/InputConvergence.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputConvergence/InputConvergence.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputConvergenceUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputDuplicate/InputDuplicate.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputDuplicate/InputDuplicate.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputDuplicate/InputDuplicate.cpp	(revision 11933)
@@ -23,13 +23,13 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 	
-	FetchMatlabData(&original_enum,ORIGINALENUM);
-	FetchMatlabData(&new_enum,NEWENUM);
+	FetchData(&original_enum,ORIGINALENUM);
+	FetchData(&new_enum,NEWENUM);
 
 	/*!Call core code: */
@@ -37,5 +37,5 @@
 
 	/*write output : */
-	WriteMatlabData(ELEMENTSOUT,elements);
+	WriteData(ELEMENTSOUT,elements);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputDuplicate/InputDuplicate.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputDuplicate/InputDuplicate.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputDuplicate/InputDuplicate.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputDuplicateUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputScale/InputScale.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputScale/InputScale.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputScale/InputScale.cpp	(revision 11933)
@@ -24,13 +24,13 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 	
-	FetchMatlabData(&enum_type,ENUMTYPE);
-	FetchMatlabData(&scale_factor,SCALEFACTOR);
+	FetchData(&enum_type,ENUMTYPE);
+	FetchData(&scale_factor,SCALEFACTOR);
 
 	/*configure: */
@@ -43,5 +43,5 @@
 
 	/*write output : */
-	WriteMatlabData(ELEMENTSOUT,elements);
+	WriteData(ELEMENTSOUT,elements);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputScale/InputScale.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputScale/InputScale.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputScale/InputScale.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputScaleUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputToResult/InputToResult.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputToResult/InputToResult.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputToResult/InputToResult.cpp	(revision 11933)
@@ -28,12 +28,12 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 	
-	FetchMatlabData(&enum_type,ENUMTYPE);
+	FetchData(&enum_type,ENUMTYPE);
 
 	/*configure: */
@@ -46,5 +46,5 @@
 
 	/*write output : */
-	WriteMatlabData(ELEMENTSOUT,elements);
+	WriteData(ELEMENTSOUT,elements);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputToResult/InputToResult.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputToResult/InputToResult.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputToResult/InputToResult.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputToResultUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.cpp	(revision 11933)
@@ -24,12 +24,12 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-	FetchMatlabData(&parameters,PARAMETERSIN);
-	FetchMatlabData(&constant,CONSTANT);
-	FetchMatlabData(&name,NAME);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALSIN);
+	FetchData(&parameters,PARAMETERSIN);
+	FetchData(&constant,CONSTANT);
+	FetchData(&name,NAME);
 
 	/*configure: */
@@ -42,6 +42,6 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(LOADS,loads);
+	WriteData(ELEMENTS,elements);
+	WriteData(LOADS,loads);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputUpdateFromConstantUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp	(revision 11933)
@@ -30,12 +30,12 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-	FetchMatlabData(&parameters,PARAMETERSIN);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALSIN);
+	FetchData(&parameters,PARAMETERSIN);
 	/*dakota input: */
-	FetchMatlabData(&variables,&numvariables,VARIABLES);
+	FetchData(&variables,&numvariables,VARIABLES);
 
 	variables_descriptors=(char**)xmalloc(numvariables*sizeof(char*));
@@ -60,7 +60,7 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(LOADS,loads);
-	WriteMatlabData(MATERIALS,materials);
+	WriteData(ELEMENTS,elements);
+	WriteData(LOADS,loads);
+	WriteData(MATERIALS,materials);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputUpdateFromDakotaUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp	(revision 11933)
@@ -23,11 +23,11 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-	FetchMatlabData(&parameters,PARAMETERSIN);
-	FetchMatlabData(&solution,SOLUTION);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALSIN);
+	FetchData(&parameters,PARAMETERSIN);
+	FetchData(&solution,SOLUTION);
 
 	/*configure: */
@@ -40,6 +40,6 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(MATERIALS,materials);
+	WriteData(ELEMENTS,elements);
+	WriteData(MATERIALS,materials);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InputUpdateFromSolutionUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InputUpdateFromVector/InputUpdateFromVector.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromVector/InputUpdateFromVector.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromVector/InputUpdateFromVector.cpp	(revision 11933)
@@ -26,13 +26,13 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-	FetchMatlabData(&parameters,PARAMETERSIN);
-	FetchMatlabData(&vector,&dummy,VECTOR);
-	FetchMatlabData(&name,NAME);
-	FetchMatlabData(&type,TYPE);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALSIN);
+	FetchData(&parameters,PARAMETERSIN);
+	FetchData(&vector,&dummy,VECTOR);
+	FetchData(&name,NAME);
+	FetchData(&type,TYPE);
 
 	/*Check that type is one of Constant, Vertex or Element: */
@@ -50,10 +50,10 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(NODES,nodes);
-	WriteMatlabData(VERTICES,vertices);
-	WriteMatlabData(LOADS,loads);
-	WriteMatlabData(MATERIALS,materials);
-	WriteMatlabData(PARAMETERS,parameters);
+	WriteData(ELEMENTS,elements);
+	WriteData(NODES,nodes);
+	WriteData(VERTICES,vertices);
+	WriteData(LOADS,loads);
+	WriteData(MATERIALS,materials);
+	WriteData(PARAMETERS,parameters);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InputUpdateFromVector/InputUpdateFromVector.h
===================================================================
--- /issm/trunk-jpl/src/mex/InputUpdateFromVector/InputUpdateFromVector.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InputUpdateFromVector/InputUpdateFromVector.h	(revision 11933)
@@ -11,4 +11,5 @@
 void InputUpdateFromVectorUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InternalFront/InternalFront.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InternalFront/InternalFront.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InternalFront/InternalFront.cpp	(revision 11933)
@@ -25,11 +25,11 @@
 
 	/*Fetch required fields*/
-	FetchMatlabData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));
+	FetchData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));
 	if(numberofelements<=0) _error_("No elements found in the model");
-	FetchMatlabData(&elements,&M,&N,mxGetAssignedField(MODEL,0,"elements"));
+	FetchData(&elements,&M,&N,mxGetAssignedField(MODEL,0,"elements"));
 	if(M!=numberofelements || N!=3) _error_("Field 'elements' should be of size [md.numberofelements 3]");
-	FetchMatlabData(&elementonwater,&M,&N,mxGetAssignedField(MODEL,0,"elementonwater"));
+	FetchData(&elementonwater,&M,&N,mxGetAssignedField(MODEL,0,"elementonwater"));
 	if(M!=numberofelements || N!=1) _error_("Field 'elementonwater' should be of size [md.numberofelements 1]");
-	FetchMatlabData(&elementconnectivity,&M,&N,mxGetAssignedField(MODEL,0,"elementconnectivity"));
+	FetchData(&elementconnectivity,&M,&N,mxGetAssignedField(MODEL,0,"elementconnectivity"));
 	if(M!=numberofelements || N!=3) _error_("Field 'elementconnectivity' should be of size [md.numberofelements 3]");
 
@@ -87,5 +87,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(FRONT,front2,numberofsegments,4);
+	WriteData(FRONT,front2,numberofsegments,4);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/InternalFront/InternalFront.h
===================================================================
--- /issm/trunk-jpl/src/mex/InternalFront/InternalFront.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InternalFront/InternalFront.h	(revision 11933)
@@ -11,4 +11,5 @@
 void InternalFrontUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/shared/shared.h"
 #include "../../c/io/io.h"
Index: /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp	(revision 11933)
@@ -50,14 +50,14 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&x,&x_rows,NULL,XHANDLE);
-	FetchMatlabData(&y,&y_rows,NULL,YHANDLE);
-	FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE);
-	FetchMatlabData(&x_mesh,&x_mesh_rows,NULL,XMESHHANDLE);
-	FetchMatlabData(&y_mesh,&y_mesh_rows,NULL,YMESHHANDLE);
-	FetchMatlabData(&default_value,DEFAULTHANDLE);
+	FetchData(&x,&x_rows,NULL,XHANDLE);
+	FetchData(&y,&y_rows,NULL,YHANDLE);
+	FetchData(&data,&data_rows,&data_cols,DATAHANDLE);
+	FetchData(&x_mesh,&x_mesh_rows,NULL,XMESHHANDLE);
+	FetchData(&y_mesh,&y_mesh_rows,NULL,YMESHHANDLE);
+	FetchData(&default_value,DEFAULTHANDLE);
 
 	/* Run core computations: */
 	if(nrhs==7){
-		FetchMatlabData(&interpolationenum,INTERPENUM);
+		FetchData(&interpolationenum,INTERPENUM);
 		InterpFromGridToMeshx(&data_mesh, x, x_rows,  y, y_rows, data, data_rows,data_cols, x_mesh, y_mesh, x_mesh_rows,default_value,interpolationenum);
 	}
@@ -67,5 +67,5 @@
 
 	/*Write data: */
-	WriteMatlabData(DATAMESH,data_mesh);
+	WriteData(DATAMESH,data_mesh);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InterpFromGridToMeshUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InterpFromMesh2d/InterpFromMesh2d.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMesh2d/InterpFromMesh2d.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMesh2d/InterpFromMesh2d.cpp	(revision 11933)
@@ -77,14 +77,14 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&index_data,&index_data_rows,&dummy,INDEXHANDLE);
-	FetchMatlabData(&x_data,&x_data_rows,NULL,XHANDLE);
-	FetchMatlabData(&y_data,&y_data_rows,NULL,YHANDLE);
-	FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE);
-	FetchMatlabData(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE);
-	FetchMatlabData(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE);
+	FetchData(&index_data,&index_data_rows,&dummy,INDEXHANDLE);
+	FetchData(&x_data,&x_data_rows,NULL,XHANDLE);
+	FetchData(&y_data,&y_data_rows,NULL,YHANDLE);
+	FetchData(&data,&data_rows,&data_cols,DATAHANDLE);
+	FetchData(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE);
+	FetchData(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE);
 
 	if(nrhs>=7){
 		/*default values: */
-		FetchMatlabData(&default_values,&num_default_values,DEFAULTHANDLE);
+		FetchData(&default_values,&num_default_values,DEFAULTHANDLE);
 	}
 	else{
@@ -146,5 +146,5 @@
 
 	/*Write data: */
-	WriteMatlabData(DATAPRIME,data_prime);
+	WriteData(DATAPRIME,data_prime);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/InterpFromMesh2d/InterpFromMesh2d.h
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMesh2d/InterpFromMesh2d.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMesh2d/InterpFromMesh2d.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InterpFromMesh2dUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp	(revision 11933)
@@ -35,15 +35,15 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&index,&nel,NULL,INDEX);
-	FetchMatlabData(&x,&nods,NULL,X);
-	FetchMatlabData(&y,NULL,NULL,Y);
-	FetchMatlabData(&meshdata,&meshdata_length,NULL,MESHDATA);
-	FetchMatlabData(&xmin,XMIN);
-	FetchMatlabData(&ymax,YMAX);
-	FetchMatlabData(&xposting,XPOSTING);
-	FetchMatlabData(&yposting,YPOSTING);
-	FetchMatlabData(&nlines,NLINES);
-	FetchMatlabData(&ncols,NCOLS);
-	FetchMatlabData(&default_value,DEFAULTVALUE);
+	FetchData(&index,&nel,NULL,INDEX);
+	FetchData(&x,&nods,NULL,X);
+	FetchData(&y,NULL,NULL,Y);
+	FetchData(&meshdata,&meshdata_length,NULL,MESHDATA);
+	FetchData(&xmin,XMIN);
+	FetchData(&ymax,YMAX);
+	FetchData(&xposting,XPOSTING);
+	FetchData(&yposting,YPOSTING);
+	FetchData(&nlines,NLINES);
+	FetchData(&ncols,NCOLS);
+	FetchData(&default_value,DEFAULTVALUE);
 
 	/*Call core of computation: */
@@ -51,7 +51,7 @@
 
 	/*Write results: */
-	WriteMatlabData(XM,x_m,ncols);
-	WriteMatlabData(YM,y_m,nlines);
-	WriteMatlabData(GRIDDATA,griddata,nlines,ncols);
+	WriteData(XM,x_m,ncols);
+	WriteData(YM,y_m,nlines);
+	WriteData(GRIDDATA,griddata,nlines,ncols);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h	(revision 11933)
@@ -11,4 +11,5 @@
 void InterpFromMeshToGridUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp	(revision 11933)
@@ -61,10 +61,10 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs\n");
-	FetchMatlabData(&index,&nels_data,&index_cols,INDEXHANDLE);
-	FetchMatlabData(&x_data,&x_data_rows,NULL,XHANDLE);
-	FetchMatlabData(&y_data,&y_data_rows,NULL,YHANDLE);
-	FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE);
-	FetchMatlabData(&x_interp,&x_interp_rows,NULL,XINTERPHANDLE);
-	FetchMatlabData(&y_interp,&y_interp_rows,NULL,YINTERPHANDLE);
+	FetchData(&index,&nels_data,&index_cols,INDEXHANDLE);
+	FetchData(&x_data,&x_data_rows,NULL,XHANDLE);
+	FetchData(&y_data,&y_data_rows,NULL,YHANDLE);
+	FetchData(&data,&data_rows,&data_cols,DATAHANDLE);
+	FetchData(&x_interp,&x_interp_rows,NULL,XINTERPHANDLE);
+	FetchData(&y_interp,&y_interp_rows,NULL,YINTERPHANDLE);
 
 	if(nrhs==8){
@@ -74,5 +74,5 @@
 
 		/*default values: */
-		FetchMatlabData(&default_values,&num_default_values,DEFAULTHANDLE);
+		FetchData(&default_values,&num_default_values,DEFAULTHANDLE);
 
 		/*contours: */
@@ -129,5 +129,5 @@
 
 	/*Write data: */
-	WriteMatlabData(DATAINTERP,data_interp,nods_interp,data_cols);
+	WriteData(DATAINTERP,data_interp,nods_interp,data_cols);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InterpFromMeshToMesh2dUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp	(revision 11933)
@@ -64,13 +64,13 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&index_data,&index_data_rows,NULL,INDEXHANDLE);
-	FetchMatlabData(&x_data,&x_data_rows,NULL,XHANDLE);
-	FetchMatlabData(&y_data,&y_data_rows,NULL,YHANDLE);
-	FetchMatlabData(&z_data,&z_data_rows,NULL,ZHANDLE);
-	FetchMatlabData(&data,&data_rows,&data_cols,DATAHANDLE);
-	FetchMatlabData(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE);
-	FetchMatlabData(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE);
-	FetchMatlabData(&z_prime,&z_prime_rows,NULL,ZPRIMEHANDLE);
-	FetchMatlabData(&default_value,DEFAULTHANDLE);
+	FetchData(&index_data,&index_data_rows,NULL,INDEXHANDLE);
+	FetchData(&x_data,&x_data_rows,NULL,XHANDLE);
+	FetchData(&y_data,&y_data_rows,NULL,YHANDLE);
+	FetchData(&z_data,&z_data_rows,NULL,ZHANDLE);
+	FetchData(&data,&data_rows,&data_cols,DATAHANDLE);
+	FetchData(&x_prime,&x_prime_rows,NULL,XPRIMEHANDLE);
+	FetchData(&y_prime,&y_prime_rows,NULL,YPRIMEHANDLE);
+	FetchData(&z_prime,&z_prime_rows,NULL,ZPRIMEHANDLE);
+	FetchData(&default_value,DEFAULTHANDLE);
 
 	/*some checks*/
@@ -90,5 +90,5 @@
 
 	/*Write data: */
-	WriteMatlabData(DATAPRIME,data_prime);
+	WriteData(DATAPRIME,data_prime);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
===================================================================
--- /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h	(revision 11933)
@@ -9,4 +9,5 @@
 void InterpFromMeshToMesh3dUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp	(revision 11933)
@@ -67,5 +67,5 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&filnam,FILENAME);
+	FetchData(&filnam,FILENAME);
 	if (verbose) printf("  filnam =\"%s\"\n",filnam);
 
@@ -115,5 +115,5 @@
 
 	/*Write data: */
-	WriteMatlabData(ERRORFLAG,ierror);
+	WriteData(ERRORFLAG,ierror);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h
===================================================================
--- /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h	(revision 11933)
@@ -9,4 +9,5 @@
 void KMLFileReadUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLMeshWrite.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLMeshWrite.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLMeshWrite.cpp	(revision 11933)
@@ -62,5 +62,5 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&name,NAME);
+	FetchData(&name,NAME);
 	if (verbose) printf("  name   =\"%s\"\n",name);
 
@@ -84,25 +84,25 @@
 	}
 	else
-		FetchMatlabData(&notes,NOTES);
+		FetchData(&notes,NOTES);
 	if (verbose) printf("  notes  =\"%s\"\n",notes);
 
-	FetchMatlabData(&elem,&melem,&nelem,ELEMHANDLE);
+	FetchData(&elem,&melem,&nelem,ELEMHANDLE);
 	if (verbose) printf("  elem   =size [%d x %d]\n",melem,nelem);
-	FetchMatlabData(&nodecon,&mncon,&nncon,NODECONHANDLE);
+	FetchData(&nodecon,&mncon,&nncon,NODECONHANDLE);
 	if (verbose) printf("  nodecon=size [%d x %d]\n",mncon,nncon);
-	FetchMatlabData(&lat,&mlat,&nlat,LATHANDLE);
+	FetchData(&lat,&mlat,&nlat,LATHANDLE);
 	llat=mlat*nlat;
 	if (verbose) printf("  lat    =length [%d]\n",llat);
-	FetchMatlabData(&lng,&mlng,&nlng,LNGHANDLE);
+	FetchData(&lng,&mlng,&nlng,LNGHANDLE);
 	llng=mlng*nlng;
 	if (verbose) printf("  lng    =length [%d]\n",llng);
-	FetchMatlabData(&part,&mprt,&nprt,PARTHANDLE);
+	FetchData(&part,&mprt,&nprt,PARTHANDLE);
 	lprt=mprt*nprt;
 	if (verbose) printf("  part   =length [%d]\n",lprt);
-	FetchMatlabData(&data,&mdata,&ndata,DATAHANDLE);
+	FetchData(&data,&mdata,&ndata,DATAHANDLE);
 	if (verbose) printf("  data   =size [%d x %d]\n",mdata,ndata);
-	FetchMatlabData(&cmap,&mcmap,&ncmap,CMAPHANDLE);
+	FetchData(&cmap,&mcmap,&ncmap,CMAPHANDLE);
 	if (verbose) printf("  cmap   =size [%d x %d]\n",mcmap,ncmap);
-	FetchMatlabData(&filnam,FILENAME);
+	FetchData(&filnam,FILENAME);
 	if (verbose) printf("  filnam =\"%s\"\n",filnam);
 
@@ -160,5 +160,5 @@
 
 	/*Write data: */
-	WriteMatlabData(ERRORFLAG,ierror);
+	WriteData(ERRORFLAG,ierror);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLMeshWrite.h
===================================================================
--- /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLMeshWrite.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLMeshWrite.h	(revision 11933)
@@ -9,4 +9,5 @@
 void KMLMeshWriteUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/KMLOverlay/KMLOverlay.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/KMLOverlay/KMLOverlay.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/KMLOverlay/KMLOverlay.cpp	(revision 11933)
@@ -41,5 +41,5 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&filkml,FILENAME);
+	FetchData(&filkml,FILENAME);
 	if (verbose) printf("  filkml=\"%s\"\n",filkml);
 
@@ -109,5 +109,5 @@
 
 	/*Write data: */
-	WriteMatlabData(ERRORFLAG,ierror);
+	WriteData(ERRORFLAG,ierror);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/KMLOverlay/KMLOverlay.h
===================================================================
--- /issm/trunk-jpl/src/mex/KMLOverlay/KMLOverlay.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/KMLOverlay/KMLOverlay.h	(revision 11933)
@@ -9,4 +9,5 @@
 void KMLOverlayUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Kml2Exp/Kml2Exp.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Kml2Exp/Kml2Exp.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Kml2Exp/Kml2Exp.cpp	(revision 11933)
@@ -33,9 +33,9 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&filkml,KML_IN);
+	FetchData(&filkml,KML_IN);
 	if (verbose) printf("  filkml=\"%s\"\n",filkml);
-	FetchMatlabData(&filexp,EXP_IN);
+	FetchData(&filexp,EXP_IN);
 	if (verbose) printf("  filexp=\"%s\"\n",filexp);
-	FetchMatlabData(&sgn,SGN_IN);
+	FetchData(&sgn,SGN_IN);
 	if (verbose) printf("  sgn=%d\n",sgn);
 
@@ -69,5 +69,5 @@
 
 	/*Write data: */
-	WriteMatlabData(RET_OUT,iret);
+	WriteData(RET_OUT,iret);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/Kml2Exp/Kml2Exp.h
===================================================================
--- /issm/trunk-jpl/src/mex/Kml2Exp/Kml2Exp.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Kml2Exp/Kml2Exp.h	(revision 11933)
@@ -9,4 +9,5 @@
 void Kml2ExpUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Ll2xy/Ll2xy.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Ll2xy/Ll2xy.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Ll2xy/Ll2xy.cpp	(revision 11933)
@@ -35,15 +35,15 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&lat,&nlat,LAT_IN);
+	FetchData(&lat,&nlat,LAT_IN);
 	if (verbose)
 		if   (nlat == 1) printf("  lat=%g\n",lat[0]);
 		else             printf("  lat=[%d values]\n",nlat);
 //	for (i=0; i<nlat; i++) printf("  lat[%d]=%g\n",i,lat[i]);
-	FetchMatlabData(&lon,&nlon,LON_IN);
+	FetchData(&lon,&nlon,LON_IN);
 	if (verbose)
 		if   (nlon == 1) printf("  lon=%g\n",lon[0]);
 		else             printf("  lon=[%d values]\n",nlon);
 //	for (i=0; i<nlon; i++) printf("  lon[%d]=%g\n",i,lon[i]);
-	FetchMatlabData(&sgn,SGN_IN);
+	FetchData(&sgn,SGN_IN);
 	if (verbose) printf("  sgn=%d\n",sgn);
 
@@ -84,6 +84,6 @@
 
 	/*Write data: */
-	WriteMatlabData(X_OUT,x,ncoord);
-	WriteMatlabData(Y_OUT,y,ncoord);
+	WriteData(X_OUT,x,ncoord);
+	WriteData(Y_OUT,y,ncoord);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/Ll2xy/Ll2xy.h
===================================================================
--- /issm/trunk-jpl/src/mex/Ll2xy/Ll2xy.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Ll2xy/Ll2xy.h	(revision 11933)
@@ -9,4 +9,5 @@
 void Ll2xyUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/mex/Makefile.am	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Makefile.am	(revision 11933)
@@ -80,4 +80,5 @@
 				TriaSearch\
 				TriMesh\
+				TriMeshRifts\
 				TriMeshNoDensity\
 				TriMeshProcessRifts\
@@ -91,5 +92,6 @@
 endif
 if PYTHON
-bin_PROGRAMS = Test
+bin_PROGRAMS = Test \
+			   TriMesh
 endif
 endif 
@@ -112,13 +114,11 @@
 
 #Initialize
-AM_CXXFLAGS =
+AM_CXXFLAGS = -D_SERIAL_
 
 if MATLAB
 AM_LDFLAGS   = $(MEXLINK)
-AM_CXXFLAGS +=  -DMATLAB  -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 
-LDADD       +=   $(MEXLIB) 
-
-#64 vs 32 bits
-AM_CXXFLAGS += -D_SERIAL_
+AM_CXXFLAGS +=  -DMATLAB  -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 
+LDADD       += $(MEXLIB) 
+
 endif
 
@@ -128,4 +128,5 @@
 LDADD      += $(BOOSTLIB) $(PYTHONLIB)
 endif
+
 
 #Triangle library
@@ -355,4 +356,7 @@
 TriMesh_SOURCES = TriMesh/TriMesh.cpp\
 			  TriMesh/TriMesh.h
+
+TriMeshRifts_SOURCES = TriMeshRifts/TriMeshRifts.cpp\
+			  TriMeshRifts/TriMeshRifts.h
 
 TriMeshNoDensity_SOURCES = TriMeshNoDensity/TriMeshNoDensity.cpp\
Index: /issm/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp	(revision 11933)
@@ -27,8 +27,8 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&uf,UF);
-	FetchMatlabData(&ys,YS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData(&uf,UF);
+	FetchData(&ys,YS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData(&parameters,PARAMETERS);
 
 	/*!Reduce vector: */
@@ -37,10 +37,10 @@
 	}
 	else{
-		FetchMatlabData(&flag_ys0,YSFLAG);
+		FetchData(&flag_ys0,YSFLAG);
 		Mergesolutionfromftogx(&ug, uf,ys,nodes,parameters,flag_ys0);
 	}
 
 	/*write output datasets: */
-	WriteMatlabData(UG,ug);
+	WriteData(UG,ug);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h
===================================================================
--- /issm/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h	(revision 11933)
@@ -11,4 +11,5 @@
 void MergesolutionfromftogUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/MeshPartition/MeshPartition.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/MeshPartition/MeshPartition.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/MeshPartition/MeshPartition.cpp	(revision 11933)
@@ -56,16 +56,16 @@
 
 	/*Fetch data: */
-	FetchMatlabData(&dim,mxGetAssignedField(MODEL,0,"dimension"));
-	FetchMatlabData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));
-	FetchMatlabData(&numberofvertices,mxGetAssignedField(MODEL,0,"numberofvertices"));
-	FetchMatlabData(&elements,NULL,&elements_width,mxGetAssignedField(MODEL,0,"elements"));
+	FetchData(&dim,mxGetAssignedField(MODEL,0,"dimension"));
+	FetchData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));
+	FetchData(&numberofvertices,mxGetAssignedField(MODEL,0,"numberofvertices"));
+	FetchData(&elements,NULL,&elements_width,mxGetAssignedField(MODEL,0,"elements"));
 
 	if (dim==3){
-		FetchMatlabData(&numberofelements2d,mxGetAssignedField(MODEL,0,"numberofelements2d"));
-		FetchMatlabData(&numberofvertices2d,mxGetAssignedField(MODEL,0,"numberofvertices2d"));
-		FetchMatlabData(&elements2d,NULL,NULL,mxGetAssignedField(MODEL,0,"elements2d"));
+		FetchData(&numberofelements2d,mxGetAssignedField(MODEL,0,"numberofelements2d"));
+		FetchData(&numberofvertices2d,mxGetAssignedField(MODEL,0,"numberofvertices2d"));
+		FetchData(&elements2d,NULL,NULL,mxGetAssignedField(MODEL,0,"elements2d"));
 	}
-	FetchMatlabData(&numberoflayers,mxGetAssignedField(MODEL,0,"numberoflayers"));
-	FetchMatlabData(&numareas,NUMAREAS);
+	FetchData(&numberoflayers,mxGetAssignedField(MODEL,0,"numberoflayers"));
+	FetchData(&numareas,NUMAREAS);
 
 	/*Run partitioning algorithm based on a "clever" use of the Metis partitioner: */
@@ -85,6 +85,6 @@
 
 	/*Write data:*/
-	WriteMatlabData(ELEMENTPARTITIONING,element_partitioning,numberofelements);
-	WriteMatlabData(NODEPARTITIONING,node_partitioning,numberofvertices);
+	WriteData(ELEMENTPARTITIONING,element_partitioning,numberofelements);
+	WriteData(NODEPARTITIONING,node_partitioning,numberofvertices);
 	
 	/*Free ressources:*/
Index: /issm/trunk-jpl/src/mex/MeshPartition/MeshPartition.h
===================================================================
--- /issm/trunk-jpl/src/mex/MeshPartition/MeshPartition.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/MeshPartition/MeshPartition.h	(revision 11933)
@@ -11,4 +11,5 @@
 void MeshPartitionUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp	(revision 11933)
@@ -53,5 +53,5 @@
 	/*Fetch inputs: */
 	//index
-	FetchMatlabData(&double_index,&nel,&dummy,INDEX);
+	FetchData(&double_index,&nel,&dummy,INDEX);
 	if(dummy!=3 && dummy!=6)_error_(" element triangulation should be of 3 or 6 column width!");
 	index=(int*)xmalloc(nel*3*sizeof(int));
@@ -62,6 +62,6 @@
 	}
 	//x and y
-	FetchMatlabData(&x,&nods,X);
-	FetchMatlabData(&y,&dummy,Y);
+	FetchData(&x,&nods,X);
+	FetchData(&y,&dummy,Y);
 
 	//contours
@@ -94,5 +94,5 @@
 
 	/* output: */
-	WriteMatlabData(SEGMENTS,segments,numsegs,5);
+	WriteData(SEGMENTS,segments,numsegs,5);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.h
===================================================================
--- /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.h	(revision 11933)
@@ -11,4 +11,5 @@
 void MeshProfileIntersectionUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ModelProcessor/ModelProcessor.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ModelProcessor/ModelProcessor.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ModelProcessor/ModelProcessor.cpp	(revision 11933)
@@ -34,10 +34,10 @@
 	
 	/*open file input for reading: */
-	FetchMatlabData(&inputfilename,INPUTFILE);
+	FetchData(&inputfilename,INPUTFILE);
 	IOMODEL= pfopen(inputfilename ,"rb");
 
 	/*retrieve solution type and analyses: */
-	FetchMatlabData(&solution_type,SOLUTIONTYPE);
-	FetchMatlabData(&double_analyses,&numanalyses,ANALYSES);
+	FetchData(&solution_type,SOLUTIONTYPE);
+	FetchData(&double_analyses,&numanalyses,ANALYSES);
 	analyses=(int*)xmalloc(numanalyses*sizeof(int));
 	for(i=0;i<numanalyses;i++)analyses[i]=(int)double_analyses[i];
@@ -47,11 +47,11 @@
 
 	/*Write output data: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(NODES,nodes);
-	WriteMatlabData(VERTICES,vertices);
-	WriteMatlabData(CONSTRAINTS,constraints);
-	WriteMatlabData(LOADS,loads);
-	WriteMatlabData(MATERIALS,materials);
-	WriteMatlabData(PARAMETERS,parameters);
+	WriteData(ELEMENTS,elements);
+	WriteData(NODES,nodes);
+	WriteData(VERTICES,vertices);
+	WriteData(CONSTRAINTS,constraints);
+	WriteData(LOADS,loads);
+	WriteData(MATERIALS,materials);
+	WriteData(PARAMETERS,parameters);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ModelProcessor/ModelProcessor.h
===================================================================
--- /issm/trunk-jpl/src/mex/ModelProcessor/ModelProcessor.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ModelProcessor/ModelProcessor.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ModelProcessorUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/NodeConnectivity/NodeConnectivity.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/NodeConnectivity/NodeConnectivity.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/NodeConnectivity/NodeConnectivity.cpp	(revision 11933)
@@ -22,6 +22,6 @@
         
 	/*Input datasets: */
-	FetchMatlabData(&elements,&nel,NULL,ELEMENTS);
-	FetchMatlabData(&nods,NUMNODES);
+	FetchData(&elements,&nel,NULL,ELEMENTS);
+	FetchData(&nods,NUMNODES);
 
 	/*!Generate internal degree of freedom numbers: */
@@ -29,5 +29,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(CONNECTIVITY,connectivity,nods,width);
+	WriteData(CONNECTIVITY,connectivity,nods,width);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/NodeConnectivity/NodeConnectivity.h
===================================================================
--- /issm/trunk-jpl/src/mex/NodeConnectivity/NodeConnectivity.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/NodeConnectivity/NodeConnectivity.h	(revision 11933)
@@ -11,4 +11,5 @@
 void NodeConnectivityUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/NodesDof/NodesDof.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/NodesDof/NodesDof.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/NodesDof/NodesDof.cpp	(revision 11933)
@@ -19,6 +19,6 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData(&parameters,PARAMETERS);
 
 	/*find analysis_type: */
@@ -29,5 +29,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(NODES,nodes);
+	WriteData(NODES,nodes);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/NodesDof/NodesDof.h
===================================================================
--- /issm/trunk-jpl/src/mex/NodesDof/NodesDof.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/NodesDof/NodesDof.h	(revision 11933)
@@ -11,4 +11,5 @@
 void NodesDofUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Orth/Orth.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Orth/Orth.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Orth/Orth.cpp	(revision 11933)
@@ -21,6 +21,6 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&gradj,GRADJ);
-	FetchMatlabData(&oldgradj,OLDGRADJ);
+	FetchData(&gradj,GRADJ);
+	FetchData(&oldgradj,OLDGRADJ);
 
 	/*!Reduce load from g to f size: */
@@ -28,5 +28,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(NEWGRADJ,newgradj);
+	WriteData(NEWGRADJ,newgradj);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/Orth/Orth.h
===================================================================
--- /issm/trunk-jpl/src/mex/Orth/Orth.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Orth/Orth.h	(revision 11933)
@@ -11,4 +11,5 @@
 void OrthUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/OutputResults/OutputResults.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/OutputResults/OutputResults.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/OutputResults/OutputResults.cpp	(revision 11933)
@@ -26,11 +26,11 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
-	FetchMatlabData((DataSet**)&results,RESULTS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&results,RESULTS);
 
 	/*results might be NULL, allocate: */
Index: /issm/trunk-jpl/src/mex/OutputResults/OutputResults.h
===================================================================
--- /issm/trunk-jpl/src/mex/OutputResults/OutputResults.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/OutputResults/OutputResults.h	(revision 11933)
@@ -9,4 +9,5 @@
 void OutputResultsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/OutputRifts/OutputRifts.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/OutputRifts/OutputRifts.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/OutputRifts/OutputRifts.cpp	(revision 11933)
@@ -24,6 +24,6 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData(&numrifts,mxGetField(PARAMETERS,0,"numrifts"));
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData(&numrifts,mxGetField(PARAMETERS,0,"numrifts"));
 
 	/*!Call core code: */
@@ -31,5 +31,5 @@
 
 	/*write output : */
-	WriteMatlabData(RIFTPROPERTIES,riftproperties);
+	WriteData(RIFTPROPERTIES,riftproperties);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/OutputRifts/OutputRifts.h
===================================================================
--- /issm/trunk-jpl/src/mex/OutputRifts/OutputRifts.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/OutputRifts/OutputRifts.h	(revision 11933)
@@ -11,4 +11,5 @@
 void OutputRiftsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ParameterOutput/ParameterOutput.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ParameterOutput/ParameterOutput.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ParameterOutput/ParameterOutput.cpp	(revision 11933)
@@ -27,13 +27,13 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&results,RESULTS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&results,RESULTS);
 	
 	/*parameters: */
-	FetchMatlabData(&analysis_type,ANALYSIS);
-	FetchMatlabData(&sub_analysis_type,SUBANALYSIS);
+	FetchData(&analysis_type,ANALYSIS);
+	FetchData(&sub_analysis_type,SUBANALYSIS);
 
 	/*!Generate internal degree of freedom numbers: */
@@ -41,5 +41,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(RESULTS,results,0,0,"DataSet",NULL); 
+	WriteData(RESULTS,results,0,0,"DataSet",NULL); 
 	
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ParameterOutput/ParameterOutput.h
===================================================================
--- /issm/trunk-jpl/src/mex/ParameterOutput/ParameterOutput.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ParameterOutput/ParameterOutput.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ParameterOutputUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ParsePetscOptions/ParsePetscOptions.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ParsePetscOptions/ParsePetscOptions.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ParsePetscOptions/ParsePetscOptions.cpp	(revision 11933)
@@ -19,6 +19,6 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&parameters,PARAMETERS);
-	FetchMatlabData(&petscoptionsfilename,PETSCOPTIONSFILENAME); 
+	FetchData(&parameters,PARAMETERS);
+	FetchData(&petscoptionsfilename,PETSCOPTIONSFILENAME); 
 
 	petscoptionsfid=fopen(petscoptionsfilename,"r");
@@ -28,5 +28,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(PARAMETERSOUT,parameters);
+	WriteData(PARAMETERSOUT,parameters);
 	
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ParsePetscOptions/ParsePetscOptions.h
===================================================================
--- /issm/trunk-jpl/src/mex/ParsePetscOptions/ParsePetscOptions.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ParsePetscOptions/ParsePetscOptions.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ParsePetscOptionsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp	(revision 11933)
@@ -26,8 +26,8 @@
 
 	/*Fetch inputs: */
-	FetchMatlabData(&x,&nods,NULL,XHANDLE);  
-	FetchMatlabData(&y,NULL,NULL,YHANDLE);
-	FetchMatlabData(&mindistance,MINDISTANCE);
-	FetchMatlabData(&multithread,MULTITHREAD);
+	FetchData(&x,&nods,NULL,XHANDLE);  
+	FetchData(&y,NULL,NULL,YHANDLE);
+	FetchData(&mindistance,MINDISTANCE);
+	FetchData(&multithread,MULTITHREAD);
 
 	/*Run core routine: */
@@ -35,5 +35,5 @@
 
 	/* output: */
-	WriteMatlabData(FLAGS,flags);
+	WriteData(FLAGS,flags);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/PointCloudFindNeighbors/PointCloudFindNeighbors.h
===================================================================
--- /issm/trunk-jpl/src/mex/PointCloudFindNeighbors/PointCloudFindNeighbors.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/PointCloudFindNeighbors/PointCloudFindNeighbors.h	(revision 11933)
@@ -11,4 +11,5 @@
 void PointCloudFindNeighborsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ProcessParams/ProcessParams.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ProcessParams/ProcessParams.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ProcessParams/ProcessParams.cpp	(revision 11933)
@@ -17,8 +17,8 @@
 	
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&parameters,PARAMETERS);
+	FetchData((DataSet**)&parameters,PARAMETERS);
 
 	/*write output datasets: */
-	WriteMatlabData(PARAMETERSOUT,parameters);
+	WriteData(PARAMETERSOUT,parameters);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ProcessParams/ProcessParams.h
===================================================================
--- /issm/trunk-jpl/src/mex/ProcessParams/ProcessParams.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ProcessParams/ProcessParams.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ProcessParamsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp	(revision 11933)
@@ -22,8 +22,8 @@
         
 	/*Input datasets: */
-	FetchMatlabData(&connectivity,&nel,&dummy,CONNECTIVITY);
-	FetchMatlabData(&pool,&dummy,POOL);
-	FetchMatlabData(&index,INDEX);
-	FetchMatlabData(&flags,&dummy,FLAGS);
+	FetchData(&connectivity,&nel,&dummy,CONNECTIVITY);
+	FetchData(&pool,&dummy,POOL);
+	FetchData(&index,INDEX);
+	FetchData(&flags,&dummy,FLAGS);
 
 	/*!Generate internal degree of freedom numbers: */
@@ -31,5 +31,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(POOLOUT,pool,nel);
+	WriteData(POOLOUT,pool,nel);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
===================================================================
--- /issm/trunk-jpl/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h	(revision 11933)
@@ -11,4 +11,5 @@
 void PropagateFlagsFromConnectivityUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Reduceload/Reduceload.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Reduceload/Reduceload.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Reduceload/Reduceload.cpp	(revision 11933)
@@ -23,11 +23,11 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&pf,PF);
-	FetchMatlabData(&Kfs,KFS);
-	FetchMatlabData(&ys,YS);
+	FetchData(&pf,PF);
+	FetchData(&Kfs,KFS);
+	FetchData(&ys,YS);
 
 	/*!Reduce load from g to f size: */
 	if(nrhs==4){
-		FetchMatlabData(&flag_ys0,YSFLAG);
+		FetchData(&flag_ys0,YSFLAG);
 		Reduceloadx(pf, Kfs, ys,flag_ys0);
 	}
@@ -37,5 +37,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(PFOUT,pf);
+	WriteData(PFOUT,pf);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/Reduceload/Reduceload.h
===================================================================
--- /issm/trunk-jpl/src/mex/Reduceload/Reduceload.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Reduceload/Reduceload.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ReduceloadUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.cpp	(revision 11933)
@@ -22,7 +22,7 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&ug,UG);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData(&ug,UG);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData(&parameters,PARAMETERS);
 
 	/*!Reduce vector: */
@@ -30,5 +30,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(UF,uf);
+	WriteData(UF,uf);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.h
===================================================================
--- /issm/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.h	(revision 11933)
@@ -11,4 +11,5 @@
 void ReducevectorgtofUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.cpp	(revision 11933)
@@ -22,7 +22,7 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&yg,YG);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData(&yg,YG);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData(&parameters,PARAMETERS);
 
 	/*!Reduce vector: */
@@ -30,5 +30,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(YS,ys);
+	WriteData(YS,ys);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.h
===================================================================
--- /issm/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ReducevectorgtosUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/ResetCoordinateSystem/ResetCoordinateSystem.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/ResetCoordinateSystem/ResetCoordinateSystem.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ResetCoordinateSystem/ResetCoordinateSystem.cpp	(revision 11933)
@@ -26,10 +26,10 @@
         
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -42,5 +42,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(NODESOUT,nodes);
+	WriteData(NODESOUT,nodes);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/ResetCoordinateSystem/ResetCoordinateSystem.h
===================================================================
--- /issm/trunk-jpl/src/mex/ResetCoordinateSystem/ResetCoordinateSystem.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/ResetCoordinateSystem/ResetCoordinateSystem.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ResetCoordinateSystemUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Response/Response.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Response/Response.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Response/Response.cpp	(revision 11933)
@@ -28,13 +28,13 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
-	FetchMatlabData(&response,RESPONSE);
-	FetchMatlabData(&process_units,PROCESSUNITS);
-	FetchMatlabData(&weight_index,WEIGHTINDEX);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
+	FetchData(&response,RESPONSE);
+	FetchData(&process_units,PROCESSUNITS);
+	FetchData(&weight_index,WEIGHTINDEX);
 
 	/*configure: */
@@ -47,5 +47,5 @@
 
 	/*write output : */
-	WriteMatlabData(OUTPUT,resp);
+	WriteData(OUTPUT,resp);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/Response/Response.h
===================================================================
--- /issm/trunk-jpl/src/mex/Response/Response.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Response/Response.h	(revision 11933)
@@ -9,4 +9,5 @@
 void ResponseUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Scotch/Scotch.h
===================================================================
--- /issm/trunk-jpl/src/mex/Scotch/Scotch.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Scotch/Scotch.h	(revision 11933)
@@ -13,4 +13,5 @@
 #include <time.h>      /*  clock,time,difftime  */
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Shp2Kml/Shp2Kml.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Shp2Kml/Shp2Kml.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Shp2Kml/Shp2Kml.cpp	(revision 11933)
@@ -44,9 +44,9 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&filshp,SHP_IN);
+	FetchData(&filshp,SHP_IN);
 	if (verbose) printf("  filshp=\"%s\"\n",filshp);
-	FetchMatlabData(&filkml,KML_IN);
+	FetchData(&filkml,KML_IN);
 	if (verbose) printf("  filkml=\"%s\"\n",filkml);
-	FetchMatlabData(&sgn,SGN_IN);
+	FetchData(&sgn,SGN_IN);
 	if (verbose) printf("  sgn=%d\n",sgn);
 
@@ -80,5 +80,5 @@
 
 	/*Write data: */
-	WriteMatlabData(RET_OUT,iret);
+	WriteData(RET_OUT,iret);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/Shp2Kml/Shp2Kml.h
===================================================================
--- /issm/trunk-jpl/src/mex/Shp2Kml/Shp2Kml.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Shp2Kml/Shp2Kml.h	(revision 11933)
@@ -9,4 +9,5 @@
 void Shp2KmlUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Solver/Solver.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Solver/Solver.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Solver/Solver.cpp	(revision 11933)
@@ -29,5 +29,5 @@
 	
 	/*parameters: */
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*In serial mode, we have not set any petsc options, do it now: */
@@ -40,8 +40,8 @@
 	
 		/*Input datasets: */
-		FetchMatlabData(&Kff,KFF);
-		FetchMatlabData(&pf,PF);
-		FetchMatlabData(&uf0,UF0);
-		FetchMatlabData(&df,DF);
+		FetchData(&Kff,KFF);
+		FetchData(&pf,PF);
+		FetchData(&uf0,UF0);
+		FetchData(&df,DF);
 
 		/*Core module: */
@@ -49,5 +49,5 @@
 
 		/*Write output*/
-		WriteMatlabData(UF,uf);
+		WriteData(UF,uf);
 	}
 	else{
Index: /issm/trunk-jpl/src/mex/Solver/Solver.h
===================================================================
--- /issm/trunk-jpl/src/mex/Solver/Solver.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Solver/Solver.h	(revision 11933)
@@ -11,4 +11,5 @@
 void SolverUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/SparseToVector/SparseToVector.h
===================================================================
--- /issm/trunk-jpl/src/mex/SparseToVector/SparseToVector.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/SparseToVector/SparseToVector.h	(revision 11933)
@@ -13,4 +13,5 @@
 #include <time.h>      /*  clock,time,difftime  */
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/SpcNodes/SpcNodes.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/SpcNodes/SpcNodes.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/SpcNodes/SpcNodes.cpp	(revision 11933)
@@ -21,8 +21,8 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&constraints,CONSTRAINTS);
-	FetchMatlabData(&parameters,PARAMETERS);
-	FetchMatlabData(&analysis_type,ANALYSISTYPE);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&constraints,CONSTRAINTS);
+	FetchData(&parameters,PARAMETERS);
+	FetchData(&analysis_type,ANALYSISTYPE);
 	
 	/*!Generate internal degree of freedom numbers: */
@@ -30,5 +30,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(NODES,nodes);
+	WriteData(NODES,nodes);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/SpcNodes/SpcNodes.h
===================================================================
--- /issm/trunk-jpl/src/mex/SpcNodes/SpcNodes.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/SpcNodes/SpcNodes.h	(revision 11933)
@@ -11,4 +11,5 @@
 void SpcNodesUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/StringToEnum/StringToEnum.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/StringToEnum/StringToEnum.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/StringToEnum/StringToEnum.cpp	(revision 11933)
@@ -16,5 +16,5 @@
 
 	/*Fetch inputs: */
-	FetchMatlabData(&name,NAME);
+	FetchData(&name,NAME);
 
 	/*Run core function: */
@@ -22,5 +22,5 @@
 
 	/* output: */
-	WriteMatlabData(ENUMOUT,enum_out);
+	WriteData(ENUMOUT,enum_out);
 }
 
Index: /issm/trunk-jpl/src/mex/StringToEnum/StringToEnum.h
===================================================================
--- /issm/trunk-jpl/src/mex/StringToEnum/StringToEnum.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/StringToEnum/StringToEnum.h	(revision 11933)
@@ -9,4 +9,5 @@
 void StringToEnumUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/SurfaceArea/SurfaceArea.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/SurfaceArea/SurfaceArea.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/SurfaceArea/SurfaceArea.cpp	(revision 11933)
@@ -22,10 +22,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -38,5 +38,5 @@
 
 	/*write output : */
-	WriteMatlabData(ELEMENTSOUT,elements);
+	WriteData(ELEMENTSOUT,elements);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/SurfaceArea/SurfaceArea.h
===================================================================
--- /issm/trunk-jpl/src/mex/SurfaceArea/SurfaceArea.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/SurfaceArea/SurfaceArea.h	(revision 11933)
@@ -9,4 +9,5 @@
 void SurfaceAreaUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.cpp	(revision 11933)
@@ -34,10 +34,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTS);
-	FetchMatlabData((DataSet**)&nodes,NODES);
-	FetchMatlabData((DataSet**)&vertices,VERTICES);
-	FetchMatlabData((DataSet**)&loads,LOADS);
-	FetchMatlabData((DataSet**)&materials,MATERIALS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&elements,ELEMENTS);
+	FetchData((DataSet**)&nodes,NODES);
+	FetchData((DataSet**)&vertices,VERTICES);
+	FetchData((DataSet**)&loads,LOADS);
+	FetchData((DataSet**)&materials,MATERIALS);
+	FetchData(&parameters,PARAMETERS);
 
 	/*configure: */
@@ -49,8 +49,8 @@
 	/*!Generate internal degree of freedom numbers: */
 	if(nrhs==10){
-		FetchMatlabData(&kflag,KFLAG);
-		FetchMatlabData(&pflag,PFLAG);
-		FetchMatlabData(&penalty_kflag,PENALTYKFLAG);
-		FetchMatlabData(&penalty_pflag,PENALTYPFLAG);
+		FetchData(&kflag,KFLAG);
+		FetchData(&pflag,PFLAG);
+		FetchData(&penalty_kflag,PENALTYKFLAG);
+		FetchData(&penalty_pflag,PENALTYPFLAG);
 		SystemMatricesx(&Kff,&Kfs,&pf,&df,&kmax,elements,nodes,vertices,loads,materials,parameters,kflag,pflag,penalty_kflag,penalty_pflag);
 	}
@@ -59,9 +59,9 @@
 
 	/*write output datasets: */
-	WriteMatlabData(KFF,Kff);
-	WriteMatlabData(KFS,Kfs);
-	WriteMatlabData(PF,pf);
-	WriteMatlabData(DF,df);
-	WriteMatlabData(KMAX,kmax);
+	WriteData(KFF,Kff);
+	WriteData(KFS,Kfs);
+	WriteData(PF,pf);
+	WriteData(DF,df);
+	WriteData(KMAX,kmax);
 	
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.h
===================================================================
--- /issm/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.h	(revision 11933)
@@ -9,4 +9,5 @@
 void SystemMatricesUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Test/Test.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Test/Test.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Test/Test.cpp	(revision 11933)
@@ -6,5 +6,6 @@
 #include "./Test.h"
 
-void Test(pyArray array){
+//void Test(pyArray array,boost::python::str string,double d){
+void Test(pyArray array,char* string,double d){
 
 	int i;
@@ -23,4 +24,9 @@
 	}
 
+	printf("string %s\n",string);
+	printf("d %g\n",d);
+
+
+
 	
 }
Index: /issm/trunk-jpl/src/mex/TimeAdapt/TimeAdapt.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/TimeAdapt/TimeAdapt.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/TimeAdapt/TimeAdapt.cpp	(revision 11933)
@@ -25,10 +25,10 @@
 
 /*Input datasets: */
-FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-FetchMatlabData((DataSet**)&nodes,NODESIN);
-FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-FetchMatlabData((DataSet**)&loads,LOADSIN);
-FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-FetchMatlabData(&parameters,PARAMETERSIN);
+FetchData((DataSet**)&elements,ELEMENTSIN);
+FetchData((DataSet**)&nodes,NODESIN);
+FetchData((DataSet**)&vertices,VERTICESIN);
+FetchData((DataSet**)&loads,LOADSIN);
+FetchData((DataSet**)&materials,MATERIALSIN);
+FetchData(&parameters,PARAMETERSIN);
 
 /*configure: */
@@ -41,5 +41,5 @@
 
 /*write output datasets: */
-WriteMatlabData(DT,dt);
+WriteData(DT,dt);
 
 /*Free ressources: */
Index: /issm/trunk-jpl/src/mex/TimeAdapt/TimeAdapt.h
===================================================================
--- /issm/trunk-jpl/src/mex/TimeAdapt/TimeAdapt.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/TimeAdapt/TimeAdapt.h	(revision 11933)
@@ -9,4 +9,5 @@
 void TimeAdaptUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/TriMeshNoDensity/TriMeshNoDensity.h
===================================================================
--- /issm/trunk-jpl/src/mex/TriMeshNoDensity/TriMeshNoDensity.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/TriMeshNoDensity/TriMeshNoDensity.h	(revision 11933)
@@ -10,4 +10,5 @@
 #include "string.h"
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h
===================================================================
--- /issm/trunk-jpl/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h	(revision 11933)
@@ -10,4 +10,5 @@
 #include "string.h"
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/TriMeshRefine/TriMeshRefine.h
===================================================================
--- /issm/trunk-jpl/src/mex/TriMeshRefine/TriMeshRefine.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/TriMeshRefine/TriMeshRefine.h	(revision 11933)
@@ -10,4 +10,5 @@
 #include "string.h"
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/TriMeshRifts/TriMeshRifts.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/TriMeshRifts/TriMeshRifts.cpp	(revision 11933)
+++ /issm/trunk-jpl/src/mex/TriMeshRifts/TriMeshRifts.cpp	(revision 11933)
@@ -0,0 +1,322 @@
+/*
+ * TriMeshRifts: out of a domain outline file ( Argus format ), 
+ * use the Triangle package to create a triangular mesh 
+ *
+ */
+
+#include "./TriMeshRifts.h"
+
+void mexFunction(	int nlhs, mxArray* plhs[],
+					int nrhs, const mxArray* prhs[] )
+{
+
+
+	/*Matlab arrays: */
+	mxArray* pmxa_array=NULL;
+	int i,j;
+	int counter,counter2,backcounter;
+	int prhs_counter;
+	
+	/* returned quantities: */
+
+	double* index=NULL;
+	double* x=NULL;
+	double* y=NULL;
+	double* segments=NULL;
+	double*    segmentmarkerlist=NULL;
+
+	/* input: */
+	char*  domainname=NULL;
+	char*  riftname=NULL;
+	double area;
+	char*  order=NULL;
+	
+	/*Domain outline variables: */
+	int      nprof;
+	int*     profnvertices=NULL;
+	double** pprofx=NULL;
+	double** pprofy=NULL;
+	double*  xprof=NULL;
+	double*  yprof=NULL;
+	int      numberofpoints;
+
+	/*Rift outline variables: */
+	int      numrifts;
+	int*     riftsnumvertices=NULL;
+	double** riftsverticesx=NULL;
+	double** riftsverticesy=NULL;
+
+	/* Triangle structures: */
+	struct triangulateio in,out;
+	char   options[256];
+
+	/* verify correct usage: */
+	if (nlhs==0 && nrhs==0) {
+		/* special case: */
+		TriMeshRiftsUsage();
+		return;
+	}
+
+	if (!(  (nlhs==5) ||(nrhs==2) || (nrhs==3)  || (nrhs==4) )){
+		mexPrintf("   %s format error.\n", __FUNCT__);
+		TriMeshRiftsUsage();
+		printf("   ");
+		mexErrMsgTxt(" ");
+	}
+
+	/*Fetch data needed by Triangle: */
+
+	prhs_counter=0;
+	/*First recover the domain outline file name: */
+	if (!mxIsChar(prhs[prhs_counter])){
+		mexPrintf("%s%s\n",__FUNCT__," error message; first argument should be the domain outline file name!");
+		mexErrMsgTxt(" ");
+	}
+	domainname = (char *) mxMalloc((mxGetN(prhs[prhs_counter])+1)*sizeof(char));
+	mxGetString(prhs[prhs_counter],domainname,mxGetN(prhs[prhs_counter])+1);
+
+	/*Look for optional rifts file name: */
+	prhs_counter++;
+	if (mxIsChar(prhs[prhs_counter])){
+		riftname = (char *) mxMalloc((mxGetN(prhs[prhs_counter])+1)*sizeof(char));
+		mxGetString(prhs[prhs_counter],riftname,mxGetN(prhs[prhs_counter])+1);
+		prhs_counter++;
+	}
+
+	/*Recover the mesh density desired:*/
+	area=mxGetScalar(prhs[prhs_counter]);
+
+	/*Optionaly, recover desired order: */
+	prhs_counter++;
+	if (mxIsChar(prhs[prhs_counter])){
+		order = (char *) mxMalloc((mxGetN(prhs[prhs_counter])+1)*sizeof(char));
+		mxGetString(prhs[prhs_counter],order,mxGetN(prhs[prhs_counter])+1);
+	}
+	
+	/*Start reading the domain outline file: */
+	if(!DomainOutlineRead(&nprof,&profnvertices,&pprofx,&pprofy,NULL,domainname,false)){
+		printf("%s%s%s\n",__FUNCT__," error message reading domain outline ",domainname);
+		mexErrMsgTxt(" ");
+	}
+
+	/*Read rifts file if present: */
+	if(riftname){
+		if(!DomainOutlineRead(&numrifts,&riftsnumvertices,&riftsverticesx,&riftsverticesy,NULL,riftname,false)){
+			printf("%s%s%s\n",__FUNCT__," error message reading rifts outline ",riftname);
+			mexErrMsgTxt(" ");
+		}
+	}
+
+	/*Create initial triangulation to call triangulate():*/
+	numberofpoints=0;
+	for (i=0;i<nprof;i++){
+		numberofpoints+=profnvertices[i];
+	}
+	if (riftname){
+		for (i=0;i<numrifts;i++){
+			numberofpoints+=riftsnumvertices[i];
+		}
+	}
+	in.numberofpoints=numberofpoints;
+
+	in.numberofpointattributes=1;
+	in.pointlist = (REAL *) mxMalloc(in.numberofpoints * 2 * sizeof(REAL));
+
+	counter=0;
+	for (i=0;i<nprof;i++){
+		xprof=pprofx[i];
+		yprof=pprofy[i];
+		for (j=0;j<profnvertices[i];j++){
+			in.pointlist[2*counter+0]=xprof[j];
+			in.pointlist[2*counter+1]=yprof[j];
+			counter++;
+		}
+	}
+	if(riftname){
+		for (i=0;i<numrifts;i++){
+			xprof=riftsverticesx[i];
+			yprof=riftsverticesy[i];
+			for (j=0;j<riftsnumvertices[i];j++){
+				in.pointlist[2*counter+0]=xprof[j];
+				in.pointlist[2*counter+1]=yprof[j];
+				counter++;
+			}
+		}
+	}
+	
+	in.pointattributelist = (REAL *) mxMalloc(in.numberofpoints *
+										  in.numberofpointattributes *
+										  sizeof(REAL));
+	for (i=0;i<in.numberofpoints;i++){
+		in.pointattributelist[i] = 0.0;
+	}
+	in.pointmarkerlist = (int *) mxMalloc(in.numberofpoints * sizeof(int));
+	for(i=0;i<in.numberofpoints;i++){
+		in.pointmarkerlist[i] = 0;
+	}
+
+	/*Build segments: */
+	/*Figure out number of segments: holes and closed outlines have as many segments as vertices, 
+	 *for rifts, we have one less segment as we have vertices*/
+	in.numberofsegments=0;
+	for (i=0;i<nprof;i++){
+		in.numberofsegments+=profnvertices[i];
+	}
+	if (riftname){
+		for (i=0;i<numrifts;i++){
+			in.numberofsegments+=riftsnumvertices[i]-1;
+		}
+	}
+	
+	in.segmentlist = (int *) mxMalloc(in.numberofsegments * 2 * sizeof(int));
+	in.segmentmarkerlist = (int *) mxCalloc(in.numberofsegments,sizeof(int));
+	counter=0;
+	backcounter=0;
+	for (i=0;i<nprof;i++){
+		for (j=0;j<(profnvertices[i]-1);j++){
+			in.segmentlist[2*counter+0]=counter;
+			in.segmentlist[2*counter+1]=counter+1;
+			in.segmentmarkerlist[counter]=0;
+			counter++;
+		}
+		/*Close this profile: */
+		 in.segmentlist[2*counter+0]=counter;
+		 in.segmentlist[2*counter+1]=backcounter;
+		 in.segmentmarkerlist[counter]=0;
+		 counter++;
+		 backcounter=counter;
+	}
+	counter2=counter;
+	if(riftname){
+		for (i=0;i<numrifts;i++){
+			for (j=0;j<(riftsnumvertices[i]-1);j++){
+				in.segmentlist[2*counter2+0]=counter;
+				in.segmentlist[2*counter2+1]=counter+1;
+				in.segmentmarkerlist[counter2]=2+i;
+				counter2++;
+				counter++;
+			}
+			counter++;
+		}
+	}
+
+	
+	/*Build regions: */
+	in.numberofregions = 0;
+
+	/*Build holes: */
+	in.numberofholes = nprof-1; /*everything is a hole, but for the first profile.*/
+	in.holelist = (REAL *) mxMalloc(in.numberofholes * 2 * sizeof(REAL));
+	for (i=0;i<nprof-1;i++){
+		/*We are looking for a vertex that lies inside the hole: */
+		GridInsideHole(&in.holelist[2*i+0],&in.holelist[2*i+1],profnvertices[i+1],pprofx[i+1],pprofy[i+1]);
+	}
+
+	/* Make necessary initializations so that Triangle can return a */
+	/*   triangulation in `out': */
+
+	out.pointlist = (REAL *) NULL;            
+	out.pointattributelist = (REAL *) NULL;
+	out.pointmarkerlist = (int *) NULL; 
+	out.trianglelist = (int *) NULL;          
+	out.triangleattributelist = (REAL *) NULL;
+	out.neighborlist = (int *) NULL;         
+	out.segmentlist = (int *) NULL;
+	out.segmentmarkerlist = (int *) NULL;
+	out.edgelist = (int *) NULL;             
+	out.edgemarkerlist = (int *) NULL;   
+
+	/* Triangulate the points:.  Switches are chosen to read and write a  */
+	/*   PSLG (p), preserve the convex hull (c), number everything from  */
+	/*   zero (z), assign a regional attribute to each element (A), and  */
+	/*   produce an edge list (e), a Voronoi diagram (v), and a triangle */
+	/*   neighbor list (n).                                              */
+
+	sprintf(options,"%s%lf","pQzDq30ia",area); /*replace V by Q to quiet down the logging*/
+  
+	triangulate(options, &in, &out, NULL);
+	/*report(&out, 0, 1, 1, 1, 1, 0);*/
+
+	/*Allocate index, x and y: */
+	index=(double*)mxMalloc(3*out.numberoftriangles*sizeof(double));
+	x=(double*)mxMalloc(out.numberofpoints*sizeof(double));
+	y=(double*)mxMalloc(out.numberofpoints*sizeof(double));
+	segments=(double*)mxMalloc(3*out.numberofsegments*sizeof(double));
+	segmentmarkerlist=(double*)mxMalloc(out.numberofsegments*sizeof(double));
+
+	for (i = 0; i < out.numberoftriangles; i++) {
+		for (j = 0; j < out.numberofcorners; j++) {
+			*(index+3*i+j)=(double)out.trianglelist[i * out.numberofcorners + j]+1;
+		}
+	}
+	for (i = 0; i < out.numberofpoints; i++) {
+		x[i]=out.pointlist[i * 2 + 0];
+		y[i]=out.pointlist[i * 2 + 1];
+	}
+	
+	for (i = 0; i < out.numberofsegments; i++) {
+		segments[3*i+0]=(double)out.segmentlist[i*2+0]+1;
+		segments[3*i+1]=(double)out.segmentlist[i*2+1]+1;
+		segmentmarkerlist[i]=(double)out.segmentmarkerlist[i];
+	}
+
+	/*Associate elements with segments: */
+	AssociateSegmentToElement(&segments,out.numberofsegments,index,out.numberoftriangles);
+
+	/*Order segments so that their normals point outside the domain: */
+	if(!strcmp(order,"yes")){
+		OrderSegments(&segments,out.numberofsegments, index,out.numberoftriangles);
+	}
+
+	/*Output : */
+	pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
+	mxSetM(pmxa_array,3);
+	mxSetN(pmxa_array,out.numberoftriangles);
+	mxSetPr(pmxa_array,index);
+	mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, "transpose");
+
+	pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
+	mxSetM(pmxa_array,1);
+	mxSetN(pmxa_array,out.numberofpoints);
+	mxSetPr(pmxa_array,x);
+	mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, "transpose");
+
+	pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
+	mxSetM(pmxa_array,1);
+	mxSetN(pmxa_array,out.numberofpoints);
+	mxSetPr(pmxa_array,y);
+	mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, "transpose");
+
+	pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
+	mxSetM(pmxa_array,3);
+	mxSetN(pmxa_array,out.numberofsegments);
+	mxSetPr(pmxa_array,segments);
+	mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, "transpose");
+
+	pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);
+	mxSetM(pmxa_array,1);
+	mxSetN(pmxa_array,out.numberofsegments);
+	mxSetPr(pmxa_array,segmentmarkerlist);
+	mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, "transpose");
+	
+	return;
+}
+
+void TriMeshRiftsUsage(void)
+{
+	printf("\n");
+	printf("   usage: [index,x,y,segments,segmentmarkers]=TriMeshRifts(domainoutlinefilename,riftsoutlinename,area,ordered) \n");
+	printf("      where: index,x,y defines a triangulation, segments is an array made \n");
+	printf("      of exterior segments to the mesh domain outline, segmentmarkers is an array flagging each segment \n");
+	printf("      (if rifts are present, markers >=2 flag them ), outlinefilename an Argus domain outline file.\n");
+	printf("      riftsoutlinename is an Argus domain file, defining rifts (ie: open profiles), \n");
+	printf("      area is the maximum area desired for any element of the resulting mesh. \n");
+	printf("      and ordered is a string ('yes' or 'no') that determines whether segments are output in the \n");
+	printf("      order they are made by Triangle (ie none), or ordered counter clockwise around the domain outline.\n");
+	printf("      riftsoutlinename and ordered are optional arguments.\n");
+	printf("\n");
+}
+
+
+
+
Index: /issm/trunk-jpl/src/mex/TriMeshRifts/TriMeshRifts.h
===================================================================
--- /issm/trunk-jpl/src/mex/TriMeshRifts/TriMeshRifts.h	(revision 11933)
+++ /issm/trunk-jpl/src/mex/TriMeshRifts/TriMeshRifts.h	(revision 11933)
@@ -0,0 +1,22 @@
+/*!\file:  TriMeshRifts.h
+ * \brief header prototype
+ */ 
+
+#ifndef _TRIMESHRIFTS_H_
+#define _TRIMESHRIFTS_H_
+
+#include "mex.h"
+#include "triangle.h"
+#include "string.h"
+
+#include "../../c/include/globals.h"
+#include "../../c/modules/modules.h"
+#include "../../c/Container/Container.h"
+#include "../../c/shared/shared.h"
+
+void TriMeshRiftsUsage(void);
+
+#undef __FUNCT__ 
+#define __FUNCT__ "TriMeshRifts"
+
+#endif
Index: /issm/trunk-jpl/src/mex/TriaSearch/TriaSearch.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/TriaSearch/TriaSearch.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/TriaSearch/TriaSearch.cpp	(revision 11933)
@@ -31,9 +31,9 @@
 
 	/*Input datasets: */
-	FetchMatlabData(&index,&nel,&dummy,INDEXHANDLE);
-	FetchMatlabData(&x,&nods,XHANDLE);
-	FetchMatlabData(&y,&nods,YHANDLE);
-	FetchMatlabData(&x0,&numberofnodes,X0HANDLE);
-	FetchMatlabData(&y0,&numberofnodes,Y0HANDLE);
+	FetchData(&index,&nel,&dummy,INDEXHANDLE);
+	FetchData(&x,&nods,XHANDLE);
+	FetchData(&y,&nods,YHANDLE);
+	FetchData(&x0,&numberofnodes,X0HANDLE);
+	FetchData(&y0,&numberofnodes,Y0HANDLE);
 
 	/* Echo: {{{1*/
@@ -48,5 +48,5 @@
 
 	/*Write data: */
-	WriteMatlabData(TRIA,tria,numberofnodes);
+	WriteData(TRIA,tria,numberofnodes);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/mex/TriaSearch/TriaSearch.h
===================================================================
--- /issm/trunk-jpl/src/mex/TriaSearch/TriaSearch.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/TriaSearch/TriaSearch.h	(revision 11933)
@@ -8,4 +8,5 @@
 void TriaSearchUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/UpdateConstraints/UpdateConstraints.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/UpdateConstraints/UpdateConstraints.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/UpdateConstraints/UpdateConstraints.cpp	(revision 11933)
@@ -20,7 +20,7 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&constraints,CONSTRAINTS);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&constraints,CONSTRAINTS);
+	FetchData(&parameters,PARAMETERS);
 	
 	/*!Generate internal degree of freedom numbers: */
@@ -28,5 +28,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(NODES,nodes);
+	WriteData(NODES,nodes);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/UpdateConstraints/UpdateConstraints.h
===================================================================
--- /issm/trunk-jpl/src/mex/UpdateConstraints/UpdateConstraints.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/UpdateConstraints/UpdateConstraints.h	(revision 11933)
@@ -11,4 +11,5 @@
 void UpdateConstraintsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp	(revision 11933)
@@ -20,8 +20,8 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&constraints,CONSTRAINTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((Parameters**)&parameters,PARAMETERS);
-	FetchMatlabData(&yg,YG);
+	FetchData((DataSet**)&constraints,CONSTRAINTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((Parameters**)&parameters,PARAMETERS);
+	FetchData(&yg,YG);
 	
 	/*!Generate internal degree of freedom numbers: */
@@ -29,5 +29,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(CONSTRAINTSOUT,constraints);
+	WriteData(CONSTRAINTSOUT,constraints);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h
===================================================================
--- /issm/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h	(revision 11933)
@@ -9,4 +9,5 @@
 void UpdateDynamicConstraintsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/UpdateVertexPositions/UpdateVertexPositions.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/UpdateVertexPositions/UpdateVertexPositions.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/UpdateVertexPositions/UpdateVertexPositions.cpp	(revision 11933)
@@ -22,10 +22,10 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
-	FetchMatlabData((DataSet**)&nodes,NODESIN);
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData((DataSet**)&loads,LOADSIN);
-	FetchMatlabData((DataSet**)&materials,MATERIALSIN);
-	FetchMatlabData(&parameters,PARAMETERSIN);
+	FetchData((DataSet**)&elements,ELEMENTSIN);
+	FetchData((DataSet**)&nodes,NODESIN);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData((DataSet**)&loads,LOADSIN);
+	FetchData((DataSet**)&materials,MATERIALSIN);
+	FetchData(&parameters,PARAMETERSIN);
 
 	/*configure: */
@@ -38,10 +38,10 @@
 
 	/*write output datasets: */
-	WriteMatlabData(ELEMENTS,elements);
-	WriteMatlabData(NODES,nodes);
-	WriteMatlabData(VERTICES,vertices);
-	WriteMatlabData(LOADS,loads);
-	WriteMatlabData(MATERIALS,materials);
-	WriteMatlabData(PARAMETERS,parameters);
+	WriteData(ELEMENTS,elements);
+	WriteData(NODES,nodes);
+	WriteData(VERTICES,vertices);
+	WriteData(LOADS,loads);
+	WriteData(MATERIALS,materials);
+	WriteData(PARAMETERS,parameters);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/UpdateVertexPositions/UpdateVertexPositions.h
===================================================================
--- /issm/trunk-jpl/src/mex/UpdateVertexPositions/UpdateVertexPositions.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/UpdateVertexPositions/UpdateVertexPositions.h	(revision 11933)
@@ -9,4 +9,5 @@
 void UpdateVertexPositionsUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/VerticesDof/VerticesDof.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/VerticesDof/VerticesDof.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/VerticesDof/VerticesDof.cpp	(revision 11933)
@@ -18,6 +18,6 @@
 
 	/*Input datasets: */
-	FetchMatlabData((DataSet**)&vertices,VERTICESIN);
-	FetchMatlabData(&parameters,PARAMETERS);
+	FetchData((DataSet**)&vertices,VERTICESIN);
+	FetchData(&parameters,PARAMETERS);
 
 	/*!Generate internal degree of freedom numbers: */
@@ -25,5 +25,5 @@
 
 	/*write output datasets: */
-	WriteMatlabData(VERTICES,vertices);
+	WriteData(VERTICES,vertices);
 
 	/*Free ressources: */
Index: /issm/trunk-jpl/src/mex/VerticesDof/VerticesDof.h
===================================================================
--- /issm/trunk-jpl/src/mex/VerticesDof/VerticesDof.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/VerticesDof/VerticesDof.h	(revision 11933)
@@ -9,4 +9,5 @@
 void VerticesDofUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
Index: /issm/trunk-jpl/src/mex/Xy2ll/Xy2ll.cpp
===================================================================
--- /issm/trunk-jpl/src/mex/Xy2ll/Xy2ll.cpp	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Xy2ll/Xy2ll.cpp	(revision 11933)
@@ -35,15 +35,15 @@
 	/*Input datasets: */
 	if (verbose) printf("Fetching inputs:\n");
-	FetchMatlabData(&x,&nx,X_IN);
+	FetchData(&x,&nx,X_IN);
 	if (verbose)
 		if   (nx == 1) printf("  x=%g\n",x[0]);
 		else           printf("  x=[%d values]\n",nx);
 //	for (i=0; i<nx; i++) printf("  x[%d]=%g\n",i,x[i]);
-	FetchMatlabData(&y,&ny,Y_IN);
+	FetchData(&y,&ny,Y_IN);
 	if (verbose)
 		if   (ny == 1) printf("  y=%g\n",y[0]);
 		else           printf("  y=[%d values]\n",ny);
 //	for (i=0; i<ny; i++) printf("  y[%d]=%g\n",i,y[i]);
-	FetchMatlabData(&sgn,SGN_IN);
+	FetchData(&sgn,SGN_IN);
 	if (verbose) printf("  sgn=%d\n",sgn);
 
@@ -84,6 +84,6 @@
 
 	/*Write data: */
-	WriteMatlabData(LAT_OUT,lat,ncoord);
-	WriteMatlabData(LON_OUT,lon,ncoord);
+	WriteData(LAT_OUT,lat,ncoord);
+	WriteData(LON_OUT,lon,ncoord);
 
 	/*Clean-up*/
Index: /issm/trunk-jpl/src/mex/Xy2ll/Xy2ll.h
===================================================================
--- /issm/trunk-jpl/src/mex/Xy2ll/Xy2ll.h	(revision 11932)
+++ /issm/trunk-jpl/src/mex/Xy2ll/Xy2ll.h	(revision 11933)
@@ -9,4 +9,5 @@
 void Xy2llUsage(void);
 
+#include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"