Changeset 11510

Timestamp:

02/23/12 12:48:53 (13 years ago)

Author:

Mathieu Morlighem

Message:

Forgot to commit the module:

Location:

issm/trunk-jpl/src/c

Files:

• modules/PositiveDegreeDayx (added)
• modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (added)
• modules/PositiveDegreeDayx/PositiveDegreeDayx.h (added)
• solutions/controltao_core.cpp (modified) (4 diffs)

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

@@ -18 +18 @@
 /*Local prototype*/
 int FormFunctionGradient(TaoSolver tao,Vec,double*,Vec,void*);
+int IssmMonitor(TaoSolver,void *);
 typedef struct {
         FemModel* femmodel;
@@ -53 +54 @@
         _printf_(VerboseControl(),"%s\n","   Initializing the Toolkit for Advanced Optimization (TAO)");
         TaoCreate(PETSC_COMM_WORLD,&tao);
-        PetscOptionsSetValue("-tao_monitor","");
         TaoSetFromOptions(tao);
         TaoSetType(tao,"tao_blmvm");
@@ -60 +60 @@
 
         /*Prepare all TAO parameters*/
+        TaoSetMonitor(tao,IssmMonitor,NULL,NULL);
         TaoSetMaximumFunctionEvaluations(tao,maxiter);
         TaoSetMaximumIterations(tao,nsteps);
@@ -143 +144 @@
         return 0;
 }
+int IssmMonitor(TaoSolver tao, void *userCtx){
+
+        AppCtx *user = (AppCtx *)userCtx;
+        int     its;
+        double  f,gnorm,cnorm,xdiff;
+
+        TaoGetSolutionStatus(tao, &its, &f, &gnorm, &cnorm, &xdiff, NULL);
+        printf("Iteration %3i: Function value: %12.7g, Residual: %g\n",its,f,gnorm);
+        return 0;
+}
 
 #else