Changeset 14892


Ignore:
Timestamp:
05/04/13 21:48:17 (12 years ago)
Author:
Eric.Larour
Message:

CHG: replacing xdelete with delete. Gradual change. Nightlys seem to accomodate this change

Location:
issm/trunk-jpl/src/c
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Container/Elements.cpp

    r14761 r14892  
    260260
    261261                        /*clean up*/
    262                         xdelete(&vector);
     262                        delete vector;
    263263                        xDelete<IssmDouble>(vector_serial);
    264264                }

  • issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp

    r13761 r14892  
    4141/*FUNCTION VectorParam::~VectorParam(){{{*/
    4242VectorParam::~VectorParam(){
    43         xdelete(&value);
     43        delete value;
    4444}
    4545/*}}}*/
    … …  
    101101
    102102        /*avoid leak: */
    103         xdelete(&value);
     103        delete value;
    104104
    105105        /*copy: */

  • issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp

    r13798 r14892  
    6363        /*Free ressources:*/
    6464        xDelete<double>(qmu_part);
    65         xdelete(&partition_contributions);
    66         xdelete(&partition_areas);
    67         xdelete(&vec_average);
     65        delete partition_contributions;
     66        delete partition_areas;
     67        delete vec_average;
    6868
    6969        /*Assign output pointers:*/

  • issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp

    r13622 r14892  
    4848
    4949        /*Free ressources:*/
    50         xdelete(&vec_vector);
     50        delete vec_vector;
    5151
    5252        /*Assign output pointers:*/

  • issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp

    r13798 r14892  
    5353
    5454        /*Free ressources:*/
    55         xdelete(&vec_vector);
     55        delete vec_vector;
    5656
    5757        /*Assign output pointers:*/

  • issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp

    r13622 r14892  
    4949        for(i=0;i<num_controls;i++){
    5050                gradient->AXPY(gradient_list[i],1.0);
    51                 xdelete(&gradient_list[i]);
     51                delete gradient_list[i];
    5252        }
    5353

  • issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

    r14687 r14892  
    5656
    5757        /*free ressouces: */
    58         xdelete(&vec_old_floatingice);
     58        delete vec_old_floatingice;
    5959        xDelete<IssmDouble>(vertices_potentially_ungrounding);
    6060        xDelete<IssmDouble>(vertices_ungrounding);
    … …  
    112112
    113113        /*free ressouces and return: */
    114         xdelete(&vec_vertices_potentially_ungrounding);
     114        delete vec_vertices_potentially_ungrounding;
    115115        return vertices_potentially_ungrounding;
    116116}
    … …  
    175175
    176176                /*Assemble and serialize:*/
    177                 xdelete(&vec_elements_neighboring_floatingice);
     177                delete vec_elements_neighboring_floatingice;
    178178                nodes_on_floatingice=vec_nodes_on_floatingice->ToMPISerial();
    179179        }
    180180
    181181        /*Free ressources:*/
    182         xdelete(&vec_nodes_on_floatingice);
     182        delete vec_nodes_on_floatingice;
    183183        xDelete<IssmDouble>(elements_neighboring_floatingce);
    184184

  • issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp

    r13941 r14892  
    5454
    5555        /*Free ressources and return*/
    56         xdelete(&y_s0);
    57         xdelete(&Kfsy_s);
     56        delete y_s0;
     57        delete Kfsy_s;
    5858
    5959}
Note: See TracChangeset for help on using the changeset viewer.