Changeset 7323 for issm/trunk/src/c/objects/Elements/Penta.h

Timestamp:

02/03/11 18:09:00 (14 years ago)

Author:

Eric.Larour

Message:

Implemented soft version of grounding line migration. More testing needed.

File:

• issm/trunk/src/c/objects/Elements/Penta.h (modified) (3 diffs)

issm/trunk/src/c/objects/Elements/Penta.h

@@ -110 +110 @@
                 void   MaxVz(double* pmaxvz, bool process_units);
                 void   AgressiveMigration();
-                void   AgressiveShelfSync();
+                void   SoftMigration(double* sheet_ungrounding);
+                void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding);
+                void   ShelfSync();
                 void   MigrateGroundingLine();
                 void   MinVel(double* pminvel, bool process_units);
@@ -129 +131 @@
                 int    UpdateShelfStatus(Vec new_shelf_nodes);
                 void   UpdateShelfFlags(double* new_shelf_nodes);
+                int    UpdatePotentialSheetUngrounding(double* potential_sheet_ungrounding,Vec vec_nodes_on_iceshelf,double* nodes_on_iceshelf);
                 double TimeAdapt();
                 int*   GetHorizontalNeighboorSids(void);
@@ -239 +242 @@
                 bool    IsOnShelf(void); 
                 bool    IsNodeOnShelf(void); 
+                bool    IsNodeOnShelfFromFlags(double* flags);
                 bool    IsOnWater(void); 
                 double  MinEdgeLength(double xyz_list[6][3]);