Changeset 5772 for issm/trunk/src/c/objects/Loads/Numericalflux.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/Numericalflux.cpp (modified) (10 diffs)

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

@@ -328 +328 @@
 /*}}}*/
 /*FUNCTION Numericalflux::CreateKMatrix {{{1*/
-void  Numericalflux::CreateKMatrix(Mat Kgg){
+void  Numericalflux::CreateKMatrix(Mat Kgg,Mat Kff, Mat Kfs){
 
         int type;
@@ -349 +349 @@
 /*}}}*/
 /*FUNCTION Numericalflux::CreatePVector {{{1*/
-void  Numericalflux::CreatePVector(Vec pg){
+void  Numericalflux::CreatePVector(Vec pg,Vec pf){
 
         int type;
@@ -374 +374 @@
 /*}}}*/
 /*FUNCTION Numericalflux::PenaltyCreateKMatrix {{{1*/
-void  Numericalflux::PenaltyCreateKMatrix(Mat Kgg,double kmax){
+void  Numericalflux::PenaltyCreateKMatrix(Mat Kgg,Mat Kff, Mat Kfs,double kmax){
 
         /*No stiffness loads applied, do nothing: */
@@ -382 +382 @@
 /*}}}*/
 /*FUNCTION Numericalflux::PenaltyCreatePVector{{{1*/
-void  Numericalflux::PenaltyCreatePVector(Vec pg,double kmax){
+void  Numericalflux::PenaltyCreatePVector(Vec pg,Vec pf,double kmax){
 
         /*No penalty loads applied, do nothing: */
@@ -417 +417 @@
 
         GetVerticesCoordinates(&xyz_list[0][0], nodes,NUMVERTICES_INTERNAL);
-        GetDofList(&doflist);
+        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
 
         /*Retrieve all inputs and parameters we will be needing: */
@@ -523 +523 @@
         }
 
-        GetDofList(&doflist);
+        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
 
         /* Start  looping on the number of gaussian points: */
@@ -617 +617 @@
         }
 
-        GetDofList(&doflist);
+        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
 
         /* Start  looping on the number of gaussian points: */
@@ -646 +646 @@
 /*}}}*/
 /*FUNCTION Numericalflux::GetDofList {{{1*/
-void  Numericalflux::GetDofList(int** pdoflist){
+void  Numericalflux::GetDofList(int** pdoflist,int approximation,int setenum){
 
         int i,j;
@@ -671 +671 @@
         /*Figure out size of doflist: */
         for(i=0;i<numberofnodes;i++){
-                numberofdofs+=nodes[i]->GetNumberOfDofs();
+                numberofdofs+=nodes[i]->GetNumberOfDofs(approximation,setenum);
         }
 
@@ -680 +680 @@
         count=0;
         for(i=0;i<numberofnodes;i++){
-                nodes[i]->GetDofList(doflist+count);
-                count+=nodes[i]->GetNumberOfDofs();
+                nodes[i]->GetDofList(doflist+count,approximation,setenum);
+                count+=nodes[i]->GetNumberOfDofs(approximation,setenum);
         }