Changeset 9112
- Timestamp:
- 07/25/11 16:10:26 (14 years ago)
- Location:
- issm/trunk/src/c/solutions
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/solutions/diagnostic_core.cpp
r9110 r9112 24 24 bool control_analysis; 25 25 int solution_type; 26 int numoutputs=0;27 int* requested_outputs = NULL;28 26 29 27 … … 36 34 femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); 37 35 femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); 38 femmodel->parameters->FindParam(&requested_outputs,&numoutputs,RequestedOutputsEnum);39 36 40 37 /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/ … … 91 88 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum); 92 89 if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum); 93 if(numoutputs)RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);90 RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); 94 91 } 95 92 96 /*Free ressources:*/97 xfree((void**)&requested_outputs);98 99 93 } -
issm/trunk/src/c/solutions/steadystate_core.cpp
r9110 r9112 22 22 int max_steadystate_iterations; 23 23 bool control_analysis; 24 int numoutputs=0;25 int* requested_outputs = NULL;26 24 27 25 /* recover parameters:*/ … … 30 28 femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); 31 29 femmodel->parameters->FindParam(&max_steadystate_iterations,MaxSteadystateIterationsEnum); 32 femmodel->parameters->FindParam(&requested_outputs,&numoutputs,RequestedOutputsEnum);33 30 34 31 /*intialize counters: */ … … 72 69 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum); 73 70 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum); 74 if(numoutputs)RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);71 RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); 75 72 } 76 73 77 /*Free ressources:*/78 xfree((void**)&requested_outputs);79 80 74 }
Note:
See TracChangeset
for help on using the changeset viewer.