Changeset 14891


Ignore:
Timestamp:
05/04/13 21:39:46 (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:
9 edited

Legend:

Unmodified
Added
Removed

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

    r14822 r14891  
    641641        xDelete<IssmDouble>(thickness);
    642642        xDelete<IssmDouble>(bed);
    643         xdelete(&vz);
     643        delete vz;
    644644        return 1;
    645645}
    … …  
    887887        /*Assign output pointers: */
    888888        if(pKff) *pKff=Kff;
    889         else      xdelete(&Kff);
     889        else      delete Kff;
    890890        if(pKfs) *pKfs=Kfs;
    891         else      xdelete(&Kfs);
     891        else      delete Kfs;
    892892        if(ppf)  *ppf=pf;
    893         else      xdelete(&pf);
     893        else      delete pf;
    894894        if(pdf)  *pdf=df;
    895         else      xdelete(&df);
     895        else      delete df;
    896896        if(pkmax) *pkmax=kmax;
    897897}

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

    r13761 r14891  
    3939/*FUNCTION MatrixParam::~MatrixParam(){{{*/
    4040MatrixParam::~MatrixParam(){
    41         xdelete(&value);
     41        delete value;
    4242}
    4343/*}}}*/
    … …  
    9898
    9999        /*avoid leak: */
    100         xdelete(&value);
     100        delete value;
    101101
    102102        /*copy: */

  • issm/trunk-jpl/src/c/solvers/solver_adjoint_linear.cpp

    r13877 r14891  
    2828        femmodel->SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL);
    2929        CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    30         Reduceloadx(pf, Kfs, ys,true); xdelete(&Kfs); //true means spc = 0
    31         Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); xdelete(&Kff); xdelete(&pf); xdelete(&df);
    32         Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters,true); xdelete(&uf);xdelete(&ys); //true means spc0
     30        Reduceloadx(pf, Kfs, ys,true); delete Kfs; //true means spc = 0
     31        Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); delete Kff; delete pf; delete df;
     32        Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters,true); delete ys; //true means spc0
    3333        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
    34         xdelete(&ug); xdelete(&uf);
     34        delete ug; delete uf;
    3535}

  • issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp

    r14769 r14891  
    4848                        femmodel->SystemMatricesx(&Kff, &Kfs, &pf,&df, &sediment_kmax);
    4949                        CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCInefficientAnalysisEnum);
    50                         Reduceloadx(pf,Kfs,ys); xdelete(&Kfs); xdelete(&uf);
     50                        Reduceloadx(pf,Kfs,ys); delete Kfs; delete uf;
    5151                        Solverx(&uf, Kff, pf,uf_old, df, femmodel->parameters);
    52                         xdelete(&uf_old); uf_old=uf->Duplicate();
    53                         xdelete(&Kff);xdelete(&pf);xdelete(&ug); xdelete(&df);
    54                         Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters); xdelete(&ys);
     52                        delete uf_old; uf_old=uf->Duplicate();
     53                        delete Kff; delete pf; delete ug; delete df;
     54                        Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters); delete ys;
    5555                        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);
    5656
    … …  
    8585                        femmodel->SystemMatricesx(&Kff, &Kfs, &pf,&df,NULL);
    8686                        CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCEfficientAnalysisEnum);
    87                         Reduceloadx(pf,Kfs,ys); xdelete(&Kfs); xdelete(&uf);
     87                        Reduceloadx(pf,Kfs,ys); delete Kfs; delete uf;
    8888                        Solverx(&uf, Kff, pf,uf_old, df, femmodel->parameters);
    89                         xdelete(&uf_old); uf_old=uf->Duplicate();
    90                         xdelete(&Kff);xdelete(&pf);xdelete(&ug); xdelete(&df);
    91                         Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters); xdelete(&ys);
     89                        delete uf_old; uf_old=uf->Duplicate();
     90                        delete Kff;delete pf; delete ug; delete df;
     91                        Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters); delete ys;
    9292                        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);
    9393
    … …  
    118118
    119119        /*Free ressources: */
    120         xdelete(&ug);
    121         xdelete(&uf);
    122         xdelete(&uf_old);
    123         xdelete(&ys);
     120        delete ug;
     121        delete uf;
     122        delete uf_old;
    124123}

  • issm/trunk-jpl/src/c/solvers/solver_linear.cpp

    r13877 r14891  
    2626        femmodel->SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL);
    2727        CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    28         Reduceloadx(pf, Kfs, ys); xdelete(&Kfs);
     28        Reduceloadx(pf, Kfs, ys); delete Kfs;
    2929        Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters);
    30         xdelete(&Kff); xdelete(&pf); xdelete(&df);
     30        delete Kff; delete pf; delete df;
    3131//#ifdef  _HAVE_ADOLC_
    3232//        for (int i =0; i<uf->svector->M; ++i) {
    … …  
    3434//        }
    3535//#endif
    36         Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);xdelete(&uf); xdelete(&ys);
     36        Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);delete uf; delete ys;
    3737        InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
    38         xdelete(&ug);  xdelete(&uf);
     38        delete ug; 
    3939}

  • issm/trunk-jpl/src/c/solvers/solver_newton.cpp

    r14416 r14891  
    5353        for(;;){
    5454
    55                 xdelete(&old_ug);old_ug=ug;
    56                 xdelete(&old_uf);old_uf=uf;
     55                delete old_ug;old_ug=ug;
     56                delete old_uf;old_uf=uf;
    5757
    5858                /*Solver forward model*/
    … …  
    6060                        femmodel->SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL);
    6161                        CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    62                         Reduceloadx(pf,Kfs,ys);xdelete(&Kfs);
    63                         Solverx(&uf,Kff,pf,old_uf,df,femmodel->parameters);xdelete(&df);
    64                         Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);xdelete(&ys);
    65                         InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);xdelete(&ug);
    66                         xdelete(&old_ug);old_ug=ug;
    67                         xdelete(&old_uf);old_uf=uf;
     62                        Reduceloadx(pf,Kfs,ys);delete Kfs;
     63                        Solverx(&uf,Kff,pf,old_uf,df,femmodel->parameters);delete df;
     64                        Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);delete ys;
     65                        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);delete ug;
     66                        delete old_ug;old_ug=ug;
     67                        delete old_uf;old_uf=uf;
    6868                }
    6969                uf=old_uf->Duplicate(); old_uf->Copy(uf);
    7070
    7171                /*Prepare next iteration using Newton's method*/
    72                 femmodel->SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL);xdelete(&df);
     72                femmodel->SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL);delete df;
    7373                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    74                 Reduceloadx(pf,Kfs,ys);xdelete(&Kfs);
     74                Reduceloadx(pf,Kfs,ys);delete Kfs;
    7575
    7676                pJf=pf->Duplicate();
    77                 Kff->MatMult(uf,pJf);// xdelete(&Kff);
    78                 pJf->Scale(-1.0); pJf->AXPY(pf,+1.0);     //xdelete(&pf);
     77                Kff->MatMult(uf,pJf);// delete Kff);
     78                pJf->Scale(-1.0); pJf->AXPY(pf,+1.0);     //delete pf);
    7979
    8080                femmodel->CreateJacobianMatrixx(&Jff,kmax);
    81                 Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); xdelete(&Jff); xdelete(&pJf);
    82                 uf->AXPY(duf, 1.0); xdelete(&duf);
    83                 Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);xdelete(&ys);
     81                Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); delete Jff; delete pJf;
     82                uf->AXPY(duf, 1.0); delete duf;
     83                Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);delete ys;
    8484                InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);
    8585
    8686                /*Check convergence*/
    8787                convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters);
    88                 xdelete(&Kff); xdelete(&pf);
     88                delete Kff; delete pf;
    8989                if(converged==true){   
    9090                        bool max_iteration_state=false;
    … …  
    109109
    110110        /*clean-up*/
    111         xdelete(&uf);
    112         xdelete(&ug);
    113         xdelete(&old_ug);
    114         xdelete(&old_uf);
     111        delete uf;
     112        delete ug;
     113        delete old_ug;
     114        delete old_uf;
    115115}

  • issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp

    r13877 r14891  
    6060
    6161                //save pointer to old velocity
    62                 xdelete(&old_ug);old_ug=ug;
    63                 xdelete(&old_uf);old_uf=uf;
     62                delete old_ug;old_ug=ug;
     63                delete old_uf;old_uf=uf;
    6464
    6565                femmodel->SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL);
    6666                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    67                 Reduceloadx(pf, Kfs, ys); xdelete(&Kfs);
     67                Reduceloadx(pf, Kfs, ys); delete Kfs;
    6868                Solverx(&uf, Kff, pf, old_uf, df, femmodel->parameters);
    69                 Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);xdelete(&ys);
     69                Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);delete ys;
    7070
    71                 convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); xdelete(&Kff); xdelete(&pf); xdelete(&df);
     71                convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); delete Kff; delete pf; delete df;
    7272                InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
    7373                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
    … …  
    113113                femmodel->loads=savedloads;
    114114        }
    115         xdelete(&uf);
    116         xdelete(&ug);
    117         xdelete(&old_ug);
    118         xdelete(&old_uf);
     115        delete uf;
     116        delete ug;
     117        delete old_ug;
     118        delete old_uf;
    119119}

  • issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp

    r13877 r14891  
    5757                //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)
    5858                InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_horiz);
    59                 xdelete(&ug_horiz);
     59                delete ug_horiz;
    6060
    6161                //save pointer to old velocity
    62                 xdelete(&old_uf_horiz); old_uf_horiz=uf_horiz;
     62                delete old_uf_horiz; old_uf_horiz=uf_horiz;
    6363
    6464                /*solve: */
    6565                femmodel->SystemMatricesx(&Kff_horiz, &Kfs_horiz, &pf_horiz, &df_horiz, NULL);
    6666                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    67                 Reduceloadx(pf_horiz, Kfs_horiz, ys); xdelete(&Kfs_horiz);
     67                Reduceloadx(pf_horiz, Kfs_horiz, ys); delete Kfs_horiz;
    6868                Solverx(&uf_horiz, Kff_horiz, pf_horiz, old_uf_horiz, df_horiz,femmodel->parameters);
    69                 Mergesolutionfromftogx(&ug_horiz, uf_horiz,ys,femmodel->nodes,femmodel->parameters); xdelete(&ys);
     69                Mergesolutionfromftogx(&ug_horiz, uf_horiz,ys,femmodel->nodes,femmodel->parameters); delete ys;
    7070                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_horiz);
    7171
    72                 convergence(&converged,Kff_horiz,pf_horiz,uf_horiz,old_uf_horiz,femmodel->parameters); xdelete(&Kff_horiz); xdelete(&pf_horiz); xdelete(&df_horiz);
     72                convergence(&converged,Kff_horiz,pf_horiz,uf_horiz,old_uf_horiz,femmodel->parameters); delete Kff_horiz; delete pf_horiz; delete df_horiz;
    7373
    7474                /*Second compute vertical velocity: */
    … …  
    7979                femmodel->SystemMatricesx(&Kff_vert, &Kfs_vert, &pf_vert,  &df_vert,NULL);
    8080                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    81                 Reduceloadx(pf_vert, Kfs_vert, ys); xdelete(&Kfs_vert);
    82                 Solverx(&uf_vert, Kff_vert, pf_vert, NULL, df_vert,femmodel->parameters); xdelete(&Kff_vert); xdelete(&pf_vert); xdelete(&df_vert);
    83                 Mergesolutionfromftogx(&ug_vert, uf_vert,ys,femmodel->nodes,femmodel->parameters);xdelete(&uf_vert); xdelete(&ys);
     81                Reduceloadx(pf_vert, Kfs_vert, ys); delete Kfs_vert;
     82                Solverx(&uf_vert, Kff_vert, pf_vert, NULL, df_vert,femmodel->parameters); delete Kff_vert; delete pf_vert; delete df_vert;
     83                Mergesolutionfromftogx(&ug_vert, uf_vert,ys,femmodel->nodes,femmodel->parameters);delete uf_vert; delete ys;
    8484                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_vert);
    85                 xdelete(&ug_vert); xdelete(&uf_vert);
     85                delete ug_vert; delete uf_vert;
    8686
    8787                /*Increase count: */
    … …  
    9595
    9696        /*clean-up*/
    97         xdelete(&old_uf_horiz);
    98         xdelete(&uf_horiz);
    99         xdelete(&ug_horiz);
    100         xdelete(&ys);
     97        delete old_uf_horiz;
     98        delete uf_horiz;
     99        delete ug_horiz;
     100        delete ys;
    101101}

  • issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp

    r14769 r14891  
    5151                femmodel->SystemMatricesx(&Kff, &Kfs, &pf,&df, &melting_offset);
    5252                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
    53                 Reduceloadx(pf, Kfs, ys); xdelete(&Kfs); xdelete(&tf);
     53                Reduceloadx(pf, Kfs, ys); delete Kfs; delete tf;
    5454                Solverx(&tf, Kff, pf,tf_old, df, femmodel->parameters);
    55                 xdelete(&tf_old); tf_old=tf->Duplicate();
    56                 xdelete(&Kff);xdelete(&pf);xdelete(&tg); xdelete(&df);
    57                 Mergesolutionfromftogx(&tg, tf,ys,femmodel->nodes,femmodel->parameters); xdelete(&ys);
     55                delete tf_old; tf_old=tf->Duplicate();
     56                delete Kff;delete pf;delete tg; delete df;
     57                Mergesolutionfromftogx(&tg, tf,ys,femmodel->nodes,femmodel->parameters); delete ys;
    5858                InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,tg);
    5959
    … …  
    7979
    8080        /*Free ressources: */
    81         xdelete(&tg);
    82         xdelete(&tf);
    83         xdelete(&tf_old);
    84         xdelete(&ys);
     81        delete tg;
     82        delete tf;
     83        delete tf_old;
    8584}
Note: See TracChangeset for help on using the changeset viewer.