Changeset 7242

Timestamp:

01/29/11 22:40:22 (14 years ago)

Author:

Eric.Larour

Message:

Dealign with water elements

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (1 diff)

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

@@ -695 +695 @@
 /*FUNCTION Tria::CreateKMatrixDiagnosticMacAyeal {{{1*/
 ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyeal(void){
-        
+
+        ElementMatrix* Ke=NULL;
+
         /*compute all stiffness matrices for this element*/
         ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyealViscous();
         ElementMatrix* Ke2=CreateKMatrixDiagnosticMacAyealFriction();
-        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;