Changeset 10310

Timestamp:

10/26/11 09:39:04 (13 years ago)

Author:

seroussi

Message:

minor

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Elements/Tria.cpp ¶

@@ -281 +281 @@
 void  Tria::AgressiveMigration(void){
 
-
-        double *values         = NULL;
+        int     i;
+        bool    elementonshelf = false;
         double  h[3],s[3],b[3],ba[3];
         double  bed_hydro;
         double  rho_water,rho_ice,density;
-        int     i;
-        bool    elementonshelf = false;
-
-        /*Recover info at the vertices: */
-        Input* surface_input =inputs->GetInput(SurfaceEnum); _assert_(surface_input);
-        Input* bed_input     =inputs->GetInput(BedEnum);     _assert_(bed_input);
-        if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!");
+        double *values         = NULL;
 
         GetInputListOnVertices(&h[0],ThicknessEnum);
@@ -2194 +2188 @@
 void  Tria::ShelfSync(void){
 
+        int     i,swap;
+        double  bed_hydro,gl_melting_rate;
+        double  yts,rho_water,rho_ice,density;
         double  melting[NUMVERTICES];
         double  h[NUMVERTICES],s[NUMVERTICES],b[NUMVERTICES],ba[NUMVERTICES];
-        double  bed_hydro;
-        double  rho_water,rho_ice,density;
-        int     i;
         bool    elementonshelf = false;
-
-        /*melting rate at the grounding line: */
-        double  yts;
-        int     swap;
-        double  gl_melting_rate;
 
         /*recover parameters: */