Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/controltao_core.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/controltao_core.cpp	(revision 13229)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/controltao_core.cpp	(revision 13230)
@@ -26,16 +26,16 @@
 void controltao_core(FemModel* femmodel){
 
 	/*TAO*/
-	int        ierr;
-	int        num_controls,solution_type;
-	int        nsteps,maxiter;
-	AppCtx     user;
-	TaoSolver  tao = 0;
-	IssmDouble    *dummy          = NULL;
-	int       *control_list   = NULL;
-	Vector    *X              = NULL;
-	Vector    *XL             = NULL;
-	Vector    *XU             = NULL;
+	int                 ierr;
+	int                 num_controls,solution_type;
+	int                 nsteps,maxiter;
+	AppCtx              user;
+	TaoSolver           tao = 0;
+	IssmDouble         *dummy        = NULL;
+	int                *control_list = NULL;
+	Vector<IssmDouble> *X            = NULL;
+	Vector<IssmDouble> *XL           = NULL;
+	Vector<IssmDouble> *XU           = NULL;
 
 	/*Initialize TAO*/
 	int argc; char **args=NULL;
@@ -105,13 +105,13 @@
 int FormFunctionGradient(TaoSolver tao, Vec Xpetsc, IssmDouble *fcn,Vec G,void *userCtx){
 
 	/*Retreive arguments*/
-	int       solution_type,num_cost_functions;
-	AppCtx   *user           = (AppCtx *)userCtx;
-	FemModel *femmodel       = user->femmodel;
-	int      *cost_functions = NULL;
-	IssmDouble   *cost_functionsd= NULL;
-	Vector   *gradient       = NULL;
-	Vector   *X              = NULL;
+	int                  solution_type,num_cost_functions;
+	AppCtx              *user            = (AppCtx *)userCtx;
+	FemModel            *femmodel        = user->femmodel;
+	int                 *cost_functions  = NULL;
+	IssmDouble          *cost_functionsd = NULL;
+	Vector<IssmDouble>  *gradient        = NULL;
+	Vector<IssmDouble>  *X               = NULL;
 
 	/*Convert input to Vec*/
 	X=new Vector(Xpetsc);