Changeset 11703

Timestamp:

03/14/12 09:08:48 (13 years ago)

Author:

Mathieu Morlighem

Message:

updated controltao with new Vector/Matrix interface

File:

• issm/trunk-jpl/src/c/solutions/controltao_core.cpp (modified) (7 diffs)

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

@@ -13 +13 @@
 #include "../solvers/solvers.h"
 
-#if defined (_HAVE_TAO_) && (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ == 2)
+#if defined (_HAVE_TAO_) && defined (_HAVE_PETSC_) && (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ == 2)
 #include <tao.h>
 
@@ -33 +33 @@
         double    *dummy          = NULL;
         int       *control_list   = NULL;
-        Vec        X              = NULL;
-        Vec        XL             = NULL;
-        Vec        XU             = NULL;
+        Vector    *X              = NULL;
+        Vector    *XL             = NULL;
+        Vector    *XU             = NULL;
 
         /*Initialize TAO*/
@@ -68 +68 @@
         GetVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
         GetVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
-        TaoSetInitialVector(tao,X);
-        TaoSetVariableBounds(tao,XL,XU);
-        VecFree(&XL);
-        VecFree(&XU);
+        TaoSetInitialVector(tao,X->vector);
+        TaoSetVariableBounds(tao,XL->vector,XU->vector);
+        xdelete(&XL);
+        xdelete(&XU);
 
         user.femmodel=femmodel;
@@ -80 +80 @@
         TaoSolve(tao);
         TaoView(tao,PETSC_VIEWER_STDOUT_WORLD);
-        TaoGetSolutionVector(tao,&X);
+        TaoGetSolutionVector(tao,&X->vector);
         SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X);
         for(int i=0;i<num_controls;i++){
@@ -95 +95 @@
         /*Clean up and return*/
         xfree((void**)&control_list);
-        VecFree(&X);
+        xdelete(&X);
         TaoDestroy(&tao);
         TaoFinalize();
 }
-int FormFunctionGradient(TaoSolver tao, Vec X, double *fcn,Vec G,void *userCtx){
+int FormFunctionGradient(TaoSolver tao, Vec Xpetsc, double *fcn,Vec G,void *userCtx){
 
         /*Retreive arguments*/
@@ -107 +107 @@
         int      *cost_functions = NULL;
         double   *cost_functionsd= NULL;
-        Vec       gradient       = NULL;
+        Vector   *gradient       = NULL;
+        Vector   *X              = NULL;
+
+        /*Convert input to Vec*/
+        X=new Vector(Xpetsc);
 
         /*Set new variable*/
@@ -136 +140 @@
         /*Compute gradient*/
         Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-        VecCopy(gradient,G); VecFree(&gradient);
+        VecCopy(gradient->vector,G); xdelete(&gradient);
         VecScale(G,-1.);