Changeset 10931

Timestamp:

11/25/11 16:00:59 (13 years ago)

Author:

Eric.Larour

Message:

Skipping elements on ice shelves for hydrology formulation

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (4 diffs)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1389 +1389 @@
         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 +1851 @@
 }
 /*}}}*/
-/*FUNCTION Tria::IsOnShelf {{{1*/
+/*FUNCTION Tria::IsFloating {{{1*/
 bool   Tria::IsFloating(){
 
@@ -4704 +4705 @@
         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 +4801 @@
         double     basis[numdof];
         GaussTria* gauss=NULL;
+
+        /*Skip if water or ice shelf element*/
+        if(IsOnWater() | IsFloating()) return NULL;
 
         /*Initialize Element vector*/