Changeset 26943

Timestamp:

04/02/22 04:41:59 (3 years ago)

Author:

seroussi

Message:

CHG: preparing for PETSc 3.17

File:

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

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

@@ -95 +95 @@
         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");
+        #if PETSC_VERSION_LT(3,17,0)
         TaoSetInitialVector(tao,X->pvector->vector);
+        #else
+        //TaoSetSolution(tao,X->pvector->vector);
+        _error_("not implemented yet");
+        #endif
         TaoSetVariableBounds(tao,XL->pvector->vector,XU->pvector->vector);
         delete XL;
@@ -110 +115 @@
 
         /*Save results*/
+        #if PETSC_VERSION_LT(3,17,0)
         TaoGetSolutionVector(tao,&X->pvector->vector);
+        #else
+        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");
+        #endif
         SetControlInputsFromVectorx(femmodel,X);
         ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);