source: issm/oecreview/Archive/16133-16554/ISSM-16483-16484.diff

Last change on this file was 16556, checked in by Mathieu Morlighem, 11 years ago

NEW: added Archive/16133-16554
File size: 1.1 KB
RevLine 
[16556]1Index: ../trunk-jpl/src/c/analyses/controltao_core.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/controltao_core.cpp (revision 16483)
4+++ ../trunk-jpl/src/c/analyses/controltao_core.cpp (revision 16484)
5@@ -81,14 +81,14 @@
6 if(VerboseControl()) _printf0_(" Starting optimization\n");
7 TaoSolve(tao);
8 TaoView(tao,PETSC_VIEWER_STDOUT_WORLD);
9+
10+ /*Save results*/
11 TaoGetSolutionVector(tao,&X->pvector->vector);
12 G=new Vector<IssmDouble>(0); VecFree(&G->pvector->vector);
13 TaoGetGradientVector(tao,&G->pvector->vector);
14 SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X);
15 ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);
16- for(int i=0;i<num_controls;i++){
17- InputToResultx(femmodel,control_list[i]);
18- }
19+ femmodel->OutputControlsx(&femmodel->results);
20 femmodel->results->AddObject(new GenericExternalResult<double*>(femmodel->results->Size()+1,JEnum,user.J,maxiter+3,1,1,0));
21
22 /*Finalize*/
Note: See TracBrowser for help on using the repository browser.