Changeset 16047

Timestamp:

08/30/13 16:48:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added gradient

File:

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

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

@@ -32 +32 @@
         int                *control_list = NULL;
         Vector<IssmDouble> *X            = NULL;
+        Vector<IssmDouble> *G            = NULL;
         Vector<IssmDouble> *XL           = NULL;
         Vector<IssmDouble> *XU           = NULL;
@@ -83 +84 @@
         TaoView(tao,PETSC_VIEWER_STDOUT_WORLD);
         TaoGetSolutionVector(tao,&X->pvector->vector);
+        G=new Vector<IssmDouble>(0); VecFree(&G->pvector->vector);
+        TaoGetGradientVector(tao,&G->pvector->vector);
         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]);