Changeset 14893 for issm/trunk-jpl/src


Ignore:
Timestamp:
05/04/13 21:50:12 (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/solutions
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/solutions/controltao_core.cpp

    r14785 r14893  
    7474        TaoSetInitialVector(tao,X->pvector->vector);
    7575        TaoSetVariableBounds(tao,XL->pvector->vector,XU->pvector->vector);
    76         xdelete(&XL);
    77         xdelete(&XU);
     76        delete XL;
     77        delete XU;
    7878
    7979        user.J=xNewZeroInit<double>(maxiter+5);
    … …  
    102102        xDelete<int>(control_list);
    103103        xDelete<double>(user.J);
    104         xdelete(&X);
     104        delete X;
    105105        TaoDestroy(&tao);
    106106        TaoFinalize();
    … …  
    123123        //VecView(X,PETSC_VIEWER_STDOUT_WORLD);
    124124        SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X);
    125         xdelete(&X);
     125        delete X;
    126126
    127127        /*Recover some parameters*/
    … …  
    148148        /*Compute gradient*/
    149149        Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    150         VecCopy(gradient->pvector->vector,G); xdelete(&gradient);
     150        VecCopy(gradient->pvector->vector,G); delete gradient;
    151151        VecScale(G,-1.);
    152152

  • issm/trunk-jpl/src/c/solutions/convergence.cpp

    r14822 r14893  
    6060
    6161                //clean up
    62                 xdelete(&KU);
    63                 xdelete(&KUF);
     62                delete KU;
     63                delete KUF;
    6464        }
    6565
    … …  
    7979
    8080        //clean up
    81         xdelete(&KUold);
    82         xdelete(&KUoldF);
     81        delete KUold;
     82        delete KUoldF;
    8383
    8484        //print
    … …  
    102102
    103103                //clean up
    104                 xdelete(&duf);
     104                delete duf;
    105105
    106106                //print
    … …  
    127127
    128128                //clean up
    129                 xdelete(&duf);
     129                delete duf;
    130130
    131131                //print

  • issm/trunk-jpl/src/c/solutions/gradient_core.cpp

    r13216 r14893  
    2929                if(VerboseControl()) _pprintLine_("   orthogonalization");
    3030                ControlInputGetGradientx(&old_gradient,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters);
    31                 Orthx(&new_gradient,gradient,old_gradient); xdelete(&old_gradient); xdelete(&gradient);
     31                Orthx(&new_gradient,gradient,old_gradient); delete old_gradient; delete gradient;
    3232        }
    3333        else{
    … …  
    4242        /*plug back into inputs: */
    4343        ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,new_gradient);
    44         xdelete(&new_gradient);
     44        delete new_gradient;
    4545
    4646        /*Scale Gradients*/
Note: See TracChangeset for help on using the changeset viewer.