Changeset 5873 for issm/trunk

Timestamp:

09/17/10 16:50:44 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added CreateKMatrixDiagnosticMacAyealPattyn

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (2 diffs)
• Elements/Penta.h (modified) (1 diff)
• Numerics/ElementMatrix.cpp (modified) (1 diff)
• Numerics/ElementMatrix.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -2194 +2194 @@
                         break;
                 case MacAyealPattynApproximationEnum:
-                        Ke=CreateKMatrixDiagnosticMacAyeal3d();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        Ke=CreateKMatrixDiagnosticPattyn();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        Ke=CreateKMatrixCouplingMacAyealPattyn();
+                        Ke=CreateKMatrixDiagnosticMacAyealPattyn();
                         if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
                         delete Ke;
                         break;
+
                 case PattynStokesApproximationEnum:
                         Ke=CreateKMatrixDiagnosticPattyn();
@@ -2416 +2411 @@
 
         /*clean-up and return*/
+        return Ke;
+}
+/*}}}*/
+/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealPattyn{{{1*/
+ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyealPattyn(void){
+
+        /*compute all stiffness matrices for this element*/
+        ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyeal3d();
+        ElementMatrix* Ke2=CreateKMatrixDiagnosticPattyn();
+        ElementMatrix* Ke3=CreateKMatrixCouplingMacAyealPattyn();
+        ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3);
+
+        /*clean-up and return*/
+        delete Ke1;
+        delete Ke2;
+        delete Ke3;
         return Ke;
 }

issm/trunk/src/c/objects/Elements/Penta.h

@@ -133 +133 @@
                 ElementMatrix* CreateKMatrixDiagnosticMacAyeal3dViscous(void);
                 ElementMatrix* CreateKMatrixDiagnosticMacAyeal3dFriction(void);
+                ElementMatrix* CreateKMatrixDiagnosticMacAyealPattyn(void);
                 ElementMatrix* CreateKMatrixDiagnosticPattyn(void);
                 ElementMatrix* CreateKMatrixDiagnosticPattynViscous(void);

issm/trunk/src/c/objects/Numerics/ElementMatrix.cpp

@@ -171 +171 @@
         /*clean-up*/
         xfree((void**)&P);
+}
+/*}}}*/
+/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){{{1*/
+ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){
+
+        /*Concatenate all matrices*/
+        ElementMatrix* Ke12 =new ElementMatrix(Ke1,Ke2);
+        ElementMatrix* Ke123=new ElementMatrix(Ke12,Ke3);
+
+        /*Initialize current object with this matrix*/
+        this->Init(Ke123);
+
+        /*clean-up*/
+        delete Ke12;
+        delete Ke123;
 }
 /*}}}*/

issm/trunk/src/c/objects/Numerics/ElementMatrix.h

@@ -51 +51 @@
                 ElementMatrix();
                 ElementMatrix(ElementMatrix* Ke1,ElementMatrix* Ke2);
+                ElementMatrix(ElementMatrix* Ke1,ElementMatrix* Ke2,ElementMatrix* Ke3);
                 ElementMatrix(bool square,int* gglobaldoflist,int gsize);
                 ElementMatrix(bool square,int* gglobaldoflist,int gsize,int* flocaldoflist,int* fglobaldoflist,int fsize,int* slocaldoflist,int* sglobaldoflist,int ssize);