Changeset 16593

Timestamp:

10/31/13 13:26:13 (11 years ago)

Author:

nathanma

Message:

CHG:Adapt IceVolume routine to work for 2D Flowline mesh

File:

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

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

@@ -2882 +2882 @@
         if(NoIceInElement())return 0;
 
-        GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
-
-        /*First calculate the area of the base (cross section triangle)
-         * http://en.wikipedia.org/wiki/Triangle
-         * base = 1/2 abs((xA-xC)(yB-yA)-(xA-xB)(yC-yA))*/
-        base = 1./2. * fabs((xyz_list[0][0]-xyz_list[2][0])*(xyz_list[1][1]-xyz_list[0][1]) - (xyz_list[0][0]-xyz_list[1][0])*(xyz_list[2][1]-xyz_list[0][1]));
+        /*First get back the area of the base*/
+        base=this->GetArea();
 
         /*Now get the average height*/
@@ -2896 +2892 @@
 
         /*Return: */
-        return base*(surface-bed);
+        int meshtype;
+        parameters->FindParam(&meshtype,MeshTypeEnum);
+        if(meshtype==Mesh2DverticalEnum){
+          return base;
+        }
+        else{
+          return base*(surface-bed);
+        }
 }
 /*}}}*/
@@ -3774 +3777 @@
         /*Retrieve all inputs and parameters*/
         rho_water = matpar->GetRhoWater();
+        rho_ice = matpar->GetRhoIce();
         gravity   = matpar->GetG();
         GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum);