source: issm/oecreview/Archive/12678-13393/ISSM-12851-12852.diff@ 13980

Last change on this file since 13980 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 1.1 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp (revision 12851)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp (revision 12852)
5@@ -21,11 +21,9 @@
6 if (pv && *pv){
7 /*Actually, still get rid of internal Petsc matrix. Quick fix until Matlab handles C++
8 * correctly: */
9- /*Keeping this for legacy reasons: */
10- /*#ifdef _HAVE_PETSC_
11- MatFree(&(*pv)->matrix);
12- #endif*/
13- delete *pv;
14+ #ifdef _HAVE_PETSC_
15+ MatFree(&(*pv)->pmatrix->matrix);
16+ #endif
17 *pv=NULL;
18 }
19 }
20@@ -35,11 +33,9 @@
21 if (pv && *pv){
22 /*Actually, still get rid of internal Petsc vector. Quick fix until Matlab handles C++
23 * correctly: */
24- /*Keeping this for legacy reasons: shoudl be done by the vector itself!*/
25- /*#ifdef _HAVE_PETSC_
26- VecFree(&(*pv)->vector);
27- #endif*/
28- delete *pv;
29+ #ifdef _HAVE_PETSC_
30+ VecFree(&(*pv)->pvector->vector);
31+ #endif
32 *pv=NULL;
33 }
34 }
Note: See TracBrowser for help on using the repository browser.