Changeset 14378 for issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

Timestamp:

02/23/13 11:37:39 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some renaming (no more sheet and shelf, but grounded floating)

File:

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

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

@@ -31 +31 @@
         if(migration_style==SoftMigrationEnum){
                 /*Create flag for grounded vertices above the hydrostatic equilibrium: */
-                vertices_potentially_ungrounding=PotentialSheetUngrounding(elements,vertices,parameters);
+                vertices_potentially_ungrounding=PotentialUngrounding(elements,vertices,parameters);
 
                 /*propagate ice shelf into connex areas of the ice sheet that potentially want to unground: */
@@ -81 +81 @@
 }
 /*%}}}*/
-/*FUNCTION PotentialSheetUngrounding {{{*/
-IssmDouble*    PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ 
+/*FUNCTION PotentialUngrounding {{{*/
+IssmDouble*    PotentialUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ 
 
         int      i,numberofvertices;
@@ -96 +96 @@
         for(i=0;i<elements->Size();i++){
                 element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                element->PotentialSheetUngrounding(vec_vertices_potentially_ungrounding);
+                element->PotentialUngrounding(vec_vertices_potentially_ungrounding);
         }
 
@@ -150 +150 @@
                         element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                         if(reCast<int,IssmDouble>(elements_neighboring_floatingce[element->Sid()])){
-                                local_nflipped+=element->UpdatePotentialSheetUngrounding(vertices_potentially_ungrounding,vec_nodes_on_floatingice,nodes_on_floatingice);
+                                local_nflipped+=element->UpdatePotentialUngrounding(vertices_potentially_ungrounding,vec_nodes_on_floatingice,nodes_on_floatingice);
                         }
                 }