Changeset 16327

Timestamp:

10/08/13 09:02:29 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing tso with new responses

File:

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

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

@@ -147 +147 @@
 int IssmMonitor(TaoSolver tao, void *userCtx){
 
-        int       i,its,num_responses;
-        IssmDouble    f,gnorm,cnorm,xdiff;
-        AppCtx   *user      = (AppCtx *)userCtx;
-        FemModel *femmodel  = user->femmodel;
-        int      *responses = NULL;
+        int         its,num_responses;
+        IssmDouble  f,gnorm,cnorm,xdiff;
+        AppCtx     *user      = (AppCtx *)userCtx;
+        FemModel   *femmodel  = user->femmodel;
+        int        *responses = NULL;
 
-        femmodel->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
-        femmodel->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
+        femmodel->parameters->FindParam(&responses,&num_responses,InversionCostFunctionsEnum);
 
         TaoGetSolutionStatus(tao, &its, &f, &gnorm, &cnorm, &xdiff, NULL);
@@ -163 +162 @@
 
         /*Retrieve objective functions independently*/
-        for(i=0;i<num_responses;i++){
-                femmodel->Responsex(&f,EnumToStringx(responses[i]),i);
+        for(int i=0;i<num_responses;i++){
+                femmodel->Responsex(&f,EnumToStringx(responses[i]));
                 _printf0_(" "<<setw(12)<<setprecision(7)<<f);
         }