source: issm/oecreview/Archive/21724-22754/ISSM-21875-21876.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 3.4 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21875)
4+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21876)
5@@ -2679,6 +2679,7 @@
6 /*}}}*/
7 void Tria::ResetHooks(){/*{{{*/
8
9+ if(this->nodes) xDelete<Node*>(this->nodes);
10 this->nodes=NULL;
11 this->vertices=NULL;
12 this->material=NULL;
13Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
14===================================================================
15--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 21875)
16+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 21876)
17@@ -171,7 +171,7 @@
18 this->inputs->AddInput(new PentaInput(input_enum,values,interpolation_enum));
19 }
20 /*}}}*/
21-void Penta::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
22+void Penta::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
23
24 PentaRef::BasalNodeIndices(pnumindices,pindices,finiteelement);
25
26@@ -2212,6 +2212,7 @@
27 /*}}}*/
28 void Penta::ResetHooks(){/*{{{*/
29
30+ if(this->nodes) xDelete<Node*>(this->nodes);
31 this->nodes=NULL;
32 this->vertices=NULL;
33 this->material=NULL;
34Index: ../trunk-jpl/src/c/classes/Elements/Tetra.cpp
35===================================================================
36--- ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 21875)
37+++ ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 21876)
38@@ -807,6 +807,7 @@
39 /*}}}*/
40 void Tetra::ResetHooks(){/*{{{*/
41
42+ if(this->nodes) xDelete<Node*>(this->nodes);
43 this->nodes=NULL;
44 this->vertices=NULL;
45 this->material=NULL;
46Index: ../trunk-jpl/src/c/classes/Dakota/IssmParallelDirectApplicInterface.cpp
47===================================================================
48--- ../trunk-jpl/src/c/classes/Dakota/IssmParallelDirectApplicInterface.cpp (revision 21875)
49+++ ../trunk-jpl/src/c/classes/Dakota/IssmParallelDirectApplicInterface.cpp (revision 21876)
50@@ -48,7 +48,8 @@
51
52 FemModel* femmodel;
53
54- char **responses_descriptors = NULL; //these are our! there are only numresponsedescriptors of them, not d_numresponses!!!
55+ char **responses_descriptors = NULL; //these are ours! there are only numresponsedescriptors of them, not d_numresponses!!!
56+ char *response_descriptor = NULL;
57 int numresponsedescriptors;
58 int solution_type;
59 bool control_analysis = false;
60@@ -127,6 +128,11 @@
61 xDelete<char>(variable_descriptor);
62 }
63 xDelete<char*>(variable_descriptors);
64+ for(i=0;i<numFns;i++){
65+ response_descriptor=responses_descriptors[i];
66+ xDelete<char>(response_descriptor);
67+ }
68+ if(responses_descriptors) xDelete<char*>(responses_descriptors);
69 xDelete<IssmDouble>(responses);
70 delete femmodel;
71
72Index: ../trunk-jpl/src/c/main/issm_dakota.cpp
73===================================================================
74--- ../trunk-jpl/src/c/main/issm_dakota.cpp (revision 21875)
75+++ ../trunk-jpl/src/c/main/issm_dakota.cpp (revision 21876)
76@@ -83,6 +83,10 @@
77 /* Execute the environment:*/
78 env.execute();
79
80+ xDelete<char>(dakota_input_file);
81+ xDelete<char>(dakota_output_file);
82+ xDelete<char>(dakota_error_file);
83+
84 /*Return unix success: */
85 return 0;
86 #else
87@@ -89,4 +93,5 @@
88 Cout << "ISSM Dakota executable was compiled without support of Dakota! Will just return now!" << "\n";
89 return 1;
90 #endif
91+
92 }
Note: See TracBrowser for help on using the repository browser.