Changeset 27716

Timestamp:

05/01/23 16:48:38 (23 months ago)

Author:

Mathieu Morlighem

Message:

CHG: enabling TAO for PETSc 3.17+

File:

• issm/trunk-jpl/src/c/cores/controltao_core.cpp (modified) (3 diffs)

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

@@ -98 +98 @@
         TaoSetInitialVector(tao,X->pvector->vector);
         #else
-        //TaoSetSolution(tao,X->pvector->vector);
-        _error_("not implemented yet");
+        TaoSetSolution(tao,X->pvector->vector);
         #endif
         TaoSetVariableBounds(tao,XL->pvector->vector,XU->pvector->vector);
@@ -107 +106 @@
         user.J=xNewZeroInit<double>(maxiter+5);
         user.femmodel=femmodel;
+        G=new Vector<IssmDouble>(0); VecFree(&G->pvector->vector);
         #if PETSC_VERSION_LT(3,17,0)
         TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); 
@@ -124 +124 @@
         TaoGetSolution(tao,&X->pvector->vector);
         #endif
-        G=new Vector<IssmDouble>(0); VecFree(&G->pvector->vector);
         #if PETSC_VERSION_LT(3,17,0)
         TaoGetGradientVector(tao,&G->pvector->vector);
         #else
-        //TaoGetGradient(tao,&G->pvector->vector);
-        _error_("not implemented yet");
+        TaoGetGradient(tao,&G->pvector->vector, NULL, NULL);
         #endif
         SetControlInputsFromVectorx(femmodel,X);