Changeset 6213 for issm/trunk/src/c/solutions/control_core.cpp
- Timestamp:
- 10/08/10 16:49:12 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/solutions/control_core.cpp
r6200 r6213 18 18 /*parameters: */ 19 19 int verbose=0; 20 int control_type;20 int num_controls; 21 21 int nsteps; 22 22 double eps_cm; … … 28 28 bool qmu_analysis=false; 29 29 30 int* control_type = NULL; 30 31 double* responses=NULL; 31 32 double* optscal=NULL; … … 48 49 /*Recover parameters used throughout the solution:{{{1*/ 49 50 femmodel->parameters->FindParam(&nsteps,NStepsEnum); 50 femmodel->parameters->FindParam(&control_type,ControlTypeEnum); 51 femmodel->parameters->FindParam(&num_controls,NumControlsEnum); 52 femmodel->parameters->FindParam(&control_type,NULL,ControlTypeEnum); 51 53 femmodel->parameters->FindParam(&responses,NULL,CmResponsesEnum); 52 54 femmodel->parameters->FindParam(&optscal,NULL,OptScalEnum); … … 122 124 /*some results not computed by steadystate_core or diagnostic_core: */ 123 125 if(!qmu_analysis){ //do not save this if we are running the control core from a qmu run! 124 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type); //the parameter itself!126 for(i=0;i<num_controls;i++) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i]); 125 127 femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0)); 126 femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0));128 //femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,ControlTypeEnum,EnumToString(control_type),1,0)); 127 129 } 128 130 129 131 cleanup_and_return: 130 132 /*Free ressources: */ 133 xfree((void**)&control_type); 131 134 xfree((void**)&responses); 132 135 xfree((void**)&optscal);
Note:
See TracChangeset
for help on using the changeset viewer.