Changeset 14368

Timestamp:

02/22/13 15:03:48 (12 years ago)

Author:

seroussi

Message:

CHG: improved grounded portion computation

Location:

issm/trunk-jpl/src/c

Files:

• classes/objects/Elements/Tria.cpp (modified) (3 diffs)
• solutions/transient_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -1119 +1119 @@
         /*Computeportion of the element that is grounded*/ 
 
-        bool mainlyfloating=true;
-        IssmDouble phi,s1,s2,area_init,area_grounded;
-        IssmDouble gl[3];
-        IssmDouble xyz_bis[3][3];
-        GaussTria *gauss    = NULL;
+        bool               mainlyfloating = true;
+        const IssmPDouble  epsilon= 1.e-15;
+        IssmDouble         phi,s1,s2,area_init,area_grounded;
+        IssmDouble         gl[3];
+        IssmDouble         xyz_bis[3][3];
+        GaussTria         *gauss = NULL;
 
         /*Recover parameters and values*/
         GetInputListOnVertices(&gl[0],GLlevelsetEnum);
         
+        /*Be sure that values are not zero*/
+        if(gl[0]==0) gl[0]=gl[0]+epsilon;
+        if(gl[1]==0) gl[1]=gl[1]+epsilon;
+        if(gl[2]==0) gl[2]=gl[2]+epsilon;
+
         /*Check that not all nodes are grounded or floating*/
         if(gl[0]>0 && gl[1]>0 && gl[2]>0){ // All grounded
@@ -1136 +1142 @@
         }
         else{
-
                 /*Figure out if two nodes are floating or grounded*/
                 if(gl[0]*gl[1]*gl[2]>0) mainlyfloating=false;
@@ -1209 +1214 @@
 
         if(phi>1 || phi<0) _error_("Error. Problem with portion of grounded element: value should be between 0 and 1");
-   //this->inputs->AddInput(new DoubleInput(GroundedPortionEnum,phi));
 
         return phi;

issm/trunk-jpl/src/c/solutions/transient_core.cpp

@@ -148 +148 @@
                         if(isgroundingline && groundingline_migration==SubelementMigrationEnum){
                                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GLlevelsetEnum);
-                                //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GroundedPortionEnum);
                         }