Changeset 5874

Timestamp:

09/17/10 16:56:31 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (2 diffs)
• Penta.h (modified) (1 diff)

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

@@ -2198 +2198 @@
                         delete Ke;
                         break;
-
                 case PattynStokesApproximationEnum:
-                        Ke=CreateKMatrixDiagnosticPattyn();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        Ke=CreateKMatrixDiagnosticStokes();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        Ke=CreateKMatrixCouplingPattynStokes();
+                        Ke=CreateKMatrixDiagnosticPattynStokes();
                         if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
                         delete Ke;
@@ -2538 +2531 @@
 }
 /*}}}*/
+/*FUNCTION Penta::CreateKMatrixDiagnosticPattynStokes{{{1*/
+ElementMatrix* Penta::CreateKMatrixDiagnosticPattynStokes(void){
+
+        /*compute all stiffness matrices for this element*/
+        ElementMatrix* Ke1=CreateKMatrixDiagnosticPattyn();
+        ElementMatrix* Ke2=CreateKMatrixDiagnosticStokes();
+        ElementMatrix* Ke3=CreateKMatrixCouplingPattynStokes();
+        ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3);
+
+        /*clean-up and return*/
+        delete Ke1;
+        delete Ke2;
+        delete Ke3;
+        return Ke;
+}
+/*}}}*/
 /*FUNCTION Penta::CreateKMatrixDiagnosticStokes{{{1*/
 ElementMatrix* Penta::CreateKMatrixDiagnosticStokes(void){

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

@@ -137 +137 @@
                 ElementMatrix* CreateKMatrixDiagnosticPattynViscous(void);
                 ElementMatrix* CreateKMatrixDiagnosticPattynFriction(void);
+                ElementMatrix* CreateKMatrixDiagnosticPattynStokes(void);
                 ElementMatrix* CreateKMatrixDiagnosticStokes(void);
                 ElementMatrix* CreateKMatrixDiagnosticStokesViscous(void);