Changeset 15522

Timestamp:

07/19/13 10:12:23 (12 years ago)

Author:

seroussi

Message:

FIX: start to debug new front

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (10 diffs)

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

@@ -700 +700 @@
         IssmDouble  xyz_bis[3][3];
 
-        GetJacobianDeterminant(&area_init, &xyz_list[0][0],NULL);
+        area_init=GetArea();
 
         /*Initialize xyz_list with original xyz_list of triangle coordinates*/
         for(j=0;j<3;j++){ 
-                for(k=0;k<3;j++){
+                for(k=0;k<3;k++){
                         xyz_bis[j][k]=xyz_list[j][k];
                 }
@@ -710 +710 @@
         for(i=0;i<numpoints;i++){
                 for(j=0;j<3;j++){ 
-                        for(k=0;k<3;j++){
+                        for(k=0;k<3;k++){
                                 /*Change appropriate line*/
                                 xyz_bis[j][k]=xyz_zero[i][k];
@@ -716 +716 @@
 
                         /*Compute area fraction*/
-                        GetJacobianDeterminant(&area_portion, &xyz_bis[0][0],NULL);
+                        area_portion=fabs(xyz_bis[1][0]*xyz_bis[2][1] - xyz_bis[1][1]*xyz_bis[2][0] + xyz_bis[0][0]*xyz_bis[1][1] - xyz_bis[0][1]*xyz_bis[1][0] + xyz_bis[2][0]*xyz_bis[0][1] - xyz_bis[2][1]*xyz_bis[0][0])/2.;
                         *(area_coordinates+3*i+j)=area_portion/area_init;
 
                         /*Reinitialize xyz_list*/
-                        for(k=0;k<3;j++){
+                        for(k=0;k<3;k++){
                                 /*Reinitialize xyz_list with original coordinates*/
                                 xyz_bis[j][k]=xyz_list[j][k];
@@ -948 +948 @@
                 s2=levelset[2]/(levelset[2]-levelset[0]);
 
-                if(levelset[2]>0) normal_orientation=0;
+                if(levelset[2]>0) normal_orientation=1;
                 /*New point 1*/
                 xyz_zero[3*normal_orientation+0]=xyz_list[2][0]+s1*(xyz_list[1][0]-xyz_list[2][0]);
@@ -964 +964 @@
                 s2=levelset[0]/(levelset[0]-levelset[1]);
 
-                if(levelset[0]>0) normal_orientation=0;
+                if(levelset[0]>0) normal_orientation=1;
                 /*New point 1*/
                 xyz_zero[3*normal_orientation+0]=xyz_list[0][0]+s1*(xyz_list[2][0]-xyz_list[0][0]);
@@ -980 +980 @@
                 s2=levelset[1]/(levelset[1]-levelset[2]);
 
-                if(levelset[1]>0) normal_orientation=0;
+                if(levelset[1]>0) normal_orientation=1;
                 /*New point 0*/
                 xyz_zero[3*normal_orientation+0]=xyz_list[1][0]+s1*(xyz_list[0][0]-xyz_list[1][0]);
@@ -990 +990 @@
                 xyz_zero[3*(1-normal_orientation)+1]=xyz_list[1][1]+s2*(xyz_list[2][1]-xyz_list[1][1]);
                 xyz_zero[3*(1-normal_orientation)+2]=xyz_list[1][2]+s2*(xyz_list[2][2]-xyz_list[1][2]);
-                }
-
+        }
+        else if(levelset[0]==0 && levelset[1]==0){ //front is on point 0 and 1
+                xyz_zero[3*0+0]=xyz_list[0][0];
+                xyz_zero[3*0+1]=xyz_list[0][1];
+                xyz_zero[3*0+2]=xyz_list[0][2];
+
+                /*New point 2*/
+                xyz_zero[3*1+0]=xyz_list[1][0];
+                xyz_zero[3*1+1]=xyz_list[1][1];
+                xyz_zero[3*1+2]=xyz_list[1][2];
+        }
+        else if(levelset[0]==0 && levelset[2]==0){ //front is on point 0 and 1
+                xyz_zero[3*0+0]=xyz_list[0][0];
+                xyz_zero[3*0+1]=xyz_list[0][1];
+                xyz_zero[3*0+2]=xyz_list[0][2];
+
+                /*New point 2*/
+                xyz_zero[3*1+0]=xyz_list[2][0];
+                xyz_zero[3*1+1]=xyz_list[2][1];
+                xyz_zero[3*1+2]=xyz_list[2][2];
+        }
+        else if(levelset[1]==0 && levelset[2]==0){ //front is on point 0 and 1
+                xyz_zero[3*0+0]=xyz_list[1][0];
+                xyz_zero[3*0+1]=xyz_list[1][1];
+                xyz_zero[3*0+2]=xyz_list[1][2];
+
+                /*New point 2*/
+                xyz_zero[3*1+0]=xyz_list[2][0];
+                xyz_zero[3*1+1]=xyz_list[2][1];
+                xyz_zero[3*1+2]=xyz_list[2][2];
+        }
+        else _error_("Case not covered");
 }
 /*}}}*/
@@ -3124 +3154 @@
         bool        isfront;
 
-        return NULL;
-
         /*Retrieve all inputs and parameters*/
         GetInputListOnVertices(&ls[0],IcelevelsetEnum);
@@ -3137 +3165 @@
         }
 
+        return NULL;
         /*If no front, return NULL*/
         if(!isfront) return NULL;
@@ -3196 +3225 @@
         delete gauss;
         return pe;
-
 }
 /*}}}*/