Index: /issm/trunk/src/c/objects/Elements/Tria.cpp
===================================================================
--- /issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 10930)
+++ /issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 10931)
@@ -1389,5 +1389,6 @@
 	if (enum_type==MaterialsRheologyBbarEnum) input=this->matice->inputs->GetInput(enum_type);
 	else input=this->inputs->GetInput(enum_type);
-	if (!input) _error_("Input %s not found in tria->inputs",EnumToStringx(enum_type));
+	//if (!input) _error_("Input %s not found in tria->inputs",EnumToStringx(enum_type));
+	if(!input)return;
 
 	/*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 
@@ -1850,5 +1851,5 @@
 }
 /*}}}*/
-/*FUNCTION Tria::IsOnShelf {{{1*/
+/*FUNCTION Tria::IsFloating {{{1*/
 bool   Tria::IsFloating(){
 
@@ -4704,4 +4705,7 @@
 	GaussTria *gauss=NULL;
 
+	/*Skip if water or ice shelf element*/
+	if(IsOnWater() | IsFloating()) return NULL;
+
 	/*Initialize Element matrix*/
 	ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
@@ -4797,4 +4801,7 @@
 	double     basis[numdof];
 	GaussTria* gauss=NULL;
+
+	/*Skip if water or ice shelf element*/
+	if(IsOnWater() | IsFloating()) return NULL;
 
 	/*Initialize Element vector*/
