[11991] | 1 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp (revision 11685)
|
---|
| 4 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp (revision 11686)
|
---|
| 5 | @@ -31,7 +31,7 @@
|
---|
| 6 | WriteMatlabData(CONSTRAINTSOUT,constraints);
|
---|
| 7 |
|
---|
| 8 | /*Free ressources: */
|
---|
| 9 | - delete yg;
|
---|
| 10 | + xdelete(&yg);
|
---|
| 11 | delete constraints;
|
---|
| 12 | delete nodes;
|
---|
| 13 | delete parameters;
|
---|
| 14 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reduceload/Reduceload.cpp
|
---|
| 15 | ===================================================================
|
---|
| 16 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reduceload/Reduceload.cpp (revision 11685)
|
---|
| 17 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reduceload/Reduceload.cpp (revision 11686)
|
---|
| 18 | @@ -39,9 +39,9 @@
|
---|
| 19 | WriteMatlabData(PFOUT,pf);
|
---|
| 20 |
|
---|
| 21 | /*Free ressources: */
|
---|
| 22 | - delete pf;
|
---|
| 23 | - delete Kfs;
|
---|
| 24 | - delete ys;
|
---|
| 25 | + xdelete(&pf);
|
---|
| 26 | + xdelete(&Kfs);
|
---|
| 27 | + xdelete(&ys);
|
---|
| 28 |
|
---|
| 29 | MODULEEND();
|
---|
| 30 | }
|
---|
| 31 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.cpp
|
---|
| 32 | ===================================================================
|
---|
| 33 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.cpp (revision 11685)
|
---|
| 34 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateNodalConstraints/CreateNodalConstraints.cpp (revision 11686)
|
---|
| 35 | @@ -31,7 +31,7 @@
|
---|
| 36 |
|
---|
| 37 | /*Free ressources: */
|
---|
| 38 | delete nodes;
|
---|
| 39 | - delete ys;
|
---|
| 40 | + xdelete(&ys);
|
---|
| 41 |
|
---|
| 42 | /*end module: */
|
---|
| 43 | MODULEEND();
|
---|
| 44 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.cpp
|
---|
| 45 | ===================================================================
|
---|
| 46 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.cpp (revision 11685)
|
---|
| 47 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reducevectorgtof/Reducevectorgtof.cpp (revision 11686)
|
---|
| 48 | @@ -34,8 +34,8 @@
|
---|
| 49 | /*Free ressources: */
|
---|
| 50 | delete nodes;
|
---|
| 51 | delete parameters;
|
---|
| 52 | - delete ug;
|
---|
| 53 | - delete uf;
|
---|
| 54 | + xdelete(&ug);
|
---|
| 55 | + xdelete(&uf);
|
---|
| 56 |
|
---|
| 57 | /*end module: */
|
---|
| 58 | MODULEEND();
|
---|
| 59 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.cpp
|
---|
| 60 | ===================================================================
|
---|
| 61 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.cpp (revision 11685)
|
---|
| 62 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/SystemMatrices/SystemMatrices.cpp (revision 11686)
|
---|
| 63 | @@ -71,10 +71,10 @@
|
---|
| 64 | delete loads;
|
---|
| 65 | delete materials;
|
---|
| 66 | delete parameters;
|
---|
| 67 | - delete Kff;
|
---|
| 68 | - delete Kfs;
|
---|
| 69 | - delete pf;
|
---|
| 70 | - delete df;
|
---|
| 71 | + xdelete(&Kff);
|
---|
| 72 | + xdelete(&Kfs);
|
---|
| 73 | + xdelete(&pf);
|
---|
| 74 | + xdelete(&df);
|
---|
| 75 |
|
---|
| 76 | /*end module: */
|
---|
| 77 | MODULEEND();
|
---|
| 78 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp
|
---|
| 79 | ===================================================================
|
---|
| 80 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp (revision 11685)
|
---|
| 81 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp (revision 11686)
|
---|
| 82 | @@ -7,13 +7,13 @@
|
---|
| 83 | void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
|
---|
| 84 |
|
---|
| 85 | /*input datasets: */
|
---|
| 86 | - Elements* elements=NULL;
|
---|
| 87 | - Nodes* nodes=NULL;
|
---|
| 88 | - Vertices* vertices=NULL;
|
---|
| 89 | - Loads* loads=NULL;
|
---|
| 90 | - Materials* materials=NULL;
|
---|
| 91 | - Parameters* parameters=NULL;
|
---|
| 92 | - Vector* solution=NULL;
|
---|
| 93 | + Elements *elements = NULL;
|
---|
| 94 | + Nodes *nodes = NULL;
|
---|
| 95 | + Vertices *vertices = NULL;
|
---|
| 96 | + Loads *loads = NULL;
|
---|
| 97 | + Materials *materials = NULL;
|
---|
| 98 | + Parameters *parameters = NULL;
|
---|
| 99 | + Vector *solution = NULL;
|
---|
| 100 |
|
---|
| 101 | /*Boot module: */
|
---|
| 102 | MODULEBOOT();
|
---|
| 103 | @@ -49,7 +49,7 @@
|
---|
| 104 | delete loads;
|
---|
| 105 | delete materials;
|
---|
| 106 | delete parameters;
|
---|
| 107 | - delete solution;
|
---|
| 108 | + xdelete(&solution);
|
---|
| 109 |
|
---|
| 110 | /*end module: */
|
---|
| 111 | MODULEEND();
|
---|
| 112 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.cpp
|
---|
| 113 | ===================================================================
|
---|
| 114 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.cpp (revision 11685)
|
---|
| 115 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Reducevectorgtos/Reducevectorgtos.cpp (revision 11686)
|
---|
| 116 | @@ -34,8 +34,8 @@
|
---|
| 117 | /*Free ressources: */
|
---|
| 118 | delete nodes;
|
---|
| 119 | delete parameters;
|
---|
| 120 | - delete yg;
|
---|
| 121 | - delete ys;
|
---|
| 122 | + xdelete(&yg);
|
---|
| 123 | + xdelete(&ys);
|
---|
| 124 |
|
---|
| 125 | /*end module: */
|
---|
| 126 | MODULEEND();
|
---|
| 127 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp
|
---|
| 128 | ===================================================================
|
---|
| 129 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp (revision 11685)
|
---|
| 130 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp (revision 11686)
|
---|
| 131 | @@ -44,9 +44,9 @@
|
---|
| 132 | WriteMatlabData(UG,ug);
|
---|
| 133 |
|
---|
| 134 | /*Free ressources: */
|
---|
| 135 | - delete uf;
|
---|
| 136 | - delete ug;
|
---|
| 137 | - delete ys;
|
---|
| 138 | + xdelete(&uf);
|
---|
| 139 | + xdelete(&ug);
|
---|
| 140 | + xdelete(&ys);
|
---|
| 141 | delete nodes;
|
---|
| 142 | delete parameters;
|
---|
| 143 |
|
---|
| 144 | Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Solver/Solver.cpp
|
---|
| 145 | ===================================================================
|
---|
| 146 | --- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Solver/Solver.cpp (revision 11685)
|
---|
| 147 | +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Solver/Solver.cpp (revision 11686)
|
---|
| 148 | @@ -65,11 +65,11 @@
|
---|
| 149 | }
|
---|
| 150 |
|
---|
| 151 | /*Free ressources: */
|
---|
| 152 | - delete Kff;
|
---|
| 153 | - delete pf;
|
---|
| 154 | - delete uf0;
|
---|
| 155 | - delete uf;
|
---|
| 156 | - delete df;
|
---|
| 157 | + xdelete(&Kff);
|
---|
| 158 | + xdelete(&pf);
|
---|
| 159 | + xdelete(&uf0);
|
---|
| 160 | + xdelete(&uf);
|
---|
| 161 | + xdelete(&df);
|
---|
| 162 | delete parameters;
|
---|
| 163 |
|
---|
| 164 | MODULEEND();
|
---|