Changeset 6936

Timestamp:

01/05/11 08:47:29 (14 years ago)

Author:

seroussi

Message:

macayeal3d needed in MacAyealStokes

File:

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

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

@@ -705 +705 @@
         ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
         ElementMatrix* Ke2=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
-        _error_("KMatrix coupling MacAyealStokes not terminated yet");
         ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
         delete Ke1;
@@ -712 +711 @@
         Ke2=CreateKMatrixDiagnosticStokes();
 
+        _error_("KMatrix coupling MacAyealStokes not terminated yet");
 
         /*Constants*/
@@ -1008 +1008 @@
 
         /*compute all stiffness matrices for this element*/
-        ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyeal2d();
+        ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyeal3d();
         ElementMatrix* Ke2=CreateKMatrixDiagnosticStokes();
         ElementMatrix* Ke3=CreateKMatrixCouplingMacAyealStokes();