Changeset 5877 for issm/trunk/src/c/objects/Elements/Tria.cpp

Timestamp:

09/17/10 17:18:54 (15 years ago)

Author:

Mathieu Morlighem

Message:

ElementMatrix in Vert

File:

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

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

@@ -3045 +3045 @@
 }
 /*}}}*/
-/*FUNCTION Tria::CreateKMatrixDiagnosticSurfaceVert {{{1*/
-void  Tria::CreateKMatrixDiagnosticSurfaceVert(Mat Kgg){
+/*FUNCTION Tria::CreateKMatrixDiagnosticVertSurface {{{1*/
+ElementMatrix* Tria::CreateKMatrixDiagnosticVertSurface(void){
 
         /*Constants*/
@@ -3059 +3059 @@
         double    L[3];
         GaussTria *gauss=NULL;
-
-        /* local element matrices: */
-        double Ke_gg[numdof][numdof]={0.0}; //local element stiffness matrix 
-        double Ke_gg_gaussian[numdof][numdof]; //stiffness matrix evaluated at the gaussian point.
-
-        /* Get node coordinates and dof list: */
+        double Ke_g[numdof][numdof]; //stiffness matrix evaluated at the gaussian point.
+
+        /*Initialize Element matrix and return if necessary*/
+        if(IsOnWater()) return NULL;
+        ElementMatrix* Ke=this->NewElementMatrix(NoneApproximationEnum);
+
+        /*Retrieve all inputs and parameters*/
         GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
-        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
         SurfaceNormal(&surface_normal[0],xyz_list);
 
@@ -3085 +3085 @@
                                         &DL_scalar,1,1,0,
                                         L,1,3,0,
-                                        &Ke_gg_gaussian[0][0],0);
-
-                for( i=0; i<numdof; i++) for(j=0;j<numdof;j++) Ke_gg[i][j]+=Ke_gg_gaussian[i][j];
-        }
-
-        MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES);
+                                        &Ke_g[0][0],0);
+
+                for(i=0;i<numdof;i++) for(j=0;j<numdof;j++) Ke->values[i*numdof+j]+=Ke_g[i][j];
+        }
 
         /*Clean up and return*/
         delete gauss;
-        xfree((void**)&doflist);
+        return Ke;
 }
 /*}}}*/