Changeset 5862

Timestamp:

09/17/10 08:28:51 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added ElementMatrix for Slope and Prognostic

Location:

issm/trunk/src/c/objects/Elements

Files:

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

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

@@ -708 +708 @@
                         break;
                 case BedSlopeXAnalysisEnum: case SurfaceSlopeXAnalysisEnum: case BedSlopeYAnalysisEnum: case SurfaceSlopeYAnalysisEnum:
-                        CreateKMatrixSlope( Kgg);
+                        Ke=CreateKMatrixSlope();
+                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
+                        delete Ke;
                         break;
                 case PrognosticAnalysisEnum:
-                        CreateKMatrixPrognostic( Kgg);
+                        Ke=CreateKMatrixPrognostic();
+                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
+                        delete Ke;
                         break;
                 case BalancedthicknessAnalysisEnum:
@@ -2831 +2835 @@
 /*}}}*/
 /*FUNCTION Penta::CreateKMatrixPrognostic {{{1*/
-void  Penta::CreateKMatrixPrognostic(Mat Kgg){
-
-        /*Collapsed formulation: */
-        Tria*  tria=NULL;
-
-        /*If on water, skip: */
-        if(IsOnWater())return;
-
-        /*Is this element on the bed? :*/
-        if(!IsOnBed())return;
+ElementMatrix* Penta::CreateKMatrixPrognostic(void){
+
+        if (!IsOnBed() || IsOnWater()) return NULL;
 
         /*Depth Averaging Vx and Vy*/
@@ -2846 +2843 @@
         this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
 
-        /*Spawn Tria element from the base of the Penta: */
-        tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
-        tria->CreateKMatrix(Kgg,NULL,NULL);
+        Tria* tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
+        ElementMatrix* Ke=tria->CreateKMatrixPrognostic();
         delete tria->matice; delete tria;
 
@@ -2855 +2851 @@
         this->inputs->DeleteInput(VyAverageEnum);
 
-        return;
-
+        /*clean up and return*/
+        return Ke;
 }
 /*}}}*/
 /*FUNCTION Penta::CreateKMatrixSlope {{{1*/
-void  Penta::CreateKMatrixSlope(Mat Kgg){
-
-        /*Collapsed formulation: */
-        Tria*  tria=NULL;
-
-        /*If on water, skip: */
-        if(IsOnWater())return;
-
-        /*Is this element on the bed? :*/
-        if(!IsOnBed())return;
-
-        /*Spawn Tria element from the base of the Penta: */
-        tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
-        tria->CreateKMatrix(Kgg,NULL,NULL);
+ElementMatrix* Penta::CreateKMatrixSlope(void){
+
+        if (!IsOnBed() || IsOnWater()) return NULL;
+
+        Tria* tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
+        ElementMatrix* Ke=tria->CreateKMatrixSlope();
         delete tria->matice; delete tria;
-        return;
-
+
+        /*clean up and return*/
+        return Ke;
 }
 /*}}}*/

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

@@ -141 +141 @@
                 void      CreateKMatrixDiagnosticVert( Mat Kgg);
                 ElementMatrix* CreateKMatrixMelting(void);
-                void      CreateKMatrixPrognostic(Mat Kggg);
-                void      CreateKMatrixSlope(Mat Kggg);
+                ElementMatrix* CreateKMatrixPrognostic(void);
+                ElementMatrix* CreateKMatrixSlope(void);
                 void      CreateKMatrixThermal(Mat Kggg);
                 void      CreatePVectorBalancedthickness( Vec pg);