Changeset 16023

Timestamp:

08/29/13 16:10:29 (12 years ago)

Author:

seroussi

Message:

CHG: working on Subelement2 migration in Penta

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (3 diffs)
• Penta.h (modified) (1 diff)
• Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1081 +1081 @@
         /*Assign output pointers:*/
         *pdoflist=doflist;
+}
+/*}}}*/
+/*FUNCTION Penta::GetGroundedPart{{{*/
+void Penta::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating){
+        /*Computeportion of the element that is grounded*/ 
+
+        bool               floating=true;
+        int                point;
+        const IssmPDouble  epsilon= 1.e-15;
+        IssmDouble         gl[NUMVERTICES];
+        IssmDouble         f1,f2;
+
+        /*Recover parameters and values*/
+        GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum);
+
+        /*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
+                point=0;
+                f1=1.;
+                f2=1.;
+        }
+        else if(gl[0]<0 && gl[1]<0 && gl[2]<0){ //All floating
+                point=0;
+                f1=0.;
+                f2=0.;
+        }
+        else{
+                if(gl[0]*gl[1]*gl[2]<0) floating=false;
+
+                if(gl[0]*gl[1]>0){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2
+                        point=2;
+                        f1=gl[2]/(gl[2]-gl[0]);
+                        f2=gl[2]/(gl[2]-gl[1]);
+                }
+                else if(gl[1]*gl[2]>0){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2
+                        point=0;
+                        f1=gl[0]/(gl[0]-gl[1]);
+                        f2=gl[0]/(gl[0]-gl[2]);
+                }
+                else if(gl[0]*gl[2]>0){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2
+                        point=1;
+                        f1=gl[1]/(gl[1]-gl[2]);
+                        f2=gl[1]/(gl[1]-gl[0]);
+                }
+        }
+        *point1=point;
+        *fraction1=f1;
+        *fraction2=f2;
+        *mainlyfloating=floating;
 }
 /*}}}*/
@@ -8019 +8073 @@
 
         /*Intermediaries */
+        bool       mainlyfloating;
         int         i,j;
         int         analysis_type,migration_style;
@@ -8062 +8117 @@
         if(migration_style==SubelementMigration2Enum){
                 gllevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gllevelset_input);
-                //this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
                 //gauss=new GaussPenta(point1,fraction1,fraction2,mainlyfloating,2);
                 gauss=new GaussPenta(0,1,2,2);

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -195 +195 @@
                 void           GetVertexSidList(int* sidlist);
                 void           GetConnectivityList(int* connectivity);
+                void           GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating);
                 IssmDouble     GetGroundedPortion(IssmDouble* xyz_list);
                 int            GetElementType(void);

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -212 +212 @@
                 void           GetVertexSidList(int* sidlist);
                 void           GetConnectivityList(int* connectivity);
+                void           GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating);
                 IssmDouble     GetGroundedPortion(IssmDouble* xyz_list);
-                void           GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating);
                 void           GetSegmentNormal(IssmDouble* normal,IssmDouble xyz_list[2][3]);
                 void           GetZeroLevelsetCoordinates(IssmDouble* xyz_zero,IssmDouble xyz_list[3][3],int levelsetenum);