Changeset 16484

Timestamp:

10/21/13 15:33:21 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing lat InputToResultx

File:

• issm/trunk-jpl/src/c/analyses/controltao_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/controltao_core.cpp

@@ -82 +82 @@
         TaoSolve(tao);
         TaoView(tao,PETSC_VIEWER_STDOUT_WORLD);
+
+        /*Save results*/
         TaoGetSolutionVector(tao,&X->pvector->vector);
         G=new Vector<IssmDouble>(0); VecFree(&G->pvector->vector);
@@ -87 +89 @@
         SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X);
         ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);
-        for(int i=0;i<num_controls;i++){
-                InputToResultx(femmodel,control_list[i]);
-        }
+        femmodel->OutputControlsx(&femmodel->results);
         femmodel->results->AddObject(new GenericExternalResult<double*>(femmodel->results->Size()+1,JEnum,user.J,maxiter+3,1,1,0));