Changeset 12910

Timestamp:

08/06/12 09:03:59 (13 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed tao for new Vector and Matrices objects

Location:

issm/trunk-jpl/src/c

Files:

• classes/matrix/Vector.cpp (modified) (1 diff)
• classes/matrix/Vector.h (modified) (1 diff)
• solutions/controltao_core.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/classes/matrix/Vector.cpp

@@ -61 +61 @@
 }
 /*}}}*/
+#ifdef _HAVE_PETSC_
+/*FUNCTION Vector::Vector(Vec petsc_vector){{{*/
+Vector::Vector(Vec petsc_vector){
+
+        this->type=PetscVecType;
+        this->svector=NULL;
+        this->pvector=new PetscVec(petsc_vector);
+
+}
+/*}}}*/
+#endif
 /*FUNCTION Vector::Vector(IssmDouble* serial_vec,int M,int type){{{*/
 Vector::Vector(IssmDouble* serial_vec,int M,int in_type){

issm/trunk-jpl/src/c/classes/matrix/Vector.h

@@ -36 +36 @@
                 Vector(int M,bool fromlocalsize=false,int type=PetscVecType);
                 Vector(IssmDouble* serial_vec,int pM,int type=PetscVecType);
+                #ifdef _HAVE_PETSC_
+                Vector(Vec petsc_vector);
+                #endif
                 ~Vector();
                 /*}}}*/

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

@@ -21 +21 @@
 typedef struct {
         FemModel* femmodel;
+        double*   J;
 } AppCtx;
 
@@ -69 +70 @@
         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->vector);
-        TaoSetVariableBounds(tao,XL->vector,XU->vector);
+        TaoSetInitialVector(tao,X->pvector->vector);
+        TaoSetVariableBounds(tao,XL->pvector->vector,XU->pvector->vector);
         xdelete(&XL);
         xdelete(&XU);
 
+        user.J=(double*)xcalloc((maxiter+5),sizeof(double));
         user.femmodel=femmodel;
         TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); 
@@ -81 +83 @@
         TaoSolve(tao);
         TaoView(tao,PETSC_VIEWER_STDOUT_WORLD);
-        TaoGetSolutionVector(tao,&X->vector);
+        TaoGetSolutionVector(tao,&X->pvector->vector);
         SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X);
         for(int i=0;i<num_controls;i++){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_list[i]);
         }
+        femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,user.J,maxiter+3,1,0));
 
         /*Finalize*/
@@ -142 +145 @@
         /*Compute gradient*/
         Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-        VecCopy(gradient->vector,G); xdelete(&gradient);
+        VecCopy(gradient->pvector->vector,G); xdelete(&gradient);
         VecScale(G,-1.);
 
@@ -166 +169 @@
         if(its==0) _pprintLine_("-----------------------------------+-----------------------");
         _pprintString_(setw(4)<<its<<"   "<<setw(12)<<setprecision(7)<<f<<"  "<<setw(12)<<setprecision(7)<<gnorm<<"  | ");
+        user->J[its]=f;
 
         /*Retrieve objective functions independently*/