Changeset 15429


Ignore:
Timestamp:
07/04/13 10:54:42 (12 years ago)
Author:
Eric.Larour
Message:

CHG: changes to optimize the ADOLC model runs

Location:
issm/trunk-jpl/src/c/classes
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r15428 r15429  
    28212821        /*Clean up and return*/
    28222822        delete gauss;
    2823         xDelete<IssmDouble>(B);
    28242823        xDelete<IssmDouble>(D);
    28252824        xDelete<IssmDouble>(Bprime);
     2825        xDelete<IssmDouble>(B);
    28262826        return Ke;
    28272827}
    … …  
    29102910        delete gauss;
    29112911        delete friction;
     2912        xDelete<IssmDouble>(D);
    29122913        xDelete<IssmDouble>(B);
    2913         xDelete<IssmDouble>(D);
    29142914        return Ke;
    29152915}
    … …  
    30013001
    30023002        /*Clean up and return*/
     3003        xDelete<IssmDouble>(basis);
    30033004        delete gauss;
    3004         xDelete<IssmDouble>(basis);
    30053005        return pe;
    30063006}
    … …  
    30383038
    30393039        /*Clean up and return*/
     3040        xDelete<IssmDouble>(basis);
    30403041        delete gauss;
    3041         xDelete<IssmDouble>(basis);
    30423042        return pe;
    30433043}
    … …  
    31553155
    31563156        /*Clean up and return*/
     3157        delete gauss;
    31573158        xDelete<IssmDouble>(dphi);
    3158         delete gauss;
    31593159        return Ke;
    31603160}
    … …  
    31973197        /*Free ressources:*/
    31983198        delete gauss;
     3199        xDelete<IssmDouble>(values);
    31993200        xDelete<int>(doflist);
    3200         xDelete<IssmDouble>(values);
    32013201}
    32023202/*}}}*/
    … …  
    33013301
    33023302        /*Free ressources:*/
     3303        xDelete<IssmDouble>(thickness);
     3304        xDelete<IssmDouble>(pressure);
     3305        xDelete<IssmDouble>(vel);
     3306        xDelete<IssmDouble>(vz);
     3307        xDelete<IssmDouble>(vy);
     3308        xDelete<IssmDouble>(vx);
     3309        xDelete<IssmDouble>(values);
    33033310        xDelete<int>(doflist);
    3304         xDelete<IssmDouble>(values);
    3305         xDelete<IssmDouble>(vx);
    3306         xDelete<IssmDouble>(vy);
    3307         xDelete<IssmDouble>(vz);
    3308         xDelete<IssmDouble>(vel);
    3309         xDelete<IssmDouble>(pressure);
    3310         xDelete<IssmDouble>(thickness);
     3311       
     3312
    33113313}
    33123314/*}}}*/
    … …  
    33723374
    33733375        /*Free ressources:*/
     3376        xDelete<IssmDouble>(thickness);
     3377        xDelete<IssmDouble>(pressure);
     3378        xDelete<IssmDouble>(vel);
     3379        xDelete<IssmDouble>(vz);
     3380        xDelete<IssmDouble>(vy);
     3381        xDelete<IssmDouble>(vx);
     3382        xDelete<IssmDouble>(values);
    33743383        xDelete<int>(doflist);
    3375         xDelete<IssmDouble>(values);
    3376         xDelete<IssmDouble>(vx);
    3377         xDelete<IssmDouble>(vy);
    3378         xDelete<IssmDouble>(vz);
    3379         xDelete<IssmDouble>(vel);
    3380         xDelete<IssmDouble>(pressure);
    3381         xDelete<IssmDouble>(thickness);
    33823384}
    33833385/*}}}*/

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r15385 r15429  
    343343                solution_memory=profiler->Memory(FinishCore);
    344344
    345                 _printf0_("Solution elapsed time    : " << solution_time   << " Seconds\n");
    346                 _printf0_("Solution number of flops : " << solution_flops  << " Flops\n");
    347                 _printf0_("Solution memory used     : " << solution_memory << " Bytes\n");
     345                _printf0_("Core solution elapsed time    : " << solution_time   << " Seconds\n");
     346                _printf0_("Core solution number of flops : " << solution_flops  << " Flops\n");
     347                _printf0_("Core solution memory used     : " << solution_memory << " Bytes\n");
    348348               
    349349                /*Add to results: */
    … …  
    673673
    674674        /*Free ressources:*/
     675        delete vz;
     676        xDelete<IssmDouble>(bed);
    675677        xDelete<IssmDouble>(thickness);
    676         xDelete<IssmDouble>(bed);
    677         delete vz;
    678678        return 1;
    679679}

  • issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp

    r15351 r15429  
    260260GaussTria::~GaussTria(){
    261261        xDelete<IssmDouble>(weights);
     262        xDelete<IssmDouble>(coords3);
     263        xDelete<IssmDouble>(coords2);
    262264        xDelete<IssmDouble>(coords1);
    263         xDelete<IssmDouble>(coords2);
    264         xDelete<IssmDouble>(coords3);
     265
    265266}
    266267/*}}}*/
Note: See TracChangeset for help on using the changeset viewer.