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

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/objects/Loads/Riftfront.h (modified) (4 diffs)

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

@@ -25 +25 @@
                 Hook* helements;
                 Hook* hmatpar;
-                
+
                 /*Corresponding fields*/
                 Matpar   *matpar;
@@ -32 +32 @@
 
                 /*computational: */
-                int      penalty_lock;
-                bool     active;
-                bool     frozen;
-                int      counter;
-                bool     prestable;
-                bool     material_converged;
-                IssmDouble   normal[2];
-                IssmDouble   length;
-                IssmDouble   fraction;
-                int      state;
-                
-                Parameters* parameters; //pointer to solution parameters
-                Inputs*  inputs;
+                int         penalty_lock;
+                bool        active;
+                bool        frozen;
+                int         counter;
+                bool        prestable;
+                bool        material_converged;
+                IssmDouble  normal[2];
+                IssmDouble  length;
+                IssmDouble  fraction;
+                int         state;
 
+                Parameters *parameters;           //pointer to solution parameters
+                Inputs     *inputs;
 
                 /*Riftfrontconstructors,destructors: {{{*/
@@ -56 +55 @@
                 void  DeepEcho();
                 int   Id(); 
-                int   MyRank();
                 int   ObjectEnum();
                 Object* copy();
@@ -80 +78 @@
                 void  CreatePVector(Vector<IssmDouble>* pf);
                 void  CreateJacobianMatrix(Matrix<IssmDouble>* Jff){_error_("Not implemented yet");};
+                void  GetNodesSidList(int* sidlist);
+                int   GetNumberOfNodes(void);
+                bool  IsPenalty(void);
                 void  PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax){_error_("Not implemented yet");};
                 void  PenaltyCreateKMatrix(Matrix<IssmDouble>* Kff, Matrix<IssmDouble>* kfs, IssmDouble kmax);
                 void  PenaltyCreatePVector(Vector<IssmDouble>* pf, IssmDouble kmax);
+                void  SetwiseNodeConnectivity(int* d_nz,int* o_nz,Node* node,bool* flags,int set1_enum,int set2_enum);
                 bool  InAnalysis(int analysis_type);
                 /*}}}*/