Changeset 12439


Ignore:
Timestamp:
06/18/12 08:38:12 (13 years ago)
Author:
Mathieu Morlighem
Message:

changing xmalloc to xNew and xfree to xDelete

Location:
issm/trunk-jpl/src/c/solutions
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp

    r11590 r12439  
    2929                case DiagnosticSolutionEnum:
    3030                        numanalyses=5;
    31                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     31                        analyses=xNew<int>(numanalyses);
    3232                        analyses[0]=DiagnosticHorizAnalysisEnum;
    3333                        analyses[1]=DiagnosticVertAnalysisEnum;
     
    3939                case SteadystateSolutionEnum:
    4040                        numanalyses=8;
    41                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     41                        analyses=xNew<int>(numanalyses);
    4242                        analyses[0]=DiagnosticHorizAnalysisEnum;
    4343                        analyses[1]=DiagnosticVertAnalysisEnum;
     
    5252                case ThermalSolutionEnum:
    5353                        numanalyses=2;
    54                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     54                        analyses=xNew<int>(numanalyses);
    5555                        analyses[0]=ThermalAnalysisEnum;
    5656                        analyses[1]=MeltingAnalysisEnum;
     
    5959                case EnthalpySolutionEnum:
    6060                        numanalyses=1;
    61                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     61                        analyses=xNew<int>(numanalyses);
    6262                        analyses[0]=EnthalpyAnalysisEnum;
    6363                        break;
     
    6565                case HydrologySolutionEnum:
    6666                        numanalyses=3;
    67                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     67                        analyses=xNew<int>(numanalyses);
    6868                        analyses[0]=HydrologyAnalysisEnum;
    6969                        analyses[1]=SurfaceSlopeAnalysisEnum;
     
    7373                case PrognosticSolutionEnum:
    7474                        numanalyses=1;
    75                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     75                        analyses=xNew<int>(numanalyses);
    7676                        analyses[0]=PrognosticAnalysisEnum;
    7777                        break;
     
    7979                case BalancethicknessSolutionEnum:
    8080                        numanalyses=1;
    81                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     81                        analyses=xNew<int>(numanalyses);
    8282                        analyses[0]=BalancethicknessAnalysisEnum;
    8383                        break;
     
    8585                case SurfaceSlopeSolutionEnum:
    8686                        numanalyses=1;
    87                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     87                        analyses=xNew<int>(numanalyses);
    8888                        analyses[0]=SurfaceSlopeAnalysisEnum;
    8989                        break;
     
    9191                case BedSlopeSolutionEnum:
    9292                        numanalyses=1;
    93                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     93                        analyses=xNew<int>(numanalyses);
    9494                        analyses[0]=BedSlopeAnalysisEnum;
    9595                        break;
     
    9797                case TransientSolutionEnum:
    9898                        numanalyses=9;
    99                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
     99                        analyses=xNew<int>(numanalyses);
    100100                        analyses[0]=DiagnosticHorizAnalysisEnum;
    101101                        analyses[1]=DiagnosticVertAnalysisEnum;
     
    117117        if(pnumanalyses) *pnumanalyses=numanalyses;
    118118        if(panalyses)    *panalyses=analyses;
    119         else              xfree((void**)&analyses);
     119        else              xDelete<int>(analyses);
    120120}
  • issm/trunk-jpl/src/c/solutions/ProcessArguments.cpp

    r12319 r12439  
    2121        if(argc<3)_error_("Usage error: missing model name");
    2222        modelname=argv[3];
    23         binfilename    = (char*)xmalloc((strlen(modelname)+strlen(".bin")   +1)*sizeof(char)); sprintf(binfilename,   "%s%s",modelname,".bin");
    24         outbinfilename = (char*)xmalloc((strlen(modelname)+strlen(".outbin")+1)*sizeof(char)); sprintf(outbinfilename,"%s%s",modelname,".outbin");
    25         petscfilename  = (char*)xmalloc((strlen(modelname)+strlen(".petsc") +1)*sizeof(char)); sprintf(petscfilename, "%s%s",modelname,".petsc");
    26         lockfilename   = (char*)xmalloc((strlen(modelname)+strlen(".lock")  +1)*sizeof(char)); sprintf(lockfilename,  "%s%s",modelname,".lock");
     23        binfilename    = xNew<char>(strlen(modelname)+strlen(".bin")   +1); sprintf(binfilename,   "%s%s",modelname,".bin");
     24        outbinfilename = xNew<char>(strlen(modelname)+strlen(".outbin")+1); sprintf(outbinfilename,"%s%s",modelname,".outbin");
     25        petscfilename  = xNew<char>(strlen(modelname)+strlen(".petsc") +1); sprintf(petscfilename, "%s%s",modelname,".petsc");
     26        lockfilename   = xNew<char>(strlen(modelname)+strlen(".lock")  +1); sprintf(lockfilename,  "%s%s",modelname,".lock");
    2727
    2828        /*Clean up and assign output pointer*/
  • issm/trunk-jpl/src/c/solutions/control_core.cpp

    r11827 r12439  
    7070
    7171        /*Initialize responses: */
    72         J=(double*)xmalloc(nsteps*sizeof(double));
    73         step_responses=(int*)xmalloc(num_responses*sizeof(int));
     72        J=xNew<double>(nsteps);
     73        step_responses=xNew<int>(num_responses);
    7474               
    7575        /*Initialize some of the BrentSearch arguments: */
     
    120120        cleanup_and_return:
    121121        /*Free ressources: */
    122         xfree((void**)&control_type);
    123         xfree((void**)&responses);
    124         xfree((void**)&step_responses);
    125         xfree((void**)&maxiter);
    126         xfree((void**)&cm_jump);
    127         xfree((void**)&J);
     122        xDelete<int>(control_type);
     123        xDelete<int>(step_responses);
     124        xDelete<double>(maxiter);
     125        xDelete<double>(responses);
     126        xDelete<double>(cm_jump);
     127        xDelete<double>(J);
    128128}
  • issm/trunk-jpl/src/c/solutions/controlrestart.cpp

    r11827 r12439  
    3333
    3434        /*Clean up and return*/
    35         xfree((void**)&control_type);
     35        xDelete<int>(control_type);
    3636}
  • issm/trunk-jpl/src/c/solutions/controltao_core.cpp

    r11827 r12439  
    5050        femmodel->parameters->FindParam(&dummy,NULL,NULL,InversionMaxiterPerStepEnum);
    5151        femmodel->parameters->SetParam(false,SaveResultsEnum);
    52         maxiter=nsteps*(int)dummy[0]; xfree((void**)&dummy);
     52        maxiter=nsteps*(int)dummy[0]; xDelete<double>(dummy);
    5353
    5454        /*Initialize TAO*/
     
    9595
    9696        /*Clean up and return*/
    97         xfree((void**)&control_list);
     97        xDelete<int>(control_list);
    9898        xdelete(&X);
    9999        TaoDestroy(&tao);
     
    125125
    126126        /*Prepare objective function*/
    127         cost_functions=(int*)xmalloc(num_cost_functions*sizeof(int));
     127        cost_functions=xNew<int>(num_cost_functions);
    128128        for(int i=0;i<num_cost_functions;i++) cost_functions[i]=(int)cost_functionsd[i]; //FIXME
    129129        femmodel->parameters->SetParam(cost_functions,1,num_cost_functions,StepResponsesEnum);
     
    146146
    147147        /*Clean-up and return*/
    148         xfree((void**)&cost_functions);
    149         xfree((void**)&cost_functionsd);
     148        xDelete<int>(cost_functions);
     149        xDelete<double>(cost_functionsd);
    150150        return 0;
    151151}
     
    175175
    176176        /*Clean-up and return*/
    177         xfree((void**)&responses);
     177        xDelete<int>(responses);
    178178        return 0;
    179179}
  • issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp

    r11827 r12439  
    105105
    106106        /*Free ressources:*/
    107         xfree((void**)&requested_outputs);
     107        xDelete<int>(requested_outputs);
    108108}
  • issm/trunk-jpl/src/c/solutions/gradient_core.cpp

    r11695 r12439  
    4848
    4949        /*Clean up and return*/
    50         xfree((void**)&norm_list);
     50        xDelete<double>(norm_list);
    5151}
  • issm/trunk-jpl/src/c/solutions/issm.cpp

    r12102 r12439  
    144144
    145145        /*Free ressources */
    146         xfree((void**)&analyses);
    147         xfree((void**)&lockfilename);
    148         xfree((void**)&binfilename);
    149         xfree((void**)&outbinfilename);
    150         xfree((void**)&petscfilename);
     146        xDelete<int>(analyses);
     147        xDelete<char>(lockfilename);
     148        xDelete<char>(binfilename);
     149        xDelete<char>(outbinfilename);
     150        xDelete<char>(petscfilename);
    151151        delete femmodel;
    152152
  • issm/trunk-jpl/src/c/solutions/kriging.cpp

    r12382 r12439  
    8686
    8787        /*Free ressources */
    88         xfree((void**)&lockfilename);
    89         xfree((void**)&binfilename);
    90         xfree((void**)&outbinfilename);
    91         xfree((void**)&x);
    92         xfree((void**)&y);
    93         xfree((void**)&data);
    94         xfree((void**)&x_interp);
    95         xfree((void**)&y_interp);
    96         xfree((void**)&predictions);
    97         xfree((void**)&error);
     88        xDelete<char>(lockfilename);
     89        xDelete<char>(binfilename);
     90        xDelete<char>(outbinfilename);
     91        xDelete<double>(x);
     92        xDelete<double>(y);
     93        xDelete<double>(data);
     94        xDelete<double>(x_interp);
     95        xDelete<double>(y_interp);
     96        xDelete<double>(predictions);
     97        xDelete<double>(error);
    9898        delete options;
    9999        delete results;
     
    124124        if(argc<2)_error_("Usage error: missing model name");
    125125        modelname=argv[2];
    126         binfilename    = (char*)xmalloc((strlen(modelname)+strlen(".bin")   +1)*sizeof(char)); sprintf(binfilename,   "%s%s",modelname,".bin");
    127         outbinfilename = (char*)xmalloc((strlen(modelname)+strlen(".outbin")+1)*sizeof(char)); sprintf(outbinfilename,"%s%s",modelname,".outbin");
    128         lockfilename   = (char*)xmalloc((strlen(modelname)+strlen(".lock")  +1)*sizeof(char)); sprintf(lockfilename,  "%s%s",modelname,".lock");
     126        binfilename    = xNew<char>((strlen(modelname)+strlen(".bin")   +1)); sprintf(binfilename,   "%s%s",modelname,".bin");
     127        outbinfilename = xNew<char>((strlen(modelname)+strlen(".outbin")+1)); sprintf(outbinfilename,"%s%s",modelname,".outbin");
     128        lockfilename   = xNew<char>((strlen(modelname)+strlen(".lock")  +1)); sprintf(lockfilename,  "%s%s",modelname,".lock");
    129129
    130130        /*Clean up and assign output pointer*/
  • issm/trunk-jpl/src/c/solutions/steadystate_core.cpp

    r11832 r12439  
    9393
    9494        /*Free ressources:*/
    95         xfree((void**)&requested_outputs);
     95        xDelete<int>(requested_outputs);
    9696}
  • issm/trunk-jpl/src/c/solutions/transient_core.cpp

    r11832 r12439  
    147147
    148148        /*Free ressources:*/
    149         xfree((void**)&requested_outputs);
     149        xDelete<int>(requested_outputs);
    150150}
Note: See TracChangeset for help on using the changeset viewer.