Changeset 9902

Timestamp:

09/23/11 10:05:46 (13 years ago)

Author:

seroussi

Message:

changed analysis to isautodiff is class autodiff

Location:

issm/trunk/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) (1 diff)
• m/classes/autodiff.m (modified) (2 diffs)
• m/enum/AutodiffAnalysisEnum.m (deleted)
• m/enum/AutodiffIsautodiffEnum.m (added)

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

@@ -144 +144 @@
         BathymetryEnum,
         SurfaceEnum,
-        AutodiffAnalysisEnum, 
+        AutodiffIsautodiffEnum, 
         AutodiffForwardEnum,
         AutodiffReverseEnum,

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

@@ -148 +148 @@
                 case BathymetryEnum : return "Bathymetry";
                 case SurfaceEnum : return "Surface";
-                case AutodiffAnalysisEnum : return "AutodiffAnalysis";
+                case AutodiffIsautodiffEnum : return "AutodiffIsautodiff";
                 case AutodiffForwardEnum : return "AutodiffForward";
                 case AutodiffReverseEnum : return "AutodiffReverse";

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

@@ -78 +78 @@
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(AutodiffAnalysisEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffForwardEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffReverseEnum));

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

@@ -146 +146 @@
         else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum;
         else if (strcmp(name,"Surface")==0) return SurfaceEnum;
-        else if (strcmp(name,"AutodiffAnalysis")==0) return AutodiffAnalysisEnum;
+        else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
         else if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum;
         else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum;

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

@@ -6 +6 @@
 classdef autodiff
         properties (SetAccess=public) 
-                analysis = modelfield('default',false,'marshall',true,'format','Boolean');
-                forward = modelfield('default',true,'marshall',true,'format','Boolean');
-                reverse = modelfield('default',false,'marshall',true,'format','Boolean');
+                isautodiff = modelfield('default',false,'marshall',true,'format','Boolean');
+                forward    = modelfield('default',true,'marshall',true,'format','Boolean');
+                reverse    = modelfield('default',false,'marshall',true,'format','Boolean');
         end
         methods
@@ -41 +41 @@
                         disp(sprintf('   automatic differentiation parameters:'));
 
-                        fielddisplay(obj,'analysis','indicates if the automatic differentiation is activated');
+                        fielddisplay(obj,'isautodiff','indicates if the automatic differentiation is activated');
                         fielddisplay(obj,'forward','forward differentiation');
                         fielddisplay(obj,'reverse','backward differentiation');