Changeset 15962

Timestamp:

08/26/13 16:43:07 (12 years ago)

Author:

seroussi

Message:

CHG: simplified grounding line arguments

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/Elements/Tria.h (modified) (1 diff)
• modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.h ¶

@@ -140 +140 @@
 
                 #ifdef _HAVE_GROUNDINGLINE_
-                virtual void   MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding)=0;
+                virtual void   MigrateGroundingLine(IssmDouble* sheet_ungrounding)=0;
                 virtual void   PotentialUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding)=0;
                 virtual int    UpdatePotentialUngrounding(IssmDouble* potential_sheet_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp ¶

@@ -11200 +11200 @@
 #ifdef _HAVE_GROUNDINGLINE_
 /*FUNCTION Penta::MigrateGroundingLine{{{*/
-void  Penta::MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding){
+void  Penta::MigrateGroundingLine(IssmDouble* sheet_ungrounding){
 
         int        i,migration_style;

issm/trunk-jpl/src/c/classes/Elements/Penta.h ¶

@@ -170 +170 @@
 
                 #ifdef _HAVE_GROUNDINGLINE_
-                void   MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding);
+                void   MigrateGroundingLine(IssmDouble* sheet_ungrounding);
                 void   PotentialUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding);
                 int    UpdatePotentialUngrounding(IssmDouble* potential_sheet_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);

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

@@ -7312 +7312 @@
 #ifdef _HAVE_GROUNDINGLINE_
 /*FUNCTION Tria::MigrateGroundingLine{{{*/
-void  Tria::MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding){
+void  Tria::MigrateGroundingLine(IssmDouble* sheet_ungrounding){
 
         int        i,migration_style;

issm/trunk-jpl/src/c/classes/Elements/Tria.h ¶

@@ -174 +174 @@
                 #ifdef _HAVE_GROUNDINGLINE_
                 void   PotentialUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding);
-                void   MigrateGroundingLine(IssmDouble* oldfloating,IssmDouble* sheet_ungrounding);
+                void   MigrateGroundingLine(IssmDouble* sheet_ungrounding);
                 int    UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);
                 #endif

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

@@ -13 +13 @@
         IssmDouble         *vertices_potentially_ungrounding = NULL;
         IssmDouble         *vertices_ungrounding             = NULL;
-        IssmDouble         *old_floatingice                  = NULL;
-        Vector<IssmDouble> *vec_old_floatingice              = NULL;
         Element            *element                          = NULL;
 
@@ -42 +40 @@
         }
 
-        /*Create vector with vertices initially floating and serialize*/
-        vec_old_floatingice=CreateNodesOnFloatingIce(nodes,analysis_type);
-        old_floatingice=vec_old_floatingice->ToMPISerial();
-
         /*Migrate grounding line : */
         for(int i=0;i<elements->Size();i++){
                 element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                element->MigrateGroundingLine(old_floatingice,vertices_ungrounding);
+                element->MigrateGroundingLine(vertices_ungrounding);
         }
 
         /*free ressouces: */
-        delete vec_old_floatingice;
         xDelete<IssmDouble>(vertices_potentially_ungrounding);
         xDelete<IssmDouble>(vertices_ungrounding);
-        xDelete<IssmDouble>(old_floatingice);
 }