Changeset 5772 for issm/trunk/src/c/objects/Loads/Riftfront.cpp

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/Riftfront.cpp (modified) (7 diffs)

issm/trunk/src/c/objects/Loads/Riftfront.cpp

@@ -376 +376 @@
 /*}}}*/
 /*FUNCTION Riftfront::CreateKMatrix {{{1*/
-void  Riftfront::CreateKMatrix(Mat Kgg){
+void  Riftfront::CreateKMatrix(Mat Kgg,Mat Kff, Mat Kfs){
         /*do nothing: */
 }
 /*}}}1*/
 /*FUNCTION Riftfront::CreatePVector {{{1*/
-void  Riftfront::CreatePVector(Vec pg){
+void  Riftfront::CreatePVector(Vec pg,Vec pf){
         /*do nothing: */
 }
 /*}}}1*/
 /*FUNCTION Riftfront::PenaltyCreateKMatrix {{{1*/
-void  Riftfront::PenaltyCreateKMatrix(Mat Kgg,double kmax){
+void  Riftfront::PenaltyCreateKMatrix(Mat Kgg,Mat Kff, Mat Kfs,double kmax){
 
         int         i;
@@ -419 +419 @@
         
         /* Get node coordinates and dof list: */
-        GetDofList(&doflist);
+        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
 
         /* Set Ke_gg to 0: */
@@ -499 +499 @@
 /*}}}1*/
 /*FUNCTION Riftfront::PenaltyCreatePVector {{{1*/
-void  Riftfront::PenaltyCreatePVector(Vec pg,double kmax){
+void  Riftfront::PenaltyCreatePVector(Vec pg,Vec pf,double kmax){
 
         int         i                     ,j;
@@ -544 +544 @@
 
         /* Get node coordinates and dof list: */
-        GetDofList(&doflist);
+        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
 
         /*Get some inputs: */
@@ -731 +731 @@
 /*}}}1*/
 /*FUNCTION Riftfront::GetDofList {{{1*/
-void  Riftfront::GetDofList(int** pdoflist){
+void  Riftfront::GetDofList(int** pdoflist,int approximation,int setenum){
 
         int i,j;
@@ -751 +751 @@
         /*Figure out size of doflist: */
         for(i=0;i<MAX_RIFTFRONT_GRIDS;i++){
-                numberofdofs+=nodes[i]->GetNumberOfDofs();
+                numberofdofs+=nodes[i]->GetNumberOfDofs(approximation,setenum);
         }
 
@@ -760 +760 @@
         count=0;
         for(i=0;i<MAX_RIFTFRONT_GRIDS;i++){
-                nodes[i]->GetDofList(doflist+count);
-                count+=nodes[i]->GetNumberOfDofs();
+                nodes[i]->GetDofList(doflist+count,approximation,setenum);
+                count+=nodes[i]->GetNumberOfDofs(approximation,setenum);
         }