Changeset 13543

Timestamp:

10/04/12 18:13:39 (13 years ago)

Author:

Eric.Larour

Message:

CHG: moved tape statistics printing for AD mode to ad_core from issm.cpp

Location:

issm/trunk-jpl/src/c/solutions

Files:

• ad_core.cpp (modified) (2 diffs)
• issm.cpp (modified) (3 diffs)

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

@@ -33 +33 @@
         int         num_independents;
         char*       driver=NULL;
+        size_t   tape_stats[11];
 
         /*state variables: */
@@ -288 +289 @@
                         xDelete(anEDF_for_solverx_p->dp_Z);
                         xDelete(anEDF_for_solverx_p->dpp_Z);
-
+        
+                        /*Print statistics: {{{*/
+                        tapestats(1,tape_stats); //reading of tape statistics
+                        if(VerboseAutodiff()){
+                                _pprintLine_("   ADOLC statistics: ");
+                                _pprintLine_("   "<<setw(45)<<left<<"Number of independents: " <<tape_stats[0]);
+                                _pprintLine_("   "<<setw(45)<<left<<"Number of dependents: " <<tape_stats[1]);
+                                _pprintLine_("   "<<setw(45)<<left<<"Maximal number of live active variables: " <<tape_stats[2]);
+                                _pprintLine_("   "<<setw(45)<<left<<"Size of value stack (number of overwrites): " <<tape_stats[3]);
+                                _pprintLine_("   "<<setw(45)<<left<<"Buffer size (a multiple of eight): " <<tape_stats[4]);
+                                _pprintLine_("   "<<setw(45)<<left<<"Total number of operations recorded: " <<tape_stats[5]);
+                        }
+                        if(VerboseAutodiff())_pprintLine_("   end AD core");
+                        
                         /*Free resources: */
                         xDelete(xp);
                         xDelete(axp); 
-                        
-                        if(VerboseAutodiff())_pprintLine_("   end AD core");
-
                 #else
                         _error_("Should not be requesting AD drivers when an AD library is not available!");

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

@@ -15 +15 @@
         FILE *petscoptionsfid  = NULL;
         bool  waitonlock       = false;
-
-        /*AD: */
-        bool autodiff=false;
-        size_t   tape_stats[11];
 
         /*FemModel: */
@@ -75 +71 @@
         pfclose(petscoptionsfid,petscfilename);
 
-        /*get parameters: */
-        femmodel->parameters->FindParam(&waitonlock,SettingsWaitonlockEnum);
-        femmodel->parameters->FindParam(&autodiff,AutodiffIsautodiffEnum);
-
-        /*Profiling: */
         profiler->Tag(FinishInit);
         
+        /*call cores: */
         _pprintLine_("call computational core:");
         profiler->Tag(StartCore); solutioncore(femmodel); profiler->Tag(FinishCore); 
@@ -91 +83 @@
         OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
         
-        /*If running AD, close our tape, print statistics: {{{*/
-        #ifdef _HAVE_ADOLC_
-        if(autodiff){
-                tapestats(1,tape_stats); //reading of tape statistics
-                if(VerboseAutodiff()){
-                        _pprintLine_("   ADOLC statistics: ");
-                        _pprintLine_("   "<<setw(45)<<left<<"Number of independents: " <<tape_stats[0]);
-                        _pprintLine_("   "<<setw(45)<<left<<"Number of dependents: " <<tape_stats[1]);
-                        _pprintLine_("   "<<setw(45)<<left<<"Maximal number of live active variables: " <<tape_stats[2]);
-                        _pprintLine_("   "<<setw(45)<<left<<"Size of value stack (number of overwrites): " <<tape_stats[3]);
-                        _pprintLine_("   "<<setw(45)<<left<<"Buffer size (a multiple of eight): " <<tape_stats[4]);
-                        _pprintLine_("   "<<setw(45)<<left<<"Total number of operations recorded: " <<tape_stats[5]);
-                }
-        }
-        #endif  /*}}}*/
-
         /*Close output and petsc options file and write lock file if requested*/
         pfclose(output_fid,lockfilename);
+        femmodel->parameters->FindParam(&waitonlock,SettingsWaitonlockEnum);
         if (waitonlock>0){
                 _pprintLine_("write lock file:");