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

Timestamp:

07/24/13 15:28:57 (12 years ago)

Author:

seroussi

Message:

NEW: models only rely on mask.icelevelset now (diagnostic.icefront not used)

File:

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

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

@@ -1848 +1848 @@
                                 name==BedEnum ||
                                 name==GLlevelsetEnum ||
-                                name==IcelevelsetEnum ||
+                                name==MaskIcelevelsetEnum ||
                                 name==SurfaceSlopeXEnum ||
                                 name==SurfaceSlopeYEnum ||
@@ -3155 +3155 @@
 
         /*Retrieve all inputs and parameters*/
-        GetInputListOnVertices(&ls[0],IcelevelsetEnum);
+        GetInputListOnVertices(&ls[0],MaskIcelevelsetEnum);
 
         /*If the level set is awlays <0, there is no ice front here*/
@@ -3187 +3187 @@
         rho_ice  =matpar->GetRhoIce();
         gravity  =matpar->GetG();
-        GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,IcelevelsetEnum);
+        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);