Index: ../trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- ../trunk-jpl/src/c/classes/FemModel.cpp (revision 15428) +++ ../trunk-jpl/src/c/classes/FemModel.cpp (revision 15429) @@ -342,9 +342,9 @@ solution_flops=profiler->DeltaFlops(StartCore,FinishCore); solution_memory=profiler->Memory(FinishCore); - _printf0_("Solution elapsed time : " << solution_time << " Seconds\n"); - _printf0_("Solution number of flops : " << solution_flops << " Flops\n"); - _printf0_("Solution memory used : " << solution_memory << " Bytes\n"); + _printf0_("Core solution elapsed time : " << solution_time << " Seconds\n"); + _printf0_("Core solution number of flops : " << solution_flops << " Flops\n"); + _printf0_("Core solution memory used : " << solution_memory << " Bytes\n"); /*Add to results: */ results->AddObject(new GenericExternalResult(results->Size()+1, ProfilingSolutionTimeEnum, solution_time, 1, 0)); @@ -672,9 +672,9 @@ InputUpdateFromVectorx(elements,nodes,vertices,loads,materials,parameters,vz,VzMeshEnum,VertexPIdEnum); /*Free ressources:*/ + delete vz; + xDelete(bed); xDelete(thickness); - xDelete(bed); - delete vz; return 1; } /*}}}*/ Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15428) +++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15429) @@ -2820,9 +2820,9 @@ /*Clean up and return*/ delete gauss; - xDelete(B); xDelete(D); xDelete(Bprime); + xDelete(B); return Ke; } /*}}}*/ @@ -2909,8 +2909,8 @@ /*Clean up and return*/ delete gauss; delete friction; + xDelete(D); xDelete(B); - xDelete(D); return Ke; } /*}}}*/ @@ -3000,8 +3000,8 @@ TransformLoadVectorCoord(pe,nodes,NUMVERTICES,XYEnum); /*Clean up and return*/ + xDelete(basis); delete gauss; - xDelete(basis); return pe; } /*}}}*/ @@ -3037,8 +3037,8 @@ TransformLoadVectorCoord(pe,nodes,NUMVERTICES,XYEnum); /*Clean up and return*/ + xDelete(basis); delete gauss; - xDelete(basis); return pe; } /*}}}*/ @@ -3154,8 +3154,8 @@ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); /*Clean up and return*/ + delete gauss; xDelete(dphi); - delete gauss; return Ke; } /*}}}*/ @@ -3196,8 +3196,8 @@ /*Free ressources:*/ delete gauss; + xDelete(values); xDelete(doflist); - xDelete(values); } /*}}}*/ /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHutter{{{*/ @@ -3300,14 +3300,16 @@ this->inputs->AddInput(new TriaInput(PressureEnum,pressure,P1Enum)); /*Free ressources:*/ + xDelete(thickness); + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(values); xDelete(doflist); - xDelete(values); - xDelete(vx); - xDelete(vy); - xDelete(vz); - xDelete(vel); - xDelete(pressure); - xDelete(thickness); + + } /*}}}*/ /*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHutter {{{*/ @@ -3371,14 +3373,14 @@ this->inputs->AddInput(new TriaInput(PressureEnum,pressure,P1Enum)); /*Free ressources:*/ + xDelete(thickness); + xDelete(pressure); + xDelete(vel); + xDelete(vz); + xDelete(vy); + xDelete(vx); + xDelete(values); xDelete(doflist); - xDelete(values); - xDelete(vx); - xDelete(vy); - xDelete(vz); - xDelete(vel); - xDelete(pressure); - xDelete(thickness); } /*}}}*/ #endif Index: ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp =================================================================== --- ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 15428) +++ ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 15429) @@ -259,9 +259,10 @@ /*FUNCTION GaussTria::~GaussTria(){{{*/ GaussTria::~GaussTria(){ xDelete(weights); + xDelete(coords3); + xDelete(coords2); xDelete(coords1); - xDelete(coords2); - xDelete(coords3); + } /*}}}*/