Changeset 16560 for issm/trunk/src/c/classes/Loads/Riftfront.h

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Loads/Riftfront.h (modified) (1 diff)

issm/trunk/src/c/classes/Loads/Riftfront.h

@@ -85 +85 @@
                 /*}}}*/
                 /*Riftfront specific routines: {{{*/
-                bool  PreStable();
                 ElementMatrix* PenaltyCreateKMatrixStressbalanceHoriz(IssmDouble kmax);
                 ElementVector* PenaltyCreatePVectorStressbalanceHoriz(IssmDouble kmax);
-                void  SetPreStable();
-                int   PreConstrain(int* punstable);
                 int   Constrain(int* punstable);
                 void  FreezeConstraints(void);
                 bool  IsFrozen(void);
-                int   Penetration(IssmDouble* ppenetration);
-                int   MaxPenetration(IssmDouble* ppenetration);
-                int   PotentialUnstableConstraint(int* punstable);
-                int   IsMaterialStable(void);
                 bool  IsInput(int name);
                 /*}}}*/
 };
-
 #endif  /* _RIFTFRONT_H_ */