Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 9654)
+++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 9655)
@@ -439,5 +439,4 @@
 	NumberOfNodes2DEnum,
 	NodeonstokesEnum,
-	NodeonhutterEnum,
 	NodeonpattynEnum,
 	NodeonmacayealEnum,
Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp
===================================================================
--- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp	(revision 9654)
+++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp	(revision 9655)
@@ -383,5 +383,4 @@
 		case NumberOfNodes2DEnum : return "NumberOfNodes2D";
 		case NodeonstokesEnum : return "Nodeonstokes";
-		case NodeonhutterEnum : return "Nodeonhutter";
 		case NodeonpattynEnum : return "Nodeonpattyn";
 		case NodeonmacayealEnum : return "Nodeonmacayeal";
Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp
===================================================================
--- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp	(revision 9654)
+++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp	(revision 9655)
@@ -24,5 +24,4 @@
 	double *spcvy           = NULL;
 	double *spcvz           = NULL;
-	double *nodeonhutter    = NULL;
 	double *nodeonmacayeal  = NULL;
 	double *nodeonpattyn    = NULL;
@@ -65,5 +64,4 @@
 	iomodel->FetchData(&spcvy,NULL,NULL,SpcvyEnum);
 	iomodel->FetchData(&spcvz,NULL,NULL,SpcvzEnum);
-	iomodel->FetchData(&nodeonhutter,NULL,NULL,NodeonhutterEnum);
 	iomodel->FetchData(&nodeonmacayeal,NULL,NULL,NodeonmacayealEnum);
 	if(dim==3)iomodel->FetchData(&nodeonpattyn,NULL,NULL,NodeonpattynEnum);
@@ -201,5 +199,5 @@
 					count++;
 				}
-				else if (nodeonhutter[i]){
+				else if (vertices_type[i]==HutterApproximationEnum){
 					constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,DiagnosticHorizAnalysisEnum)); 
 					count++;
@@ -210,5 +208,5 @@
 					count++;
 				}
-				else if (nodeonhutter[i]){
+				else if (vertices_type[i]==HutterApproximationEnum){
 					constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,DiagnosticHorizAnalysisEnum)); 
 					count++;
@@ -231,5 +229,4 @@
 	xfree((void**)&spcvy);
 	xfree((void**)&spcvz);
-	xfree((void**)&nodeonhutter);
 	xfree((void**)&nodeonmacayeal);
 	xfree((void**)&nodeonpattyn);
Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp
===================================================================
--- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp	(revision 9654)
+++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp	(revision 9655)
@@ -45,5 +45,5 @@
 
 	/*Create nodes: */
-	iomodel->FetchData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,
+	iomodel->FetchData(9,NodeonbedEnum,NodeonsurfaceEnum,NodeonmacayealEnum,NodeonstokesEnum,
 				MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
 	
@@ -58,5 +58,5 @@
 
 	/*Clean fetched data: */
-	iomodel->DeleteData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,
+	iomodel->DeleteData(9,NodeonbedEnum,NodeonsurfaceEnum,NodeonmacayealEnum,NodeonstokesEnum,
 				MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
 
Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp
===================================================================
--- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp	(revision 9654)
+++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp	(revision 9655)
@@ -42,5 +42,5 @@
 
 	/*Fetch data: */
-	iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum);
+	iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,VerticesTypeEnum);
 
 	/*Initialize conunter*/
@@ -51,5 +51,5 @@
 		/*keep only this partition's nodes:*/
 		if((iomodel->my_vertices[i])){
-			if (!(int)iomodel->Data(NodeonhutterEnum)[i]){
+			if (!(int)iomodel->Data(VerticesTypeEnum)[i]==HutterApproximationEnum){
 
 				constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,DiagnosticHutterAnalysisEnum));
@@ -74,5 +74,5 @@
 
 	/*Free data: */
-	iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum);
+	iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,VerticesTypeEnum);
 	
 	/*Assign output pointer: */
Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp
===================================================================
--- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp	(revision 9654)
+++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp	(revision 9655)
@@ -44,5 +44,5 @@
 
 	/*First fetch data: */
