Changeset 13083

Timestamp:

08/17/12 13:57:03 (13 years ago)

Author:

Eric.Larour

Message:

CHG: introduced autodiff bool to hook off and on the ADOLC
at run time.

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (4 diffs)
• c/solutions/issm.cpp (modified) (6 diffs)
• m/classes/autodiff.m (modified) (2 diffs)
• m/classes/autodiff.py (modified) (3 diffs)
• m/enum/AutodiffForwardEnum.m (deleted)
• m/enum/AutodiffReverseEnum.m (deleted)
• m/enum/EnumDefinitions.py (modified) (3 diffs)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -12 +12 @@
 enum definitions{
         /*Model fields {{{1*/
-        AutodiffForwardEnum,
         AutodiffIsautodiffEnum, 
-        AutodiffReverseEnum,
         BalancethicknessSpcthicknessEnum,
         BalancethicknessStabilizationEnum,

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -17 +17 @@
         switch(en){
 
-                case AutodiffForwardEnum : return "AutodiffForward";
                 case AutodiffIsautodiffEnum : return "AutodiffIsautodiff";
-                case AutodiffReverseEnum : return "AutodiffReverse";
                 case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
                 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -86 +86 @@
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(AutodiffForwardEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(AutodiffReverseEnum));
         parameters->AddObject(iomodel->CopyConstantObject(QmuIsdakotaEnum));
         parameters->AddObject(iomodel->CopyConstantObject(InversionIscontrolEnum));

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -18 +18 @@
 
    if(stage==1){
-              if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum;
-              else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
-              else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum;
+              if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
               else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
               else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
@@ -138 +136 @@
               else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum;
               else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum;
+              else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
+              else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
-              else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
-              else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
+              if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
               else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;
               else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
@@ -261 +259 @@
               else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
               else if (strcmp(name,"Contour")==0) return ContourEnum;
+              else if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
+              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"ControlInput")==0) return ControlInputEnum;
-              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
-              else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
+              if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
               else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
               else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
@@ -384 +382 @@
               else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
               else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
+              else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
+              else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
-              else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
-              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
+              if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
               else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
               else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;

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

@@ -15 +15 @@
 
         /*AD: */
+        bool autodiff=false;
         #if _ADOLC_VERSION_ == 2
         int      tape_stats[11];
@@ -49 +50 @@
         ISSMBOOT();
 
-        /*If running AD, then initialize the tape: */
-        #ifdef _HAVE_ADOLC_
-        trace_on(1);
-        #endif
-
+        
         /*Initialize environments: Petsc, MPI, etc...: */
         #ifdef _HAVE_PETSC_
@@ -112 +109 @@
         femmodel->parameters->FindParam(&tao_analysis,InversionTaoEnum);
         femmodel->parameters->FindParam(&profiling,DebugProfilingEnum); 
+        femmodel->parameters->FindParam(&autodiff,AutodiffIsautodiffEnum);
 
         #ifdef _HAVE_MPI_
@@ -117 +115 @@
         #else
         finish_init=(IssmPDouble)clock();
+        #endif
+        
+        /*If running AD, then initialize the tape: */
+        #ifdef _HAVE_ADOLC_
+        if(autodiff) trace_on(1);
         #endif
 
@@ -165 +168 @@
         _pprintLine_("write results to disk:");
         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){
+                trace_off();
+                tapestats(1,tape_stats); //reading of tape statistics
+                _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*/
@@ -213 +231 @@
         #endif
 
-        /*If running AD, close our tape, print statistics: */
-        #ifdef _HAVE_ADOLC_
-        trace_off();
-        tapestats(1,tape_stats); //reading of tape statistics
-        _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
         
         /*end module: */

issm/trunk-jpl/src/m/classes/autodiff.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 isautodiff = false;
-                forward    = true;
-                reverse    = false;
         end
         methods
@@ -29 +27 @@
 
                         fielddisplay(obj,'isautodiff','indicates if the automatic differentiation is activated');
-                        fielddisplay(obj,'forward','forward differentiation');
-                        fielddisplay(obj,'reverse','backward differentiation');
 
                 end % }}}
                 function marshall(obj,fid) % {{{
                         WriteData(fid,'object',obj,'fieldname','isautodiff','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','forward','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','reverse','format','Boolean');
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/autodiff.py

@@ -17 +17 @@
                 # {{{ Properties
                 self.isautodiff = False
-                self.forward    = True
-                self.reverse    = False
 
                 #set defaults
@@ -28 +26 @@
                 string='   automatic differentiation parameters:'
                 string="%s\n%s"%(string,fielddisplay(self,'isautodiff','indicates if the automatic differentiation is activated'))
-                string="%s\n%s"%(string,fielddisplay(self,'forward','forward differentiation'))
-                string="%s\n%s"%(string,fielddisplay(self,'reverse','backward differentiation'))
                 return string
                 #}}}
@@ -43 +39 @@
         def marshall(self,fid):    # {{{
                 WriteData(fid,'object',self,'fieldname','isautodiff','format','Boolean')
-                WriteData(fid,'object',self,'fieldname','forward','format','Boolean')
-                WriteData(fid,'object',self,'fieldname','reverse','format','Boolean')
         # }}}
 

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -9 +9 @@
 """
 
-def AutodiffForwardEnum():
-        """
-        AUTODIFFFORWARDENUM - Enum of AutodiffForward
-
-           Usage:
-              macro=AutodiffForwardEnum()
-        """
-
-        return StringToEnum('AutodiffForward')[0]
-
 def AutodiffIsautodiffEnum():
         """
@@ -29 +19 @@
         return StringToEnum('AutodiffIsautodiff')[0]
 
-def AutodiffReverseEnum():
-        """
-        AUTODIFFREVERSEENUM - Enum of AutodiffReverse
-
-           Usage:
-              macro=AutodiffReverseEnum()
-        """
-
-        return StringToEnum('AutodiffReverse')[0]
-
 def BalancethicknessSpcthicknessEnum():
         """
@@ -4627 +4607 @@
         """
 
-        return 461
-
+        return 459
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=461;
+macro=459;