Changeset 6323 for issm/trunk/src/c/solutions/control_core.cpp

Timestamp:

10/15/10 16:13:34 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added some verbosity levels and generalized

File:

• issm/trunk/src/c/solutions/control_core.cpp (modified) (6 diffs)

issm/trunk/src/c/solutions/control_core.cpp

@@ -17 +17 @@
         
         /*parameters: */
-        int     verbose=0;
         int     num_controls;
         int     nsteps;
@@ -67 +66 @@
 
         /*Launch once a complete solution to set up all inputs*/
-        _printf_("%s\n","      preparing initial solution");
+        ISSMPRINTF(VerboseControl(),"%s\n","   preparing initial solution");
         if (isstokes) solutioncore(femmodel);
 
@@ -81 +80 @@
 
                 /*Display info*/
-                _printf_("\n%s%i%s%i\n","   control method step ",n+1,"/",nsteps);
+                ISSMPRINTF(VerboseControl(),"\n%s%i%s%i\n","   control method step ",n+1,"/",nsteps);
                 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,(int)responses[n],CmResponseEnum);
                 
@@ -87 +86 @@
                 if (solution_type==SteadystateSolutionEnum) solutioncore(femmodel);
 
-                _printf_("%s\n","      compute adjoint state:");
+                ISSMPRINTF(VerboseControl(),"%s\n","   compute adjoint state:");
                 adjointcore(femmodel);
         
-                _printf_("%s\n","      computing gradJ...");
                 gradient_core(femmodel,n,search_scalar);
 
@@ -99 +97 @@
                 }
 
-                _printf_("%s\n","      optimizing along gradient direction");
+                ISSMPRINTF(VerboseControl(),"%s\n","   optimizing along gradient direction");
                 optargs.n=n; optpars.maxiter=(int)maxiter[n]; optpars.cm_jump=cm_jump[n];
                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
                 //OptimalSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
 
-                _printf_("%s\n","      updating parameter using optimized search scalar..."); //true means update save controls
+                ISSMPRINTF(VerboseControl(),"%s\n","   updating parameter using optimized search scalar"); //true means update save controls
                 InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,true);
                 
@@ -111 +109 @@
                 /*Temporary saving every 5 control steps: */
                 if (((n+1)%5)==0){
-                        _printf_("%s\n","      saving temporary results...");
+                        ISSMPRINTF(VerboseControl(),"%s\n","   saving temporary results");
                         controlrestart(femmodel,J);
                 }
         }
 
-        _printf_("%s\n","      preparing final solution");
+        ISSMPRINTF(VerboseControl(),"%s\n","   preparing final solution");
         femmodel->parameters->SetParam(false,ControlAnalysisEnum); //needed to turn control result output in solutioncore
         solutioncore(femmodel);