-	iomodel->FetchData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
+	iomodel->FetchData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
 	CreateNumberNodeToElementConnectivity(iomodel);
 
@@ -57,5 +57,5 @@
 
 	/*Clean fetched data: */
-	iomodel->DeleteData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
+	iomodel->DeleteData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
 
 	/*Assign output pointer: */
Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp
===================================================================
--- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp	(revision 9654)
+++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp	(revision 9655)
@@ -39,5 +39,4 @@
 	}
 	
-	iomodel->FetchDataToInput(elements,NodeonhutterEnum);
 	iomodel->FetchDataToInput(elements,ThicknessEnum);
 	iomodel->FetchDataToInput(elements,ThicknessCoeffEnum);
Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp
===================================================================
--- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp	(revision 9654)
+++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp	(revision 9655)
@@ -381,5 +381,4 @@
 	else if (strcmp(name,"NumberOfNodes2D")==0) return NumberOfNodes2DEnum;
 	else if (strcmp(name,"Nodeonstokes")==0) return NodeonstokesEnum;
-	else if (strcmp(name,"Nodeonhutter")==0) return NodeonhutterEnum;
 	else if (strcmp(name,"Nodeonpattyn")==0) return NodeonpattynEnum;
 	else if (strcmp(name,"Nodeonmacayeal")==0) return NodeonmacayealEnum;
Index: /issm/trunk/src/c/objects/Node.cpp
===================================================================
--- /issm/trunk/src/c/objects/Node.cpp	(revision 9654)
+++ /issm/trunk/src/c/objects/Node.cpp	(revision 9655)
@@ -92,6 +92,5 @@
 		}
 		/*spc all nodes on hutter*/
-		if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL");
-		if (iomodel->Data(NodeonhutterEnum)[io_index]){
+		if (iomodel->Data(VerticesTypeEnum)[io_index]==HutterApproximationEnum){
 			for(k=1;k<=gsize;k++){
 				this->FreezeDof(k);
@@ -103,7 +102,7 @@
 	/*Diagnostic Hutter*/
 	if (analysis_type==DiagnosticHutterAnalysisEnum){
+		if (!iomodel->Data(VerticesTypeEnum)) _error_("iomodel->vertices_type is NULL");
 		/*Constrain all nodes that are not Hutter*/
-		if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL");
-		if (!iomodel->Data(NodeonhutterEnum)[io_index]){
+		if (!iomodel->Data(VerticesTypeEnum)[io_index]==HutterApproximationEnum){
 			for(k=1;k<=gsize;k++){
 				this->FreezeDof(k);
Index: /issm/trunk/src/m/classes/model/model.m
===================================================================
--- /issm/trunk/src/m/classes/model/model.m	(revision 9654)
+++ /issm/trunk/src/m/classes/model/model.m	(revision 9655)
@@ -67,5 +67,4 @@
 
 		 %Nodes
-		 nodeonhutter         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
 		 nodeonmacayeal       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
 		 nodeonpattyn         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
Index: /issm/trunk/test/NightlyRun/test311.m
===================================================================
--- /issm/trunk/test/NightlyRun/test311.m	(revision 9654)
+++ /issm/trunk/test/NightlyRun/test311.m	(revision 9655)
@@ -5,4 +5,5 @@
 md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal');
 md.cluster=none;
+md.verbose=verbose('module',true,'solution',true,'verbose',true);
 md=solve(md,DiagnosticSolutionEnum);
 
Index: /issm/trunk/test/NightlyRun/test312.m
===================================================================
--- /issm/trunk/test/NightlyRun/test312.m	(revision 9654)
+++ /issm/trunk/test/NightlyRun/test312.m	(revision 9655)
@@ -4,5 +4,7 @@
 md=extrude(md,4,2);
 md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal');
-md.cluster=generic('name',oshostname(),'np',3);
+md.cluster=generic('name',oshostname(),'np',1);
+md.debug.valgrind=1;
+md.verbose=verbose('convergence',true,'solution',true,'module',true);
 md=solve(md,DiagnosticSolutionEnum);