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

Timestamp:

11/20/13 19:08:46 (11 years ago)

Author:

seroussi

Message:

CHG: moved ice front HO in analysis

File:

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

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

@@ -1511 +1511 @@
 }
 /*}}}*/
-/*FUNCTION Penta::GetQuadNormal {{{*/
-void Penta:: GetQuadNormal(IssmDouble* normal,IssmDouble* xyz_list){
+/*FUNCTION Penta::NormalSection{{{*/
+void Penta::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){
 
         /*Build unit outward pointing vector*/
@@ -1634 +1634 @@
 /*}}}*/
 /*FUNCTION Penta::GetZcoord {{{*/
-IssmDouble Penta::GetZcoord(GaussPenta* gauss){
+IssmDouble Penta::GetZcoord(Gauss* gauss){
 
         int    i;
@@ -2466 +2466 @@
 }
 /*}}}*/
+/*FUNCTION Penta::JacobianDeterminantSurface{{{*/
+void Penta::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list_quad,Gauss* gauss){
+
+        _assert_(gauss->Enum()==GaussPentaEnum);
+        this->GetQuadJacobianDeterminant(pJdet,xyz_list_quad,(GaussPenta*)gauss);
+
+}
+/*}}}*/
 /*FUNCTION Penta::NoIceInElement {{{*/
 bool   Penta::NoIceInElement(){
@@ -2542 +2550 @@
 Gauss* Penta::NewGauss(int order){
         return new GaussPenta(order,order);
+}
+/*}}}*/
+/*FUNCTION Penta::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){{{*/
+Gauss* Penta::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){
+
+        IssmDouble  area_coordinates[4][3];
+
+        GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,4);
+
+        return new GaussPenta(area_coordinates,order_horiz,order_vert);
 }
 /*}}}*/
@@ -3123 +3141 @@
                 return S;
         }
-}
-/*}}}*/
-/*FUNCTION Penta::SurfaceNormal {{{*/
-void Penta::SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]){
-
-        int    i;
-        IssmDouble v13[3],v23[3];
-        IssmDouble normal[3];
-        IssmDouble normal_norm;
-
-        for (i=0;i<3;i++){
-                v13[i]=xyz_list[0][i]-xyz_list[2][i];
-                v23[i]=xyz_list[1][i]-xyz_list[2][i];
-        }
-
-        normal[0]=v13[1]*v23[2]-v13[2]*v23[1];
-        normal[1]=v13[2]*v23[0]-v13[0]*v23[2];
-        normal[2]=v13[0]*v23[1]-v13[1]*v23[0];
-
-        normal_norm=sqrt( pow(normal[0],2)+pow(normal[1],2)+pow(normal[2],2) );
-
-        *(surface_normal)=normal[0]/normal_norm;
-        *(surface_normal+1)=normal[1]/normal_norm;
-        *(surface_normal+2)=normal[2]/normal_norm;
 }
 /*}}}*/
@@ -6072 +6066 @@
 
                 /*Get normal vector to the bed */
-                SurfaceNormal(&surface_normal[0],xyz_list_tria);
+                NormalTop(&surface_normal[0],&xyz_list_tria[0][0]);
 
                 bed_normal[0]=-surface_normal[0]; //Function is for upper surface, so the normal to the bed is the opposite of the result
@@ -8123 +8117 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         for(i=0;i<NUMVERTICES2D;i++) for(j=0;j<3;j++) xyz_list_tria[i][j]=xyz_list[i+3][j];
-        SurfaceNormal(&surface_normal[0],xyz_list_tria);
+        NormalTop(&surface_normal[0],&xyz_list_tria[0][0]);
 
         /* Start  looping on the number of gaussian points: */
@@ -8788 +8782 @@
         ZeroLevelsetCoordinates(&xyz_list_front,&xyz_list[0][0],MaskIceLevelsetEnum);
         GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,&xyz_list[0][0],4);
-        GetQuadNormal(&normal[0],xyz_list_front);
+        NormalSection(&normal[0],xyz_list_front);
 
         /*Initialize gauss points*/
@@ -8821 +8815 @@
         /*Clean up and return*/
         xDelete<IssmDouble>(basis);
+        xDelete<IssmDouble>(xyz_list_front);
         delete gauss;
         return pe;
@@ -8883 +8878 @@
         ZeroLevelsetCoordinates(&xyz_list_front,&xyz_list[0][0],MaskIceLevelsetEnum);
         GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,&xyz_list[0][0],4);
-        GetQuadNormal(&normal[0],xyz_list_front);
+        NormalSection(&normal[0],xyz_list_front);
 
         /*Start looping on Gaussian points*/