source: issm/oecreview/Archive/15392-16133/ISSM-15428-15429.diff@ 16134

Last change on this file since 16134 was 16134, checked in by Mathieu Morlighem, 12 years ago

Added Archive/15392-16133
File size: 4.4 KB
RevLine 
[16134]1Index: ../trunk-jpl/src/c/classes/FemModel.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/FemModel.cpp (revision 15428)
4+++ ../trunk-jpl/src/c/classes/FemModel.cpp (revision 15429)
5@@ -342,9 +342,9 @@
6 solution_flops=profiler->DeltaFlops(StartCore,FinishCore);
7 solution_memory=profiler->Memory(FinishCore);
8
9- _printf0_("Solution elapsed time : " << solution_time << " Seconds\n");
10- _printf0_("Solution number of flops : " << solution_flops << " Flops\n");
11- _printf0_("Solution memory used : " << solution_memory << " Bytes\n");
12+ _printf0_("Core solution elapsed time : " << solution_time << " Seconds\n");
13+ _printf0_("Core solution number of flops : " << solution_flops << " Flops\n");
14+ _printf0_("Core solution memory used : " << solution_memory << " Bytes\n");
15
16 /*Add to results: */
17 results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingSolutionTimeEnum, solution_time, 1, 0));
18@@ -672,9 +672,9 @@
19 InputUpdateFromVectorx(elements,nodes,vertices,loads,materials,parameters,vz,VzMeshEnum,VertexPIdEnum);
20
21 /*Free ressources:*/
22+ delete vz;
23+ xDelete<IssmDouble>(bed);
24 xDelete<IssmDouble>(thickness);
25- xDelete<IssmDouble>(bed);
26- delete vz;
27 return 1;
28 }
29 /*}}}*/
30Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
31===================================================================
32--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15428)
33+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15429)
34@@ -2820,9 +2820,9 @@
35
36 /*Clean up and return*/
37 delete gauss;
38- xDelete<IssmDouble>(B);
39 xDelete<IssmDouble>(D);
40 xDelete<IssmDouble>(Bprime);
41+ xDelete<IssmDouble>(B);
42 return Ke;
43 }
44 /*}}}*/
45@@ -2909,8 +2909,8 @@
46 /*Clean up and return*/
47 delete gauss;
48 delete friction;
49+ xDelete<IssmDouble>(D);
50 xDelete<IssmDouble>(B);
51- xDelete<IssmDouble>(D);
52 return Ke;
53 }
54 /*}}}*/
55@@ -3000,8 +3000,8 @@
56 TransformLoadVectorCoord(pe,nodes,NUMVERTICES,XYEnum);
57
58 /*Clean up and return*/
59+ xDelete<IssmDouble>(basis);
60 delete gauss;
61- xDelete<IssmDouble>(basis);
62 return pe;
63 }
64 /*}}}*/
65@@ -3037,8 +3037,8 @@
66 TransformLoadVectorCoord(pe,nodes,NUMVERTICES,XYEnum);
67
68 /*Clean up and return*/
69+ xDelete<IssmDouble>(basis);
70 delete gauss;
71- xDelete<IssmDouble>(basis);
72 return pe;
73 }
74 /*}}}*/
75@@ -3154,8 +3154,8 @@
76 TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum);
77
78 /*Clean up and return*/
79+ delete gauss;
80 xDelete<IssmDouble>(dphi);
81- delete gauss;
82 return Ke;
83 }
84 /*}}}*/
85@@ -3196,8 +3196,8 @@
86
87 /*Free ressources:*/
88 delete gauss;
89+ xDelete<IssmDouble>(values);
90 xDelete<int>(doflist);
91- xDelete<IssmDouble>(values);
92 }
93 /*}}}*/
94 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHutter{{{*/
95@@ -3300,14 +3300,16 @@
96 this->inputs->AddInput(new TriaInput(PressureEnum,pressure,P1Enum));
97
98 /*Free ressources:*/
99+ xDelete<IssmDouble>(thickness);
100+ xDelete<IssmDouble>(pressure);
101+ xDelete<IssmDouble>(vel);
102+ xDelete<IssmDouble>(vz);
103+ xDelete<IssmDouble>(vy);
104+ xDelete<IssmDouble>(vx);
105+ xDelete<IssmDouble>(values);
106 xDelete<int>(doflist);
107- xDelete<IssmDouble>(values);
108- xDelete<IssmDouble>(vx);
109- xDelete<IssmDouble>(vy);
110- xDelete<IssmDouble>(vz);
111- xDelete<IssmDouble>(vel);
112- xDelete<IssmDouble>(pressure);
113- xDelete<IssmDouble>(thickness);
114+
115+
116 }
117 /*}}}*/
118 /*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHutter {{{*/
119@@ -3371,14 +3373,14 @@
120 this->inputs->AddInput(new TriaInput(PressureEnum,pressure,P1Enum));
121
122 /*Free ressources:*/
123+ xDelete<IssmDouble>(thickness);
124+ xDelete<IssmDouble>(pressure);
125+ xDelete<IssmDouble>(vel);
126+ xDelete<IssmDouble>(vz);
127+ xDelete<IssmDouble>(vy);
128+ xDelete<IssmDouble>(vx);
129+ xDelete<IssmDouble>(values);
130 xDelete<int>(doflist);
131- xDelete<IssmDouble>(values);
132- xDelete<IssmDouble>(vx);
133- xDelete<IssmDouble>(vy);
134- xDelete<IssmDouble>(vz);
135- xDelete<IssmDouble>(vel);
136- xDelete<IssmDouble>(pressure);
137- xDelete<IssmDouble>(thickness);
138 }
139 /*}}}*/
140 #endif
141Index: ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp
142===================================================================
143--- ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 15428)
144+++ ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 15429)
145@@ -259,9 +259,10 @@
146 /*FUNCTION GaussTria::~GaussTria(){{{*/
147 GaussTria::~GaussTria(){
148 xDelete<IssmDouble>(weights);
149+ xDelete<IssmDouble>(coords3);
150+ xDelete<IssmDouble>(coords2);
151 xDelete<IssmDouble>(coords1);
152- xDelete<IssmDouble>(coords2);
153- xDelete<IssmDouble>(coords3);
154+
155 }
156 /*}}}*/
157
Note: See TracBrowser for help on using the repository browser.