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

Timestamp:

11/16/13 20:14:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: done with FS shelf

File:

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

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

@@ -1162 +1162 @@
 
 }/*}}}*/
-/*FUNCTION Tria::GetSegmentNormal {{{*/
-void Tria:: GetSegmentNormal(IssmDouble* normal,IssmDouble xyz_list[2][3]){
+/*FUNCTION Tria::NormalBase {{{*/
+void Tria::NormalBase(IssmDouble* normal,IssmDouble* xyz_list){
 
         /*Build unit outward pointing vector*/
@@ -1169 +1169 @@
         IssmDouble norm;
 
-        vector[0]=xyz_list[1][0] - xyz_list[0][0];
-        vector[1]=xyz_list[1][1] - xyz_list[0][1];
+        vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0];
+        vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1];
 
         norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]);
@@ -1976 +1976 @@
 
         bool onbed;
-        inputs->GetInputValue(&onbed,MeshElementonbedEnum);
+        int meshtype;
+        this->parameters->FindParam(&meshtype,MeshTypeEnum);
+        switch(meshtype){
+                case Mesh2DverticalEnum:
+                        return HasEdgeOnBed();
+                        break;
+                case Mesh2DhorizontalEnum:
+                        inputs->GetInputValue(&onbed,MeshElementonbedEnum);
+                        break;
+                default: _error_("mesh "<<EnumToStringx(meshtype)<<" not supported yet");
+        }
         return onbed;
 }
@@ -3876 +3886 @@
         GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum);
         GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,2);
-        GetSegmentNormal(&normal[0],xyz_list_front);
+        NormalBase(&normal[0],&xyz_list_front[0][0]);
 
         /*Start looping on Gaussian points*/
@@ -4022 +4032 @@
                 GetNodalFunctionsVelocity(vbasis, gauss);
 
-                GetSegmentNormal(&normal[0],xyz_list_seg);
+                NormalBase(&normal[0],&xyz_list_seg[0][0]);
                 _assert_(normal[1]<0.);
                 bed_input->GetInputValue(&bed, gauss);
@@ -4157 +4167 @@
         GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum);
         GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,2);
-        GetSegmentNormal(&normal[0],xyz_list_front);
+        NormalBase(&normal[0],&xyz_list_front[0][0]);
 
         /*Start looping on Gaussian points*/
@@ -7125 +7135 @@
         this->EdgeOnSurfaceIndices(&indices[0],&indices[1]);
         for(int i=0;i<NUMVERTICES1D;i++) for(int j=0;j<2;j++) xyz_list_seg[i][j]=xyz_list[indices[i]][j];
-        GetSegmentNormal(&normal[0],xyz_list_seg);
+        NormalBase(&normal[0],&xyz_list_seg[0][0]);
 
         /* Start  looping on the number of gaussian points: */
@@ -7175 +7185 @@
         this->EdgeOnBedIndices(&indices[0],&indices[1]);
         for(int i=0;i<NUMVERTICES1D;i++) for(int j=0;j<2;j++) xyz_list_seg[i][j]=xyz_list[indices[i]][j];
-        GetSegmentNormal(&normal[0],xyz_list_seg);
+        NormalBase(&normal[0],&xyz_list_seg[0][0]);
 
         /* Start  looping on the number of gaussian points: */