Changeset 15752

Timestamp:

08/08/13 11:52:51 (12 years ago)

Author:

seroussi

Message:

BUG: starting to debug coupling SSA/FS shelf

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -406 +406 @@
                         int approximation;
                         inputs->GetInputValue(&approximation,ApproximationEnum);
-                        if(approximation==HOFSApproximationEnum){
+                        if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){
                                 //Do nothing condensatino already done for Stokes part
                         }
@@ -581 +581 @@
                                 int approximation;
                                 inputs->GetInputValue(&approximation,ApproximationEnum);
-                                if(approximation==HOFSApproximationEnum){
+                                if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){
                                         //Do nothing, condensation already done in PVectorCoupling
                                 }
@@ -7406 +7406 @@
 
         /*compute all stiffness matrices for this element*/
-        ElementMatrix* Ke1=CreateKMatrixDiagnosticSSA3d();
-        ElementMatrix* Ke2=CreateKMatrixDiagnosticFS();
+        ElementMatrix* Ke1=CreateKMatrixDiagnosticFS();
+        int indices[3]={18,19,20};
+        Ke1->StaticCondensation(3,&indices[0]);
+        int init = this->element_type;
+        this->element_type=P1Enum; //P1 needed for HO 
+        ElementMatrix* Ke2=CreateKMatrixDiagnosticSSA3d();
+        this->element_type=init;
         ElementMatrix* Ke3=CreateKMatrixCouplingSSAFS();
         ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3);
@@ -8427 +8432 @@
 
         /*compute all load vectors for this element*/
+        int init = this->element_type;
+        this->element_type=P1Enum;
         ElementVector* pe1=CreatePVectorDiagnosticSSA();
+        this->element_type=init;
         ElementVector* pe2=CreatePVectorDiagnosticFS();
+        int indices[3]={18,19,20};
+        this->element_type=MINIcondensedEnum;
+        ElementMatrix* Ke = CreateKMatrixDiagnosticFS();
+        this->element_type=init;
+        pe2->StaticCondensation(Ke,3,&indices[0]);
+        delete Ke;
         ElementVector* pe3=CreatePVectorCouplingSSAFS();
         ElementVector* pe =new ElementVector(pe1,pe2,pe3);