Changeset 12439
- Timestamp:
- 06/18/12 08:38:12 (13 years ago)
- Location:
- issm/trunk-jpl/src/c/solutions
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp
r11590 r12439 29 29 case DiagnosticSolutionEnum: 30 30 numanalyses=5; 31 analyses= (int*)xmalloc(numanalyses*sizeof(int));31 analyses=xNew<int>(numanalyses); 32 32 analyses[0]=DiagnosticHorizAnalysisEnum; 33 33 analyses[1]=DiagnosticVertAnalysisEnum; … … 39 39 case SteadystateSolutionEnum: 40 40 numanalyses=8; 41 analyses= (int*)xmalloc(numanalyses*sizeof(int));41 analyses=xNew<int>(numanalyses); 42 42 analyses[0]=DiagnosticHorizAnalysisEnum; 43 43 analyses[1]=DiagnosticVertAnalysisEnum; … … 52 52 case ThermalSolutionEnum: 53 53 numanalyses=2; 54 analyses= (int*)xmalloc(numanalyses*sizeof(int));54 analyses=xNew<int>(numanalyses); 55 55 analyses[0]=ThermalAnalysisEnum; 56 56 analyses[1]=MeltingAnalysisEnum; … … 59 59 case EnthalpySolutionEnum: 60 60 numanalyses=1; 61 analyses= (int*)xmalloc(numanalyses*sizeof(int));61 analyses=xNew<int>(numanalyses); 62 62 analyses[0]=EnthalpyAnalysisEnum; 63 63 break; … … 65 65 case HydrologySolutionEnum: 66 66 numanalyses=3; 67 analyses= (int*)xmalloc(numanalyses*sizeof(int));67 analyses=xNew<int>(numanalyses); 68 68 analyses[0]=HydrologyAnalysisEnum; 69 69 analyses[1]=SurfaceSlopeAnalysisEnum; … … 73 73 case PrognosticSolutionEnum: 74 74 numanalyses=1; 75 analyses= (int*)xmalloc(numanalyses*sizeof(int));75 analyses=xNew<int>(numanalyses); 76 76 analyses[0]=PrognosticAnalysisEnum; 77 77 break; … … 79 79 case BalancethicknessSolutionEnum: 80 80 numanalyses=1; 81 analyses= (int*)xmalloc(numanalyses*sizeof(int));81 analyses=xNew<int>(numanalyses); 82 82 analyses[0]=BalancethicknessAnalysisEnum; 83 83 break; … … 85 85 case SurfaceSlopeSolutionEnum: 86 86 numanalyses=1; 87 analyses= (int*)xmalloc(numanalyses*sizeof(int));87 analyses=xNew<int>(numanalyses); 88 88 analyses[0]=SurfaceSlopeAnalysisEnum; 89 89 break; … … 91 91 case BedSlopeSolutionEnum: 92 92 numanalyses=1; 93 analyses= (int*)xmalloc(numanalyses*sizeof(int));93 analyses=xNew<int>(numanalyses); 94 94 analyses[0]=BedSlopeAnalysisEnum; 95 95 break; … … 97 97 case TransientSolutionEnum: 98 98 numanalyses=9; 99 analyses= (int*)xmalloc(numanalyses*sizeof(int));99 analyses=xNew<int>(numanalyses); 100 100 analyses[0]=DiagnosticHorizAnalysisEnum; 101 101 analyses[1]=DiagnosticVertAnalysisEnum; … … 117 117 if(pnumanalyses) *pnumanalyses=numanalyses; 118 118 if(panalyses) *panalyses=analyses; 119 else x free((void**)&analyses);119 else xDelete<int>(analyses); 120 120 } -
issm/trunk-jpl/src/c/solutions/ProcessArguments.cpp
r12319 r12439 21 21 if(argc<3)_error_("Usage error: missing model name"); 22 22 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"); 27 27 28 28 /*Clean up and assign output pointer*/ -
issm/trunk-jpl/src/c/solutions/control_core.cpp
r11827 r12439 70 70 71 71 /*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); 74 74 75 75 /*Initialize some of the BrentSearch arguments: */ … … 120 120 cleanup_and_return: 121 121 /*Free ressources: */ 122 x free((void**)&control_type);123 x free((void**)&responses);124 x free((void**)&step_responses);125 x free((void**)&maxiter);126 x free((void**)&cm_jump);127 x free((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); 128 128 } -
issm/trunk-jpl/src/c/solutions/controlrestart.cpp
r11827 r12439 33 33 34 34 /*Clean up and return*/ 35 x free((void**)&control_type);35 xDelete<int>(control_type); 36 36 } -
issm/trunk-jpl/src/c/solutions/controltao_core.cpp
r11827 r12439 50 50 femmodel->parameters->FindParam(&dummy,NULL,NULL,InversionMaxiterPerStepEnum); 51 51 femmodel->parameters->SetParam(false,SaveResultsEnum); 52 maxiter=nsteps*(int)dummy[0]; x free((void**)&dummy);52 maxiter=nsteps*(int)dummy[0]; xDelete<double>(dummy); 53 53 54 54 /*Initialize TAO*/ … … 95 95 96 96 /*Clean up and return*/ 97 x free((void**)&control_list);97 xDelete<int>(control_list); 98 98 xdelete(&X); 99 99 TaoDestroy(&tao); … … 125 125 126 126 /*Prepare objective function*/ 127 cost_functions= (int*)xmalloc(num_cost_functions*sizeof(int));127 cost_functions=xNew<int>(num_cost_functions); 128 128 for(int i=0;i<num_cost_functions;i++) cost_functions[i]=(int)cost_functionsd[i]; //FIXME 129 129 femmodel->parameters->SetParam(cost_functions,1,num_cost_functions,StepResponsesEnum); … … 146 146 147 147 /*Clean-up and return*/ 148 x free((void**)&cost_functions);149 x free((void**)&cost_functionsd);148 xDelete<int>(cost_functions); 149 xDelete<double>(cost_functionsd); 150 150 return 0; 151 151 } … … 175 175 176 176 /*Clean-up and return*/ 177 x free((void**)&responses);177 xDelete<int>(responses); 178 178 return 0; 179 179 } -
issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp
r11827 r12439 105 105 106 106 /*Free ressources:*/ 107 x free((void**)&requested_outputs);107 xDelete<int>(requested_outputs); 108 108 } -
issm/trunk-jpl/src/c/solutions/gradient_core.cpp
r11695 r12439 48 48 49 49 /*Clean up and return*/ 50 x free((void**)&norm_list);50 xDelete<double>(norm_list); 51 51 } -
issm/trunk-jpl/src/c/solutions/issm.cpp
r12102 r12439 144 144 145 145 /*Free ressources */ 146 x free((void**)&analyses);147 x free((void**)&lockfilename);148 x free((void**)&binfilename);149 x free((void**)&outbinfilename);150 x free((void**)&petscfilename);146 xDelete<int>(analyses); 147 xDelete<char>(lockfilename); 148 xDelete<char>(binfilename); 149 xDelete<char>(outbinfilename); 150 xDelete<char>(petscfilename); 151 151 delete femmodel; 152 152 -
issm/trunk-jpl/src/c/solutions/kriging.cpp
r12382 r12439 86 86 87 87 /*Free ressources */ 88 x free((void**)&lockfilename);89 x free((void**)&binfilename);90 x free((void**)&outbinfilename);91 x free((void**)&x);92 x free((void**)&y);93 x free((void**)&data);94 x free((void**)&x_interp);95 x free((void**)&y_interp);96 x free((void**)&predictions);97 x free((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); 98 98 delete options; 99 99 delete results; … … 124 124 if(argc<2)_error_("Usage error: missing model name"); 125 125 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"); 129 129 130 130 /*Clean up and assign output pointer*/ -
issm/trunk-jpl/src/c/solutions/steadystate_core.cpp
r11832 r12439 93 93 94 94 /*Free ressources:*/ 95 x free((void**)&requested_outputs);95 xDelete<int>(requested_outputs); 96 96 } -
issm/trunk-jpl/src/c/solutions/transient_core.cpp
r11832 r12439 147 147 148 148 /*Free ressources:*/ 149 x free((void**)&requested_outputs);149 xDelete<int>(requested_outputs); 150 150 }
Note:
See TracChangeset
for help on using the changeset viewer.