Changeset 5772 for issm/trunk/src/c/objects/Loads/Pengrid.h

Timestamp:

09/13/10 13:18:07 (15 years ago)

Author:

Eric.Larour

Message:

New solution strategy, based on creation of Kff, Kfs directly,
instead of Kgg. Idem for pf instead of pg.
Kept backwards compatibility for now, and only applied to macayeal diagnostic
in 2d. Will switch to this new strategy in the near future.

File:

• issm/trunk/src/c/objects/Loads/Pengrid.h (modified) (1 diff)

issm/trunk/src/c/objects/Loads/Pengrid.h

@@ -71 +71 @@
                 void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
                 void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
-                void  CreateKMatrix(Mat Kgg);
-                void  CreatePVector(Vec pg);
-                void  PenaltyCreateKMatrix(Mat Kgg,double kmax);
-                void  PenaltyCreatePVector(Vec pg,double kmax);
+                void  CreateKMatrix(Mat Kgg, Mat Kff, Mat Kfs);
+                void  CreatePVector(Vec pg, Vec pf);
+                void  PenaltyCreateKMatrix(Mat Kgg,Mat Kff, Mat kfs, double kmax);
+                void  PenaltyCreatePVector(Vec pg,Vec pf, double kmax);
                 bool  InAnalysis(int analysis_type);
                 /*}}}*/
                 /*Pengrid management {{{1*/
                 void  PenaltyCreateKMatrixDiagnosticStokes(Mat Kgg,double kmax);
-                void  GetDofList(int** pdoflist);
+                void  GetDofList(int** pdoflist,int approximation_enum,int setenum);
                 void  PenaltyCreateKMatrixThermal(Mat Kgg,double kmax);
                 void  PenaltyCreateKMatrixMelting(Mat Kgg,double kmax);