Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 17683)
+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 17684)
@@ -170,7 +170,7 @@
 	::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
 
 	/*Retrieve all inputs we will be needing: */
-	this->FindParam(&meshxdim,MeshTypeEnum);
+	this->FindParam(&meshxdim,MeshXDimEnum);
 	if(meshxdim==Mesh2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <<EnumToStringx(meshxdim)<<", extrude mesh or call ComputeDeviatoricStressTensor");
 	Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
 	Input* vx_input=inputs->GetInput(VxEnum);             _assert_(vx_input);
@@ -223,7 +223,7 @@
 	::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
 
 	/*Retrieve all inputs we will be needing: */
-	this->FindParam(&meshxdim,MeshTypeEnum);
+	this->FindParam(&meshxdim,MeshXDimEnum);
 	if(meshxdim!=Mesh2DhorizontalEnum) _error_("deviatoric stress tensor calculation not implemented for mesh of type " <<EnumToStringx(meshxdim));
 	Input* vx_input=inputs->GetInput(VxEnum);             _assert_(vx_input);
 	Input* vy_input=inputs->GetInput(VyEnum);             _assert_(vy_input);
Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 17683)
+++ ../trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 17684)
@@ -809,27 +809,21 @@
 				input=this->inputs->GetInput(output_enum);
 				break;
 			case StressTensorxxEnum: 
-				this->ComputeStressTensor();
-				input=this->inputs->GetInput(output_enum);
-				break;
 			case StressTensorxyEnum: 
-				this->ComputeStressTensor();
-				input=this->inputs->GetInput(output_enum);
-				break;
 			case StressTensorxzEnum: 
-				this->ComputeStressTensor();
-				input=this->inputs->GetInput(output_enum);
-				break;
 			case StressTensoryyEnum: 
-				this->ComputeStressTensor();
-				input=this->inputs->GetInput(output_enum);
-				break;
 			case StressTensoryzEnum: 
+			case StressTensorzzEnum: 
 				this->ComputeStressTensor();
 				input=this->inputs->GetInput(output_enum);
 				break;
-			case StressTensorzzEnum: 
-				this->ComputeStressTensor();
+			case DeviatoricStressxxEnum: 
+			case DeviatoricStressxyEnum: 
+			case DeviatoricStressxzEnum: 
+			case DeviatoricStressyyEnum: 
+			case DeviatoricStressyzEnum: 
+			case DeviatoricStresszzEnum: 
+				this->ComputeDeviatoricStressTensor();
 				input=this->inputs->GetInput(output_enum);
 				break;
 			default: