Changeset 7367

Timestamp:

02/07/11 08:31:58 (14 years ago)

Author:

Eric.Larour

Message:

Covering the case of water elements

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (2 diffs)

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

@@ -1243 +1243 @@
 /*FUNCTION Penta::CreateKMatrixDiagnosticPattyn{{{1*/
 ElementMatrix* Penta::CreateKMatrixDiagnosticPattyn(void){
+        
+        ElementMatrix* Ke =NULL;
 
         /*compute all stiffness matrices for this element*/
         ElementMatrix* Ke1=CreateKMatrixDiagnosticPattynViscous();
         ElementMatrix* Ke2=CreateKMatrixDiagnosticPattynFriction();
-        ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2);
-
-        /*clean-up and return*/
-        delete Ke1;
-        delete Ke2;
+
+        if(Ke1 || Ke2){
+                 Ke=new ElementMatrix(Ke1,Ke2);
+
+                /*clean-up and return*/
+                delete Ke1;
+                delete Ke2;
+        }
         return Ke;
+
 }
 /*}}}*/
@@ -1516 +1522 @@
 /*FUNCTION Penta::CreateKMatrixDiagnosticVert {{{1*/
 ElementMatrix* Penta::CreateKMatrixDiagnosticVert(void){
+        
+        ElementMatrix* Ke =NULL;
 
         /*compute all stiffness matrices for this element*/
         ElementMatrix* Ke1=CreateKMatrixDiagnosticVertVolume();
         ElementMatrix* Ke2=CreateKMatrixDiagnosticVertSurface();
-        ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2);
-
-        /*clean-up and return*/
-        delete Ke1;
-        delete Ke2;
+        
+        if(Ke1 || Ke2){
+                 Ke=new ElementMatrix(Ke1,Ke2);
+
+                /*clean-up and return*/
+                delete Ke1;
+                delete Ke2;
+        }
         return Ke;
+
 }
 /*}}}*/