Changeset 15968

Timestamp:

08/27/13 09:39:47 (12 years ago)

Author:

seroussi

Message:

CHG: cosmetics

File:

• issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -12 +12 @@
         int                 migration_style,analysis_type;
         IssmDouble         *vertices_potentially_ungrounding = NULL;
-        IssmDouble         *vertices_ungrounding             = NULL;
+        IssmDouble         *phi_ungrounding                  = NULL;
         Element            *element                          = NULL;
 
@@ -37 +37 @@
 
                 /*propagate ice shelf into connex areas of the ice sheet that potentially want to unground: */
-                vertices_ungrounding=PropagateFloatingiceToGroundedNeighbors(elements,nodes,vertices,parameters,vertices_potentially_ungrounding);
+                phi_ungrounding=PropagateFloatingiceToGroundedNeighbors(elements,nodes,vertices,parameters,vertices_potentially_ungrounding);
         }
 
@@ -43 +43 @@
         for(int i=0;i<elements->Size();i++){
                 element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                element->MigrateGroundingLine(vertices_ungrounding);
+                element->MigrateGroundingLine(phi_ungrounding);
         }
 
         /*free ressouces: */
         xDelete<IssmDouble>(vertices_potentially_ungrounding);
-        xDelete<IssmDouble>(vertices_ungrounding);
+        xDelete<IssmDouble>(phi_ungrounding);
 }
 
@@ -54 +54 @@
 IssmDouble*    PotentialUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ 
 
-        int      i,numberofvertices;
-        IssmDouble*  vertices_potentially_ungrounding      = NULL;
-        Vector<IssmDouble>*      vec_vertices_potentially_ungrounding  = NULL;
-        Element* element                               = NULL;
+        int                 i,numberofvertices;
+        IssmDouble*         vertices_potentially_ungrounding      = NULL;
+        Vector<IssmDouble>* vec_vertices_potentially_ungrounding  = NULL;
+        Element*            element                               = NULL;
 
         /*Initialize vector with number of vertices*/
@@ -80 +80 @@
 /*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{*/
 IssmDouble*    PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,IssmDouble* vertices_potentially_ungrounding){ 
-
-        int      i,analysis_type;
-        int      numberofvertices;
-        int      nflipped,local_nflipped;
-        IssmDouble*  phi                  = NULL;
-        IssmDouble*  elements_neighboring_floatingce      = NULL;
-        Vector<IssmDouble>*      vec_elements_neighboring_floatingice = NULL;
-        Vector<IssmDouble>*      vec_phi              = NULL;
-        Node*    node                                  = NULL;
-        Element* element                               = NULL;
+        int                 i,analysis_type,numberofvertices;
+        int                 nflipped,local_nflipped;
+        IssmDouble*         phi                                  = NULL;
+        IssmDouble*         elements_neighboring_floatingce      = NULL;
+        Vector<IssmDouble>* vec_elements_neighboring_floatingice = NULL;
+        Vector<IssmDouble>* vec_phi                              = NULL;
+        Node*               node                                  = NULL;
+        Element*            element                               = NULL;
 
         /*recover parameters: */