Changeset 11684 for issm/branches/trunk-jpl-damage/src/mex/SystemMatrices/SystemMatrices.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/mex/SystemMatrices/SystemMatrices.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/mex/SystemMatrices/SystemMatrices.cpp

@@ -17 +17 @@
         
         /* output datasets: */
-        Mat    Kff  = NULL;
-        Mat    Kfs  = NULL;
-        Vec    pf   = NULL;
-        Vec    df   = NULL;
+        Matrix*    Kff  = NULL;
+        Matrix*    Kfs  = NULL;
+        Vector*    pf   = NULL;
+        Vector*    df   = NULL;
 
         double kmax;
@@ -72 +72 @@
         delete materials;
         delete parameters;
-        MatFree(&Kff);
-        MatFree(&Kfs);
-        VecFree(&pf);
-        VecFree(&df);
+        delete Kff;
+        delete Kfs;
+        delete pf;
+        delete df;
 
         /*end module: */