Changeset 11340

Timestamp:

02/07/12 08:02:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added Newton for MacAyeal 3d

Location:

issm/trunk-jpl/src/c/objects/Elements

Files:

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

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

@@ -7432 +7432 @@
         switch(approximation){
                 case MacAyealApproximationEnum:
-                        _error_("Not supported yet");
+                        return CreateJacobianDiagnosticMacayeal2d();
                 case PattynApproximationEnum:
                         return CreateJacobianDiagnosticPattyn();
@@ -7440 +7440 @@
                         _error_("Approximation %s not supported yet",EnumToStringx(approximation));
         }
+}
+/*}}}*/
+/*FUNCTION Penta::CreateJacobianDiagnosticMacayeal2d{{{1*/
+ElementMatrix* Penta::CreateJacobianDiagnosticMacayeal2d(void){
+
+        /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the 
+          bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build 
+          the stiffness matrix. */
+        if (!IsOnBed()) return NULL;
+
+        /*Depth Averaging B*/
+        this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
+
+        /*Call Tria function*/
+        Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria.
+        ElementMatrix* Ke=tria->CreateJacobianDiagnosticMacayeal();
+        delete tria->matice; delete tria;
+
+        /*Delete B averaged*/
+        this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
+
+        /*clean up and return*/
+        return Ke;
 }
 /*}}}*/

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

@@ -236 +236 @@
                 ElementMatrix* CreateKMatrixDiagnosticVertSurface(void);
                 ElementMatrix* CreateJacobianDiagnosticHoriz(void);
+                ElementMatrix* CreateJacobianDiagnosticMacayeal2d(void);
                 ElementMatrix* CreateJacobianDiagnosticPattyn(void);
                 ElementMatrix* CreateJacobianDiagnosticStokes(void);