Changeset 11684 for issm/branches/trunk-jpl-damage/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp

Timestamp:

03/12/12 14:40:42 (13 years ago)

Author:

cborstad

Message:

merged revisions 11428:11680 from trunk-jpl into branches/trunk-jpl-damage

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (modified) (4 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void CreateJacobianMatrixx(Mat* pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,double kmax){
+void CreateJacobianMatrixx(Matrix** pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,double kmax){
         
         int      i,connectivity;
@@ -17 +17 @@
         Element *element = NULL;
         Load    *load    = NULL;
-        Mat      Jff     = NULL;
+        Matrix*  Jff     = NULL;
 
         /*Checks*/
@@ -29 +29 @@
 
         /*Initialize Jacobian Matrix*/
-        Jff=NewMat(fsize,fsize,connectivity,numberofdofspernode);
+        Jff=new Matrix(fsize,fsize,connectivity,numberofdofspernode);
         
         /*Create and assemble matrix*/
@@ -41 +41 @@
                 if(load->InAnalysis(configuration_type)) load->PenaltyCreateJacobianMatrix(Jff,kmax);
         }
-        MatAssemblyBegin(Jff,MAT_FINAL_ASSEMBLY);
-        MatAssemblyEnd(Jff,MAT_FINAL_ASSEMBLY);
+        Jff->Assemble();
 
         /*Assign output pointer*/