Changeset 13427

Timestamp:

09/24/12 22:23:14 (12 years ago)

Author:

Eric.Larour

Message:

New enums for dependent and independent variables

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (4 diffs)
• m/enum/AutodiffDependentObjectNamesEnum.m (added)
• m/enum/AutodiffDependentObjectTypesEnum.m (added)
• m/enum/AutodiffDependentObjectsEnum.m (added)
• m/enum/AutodiffDependentsEnum.m (deleted)
• m/enum/AutodiffDriverEnum.m (added)
• m/enum/AutodiffFosForwardIndexEnum.m (added)
• m/enum/AutodiffFosForwardOutputEnum.m (deleted)
• m/enum/AutodiffIndependentObjectNamesEnum.m (added)
• m/enum/AutodiffIndependentObjectTypesEnum.m (added)
• m/enum/AutodiffIndependentObjectsEnum.m (added)
• m/enum/AutodiffIndependentsEnum.m (deleted)
• m/enum/AutodiffNumDependentObjectsEnum.m (added)
• m/enum/AutodiffNumIndependentObjectsEnum.m (added)
• m/enum/DataSetParamEnum.m (added)
• m/enum/DependentObjectEnum.m (added)
• m/enum/EnumDefinitions.py (modified) (8 diffs)
• m/enum/IndependentObjectEnum.m (added)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

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

@@ -13 +13 @@
         /*Model fields {{{1*/
         AutodiffIsautodiffEnum, 
-        AutodiffDependentsEnum,
         AutodiffNumDependentsEnum,
-        AutodiffIndependentsEnum,
+        AutodiffNumDependentObjectsEnum,
+        AutodiffDependentObjectNamesEnum,
+        AutodiffDependentObjectTypesEnum,
+        AutodiffDependentObjectsEnum,
         AutodiffNumIndependentsEnum,
+        AutodiffNumIndependentObjectsEnum,
+        AutodiffIndependentObjectNamesEnum,
+        AutodiffIndependentObjectTypesEnum,
+        AutodiffIndependentObjectsEnum,
         AutodiffJacobianEnum,
         AutodiffXpEnum,
-        AutodiffFosForwardOutputEnum,
+        AutodiffDriverEnum,
+        AutodiffFosForwardIndexEnum,
         BalancethicknessSpcthicknessEnum,
         BalancethicknessStabilizationEnum,
@@ -31 +38 @@
         ConstantsReferencetemperatureEnum,
         ConstantsYtsEnum,
+        DependentObjectEnum,
         DiagnosticAbstolEnum,
         DiagnosticIcefrontEnum,
@@ -70 +78 @@
         HydrologySpcwatercolumnEnum,
         HydrologyStabilizationEnum,
+        IndependentObjectEnum,
         InversionControlParametersEnum,
         InversionCostFunctionEnum,
@@ -273 +282 @@
         DofIndexingEnum,
         DoubleInputEnum,
+        DataSetParamEnum,
         DoubleMatArrayParamEnum,
         DoubleMatParamEnum,

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

@@ -19 +19 @@
         return StringToEnum('AutodiffIsautodiff')[0]
 
-def AutodiffDependentsEnum():
-        """
-        AUTODIFFDEPENDENTSENUM - Enum of AutodiffDependents
-
-           Usage:
-              macro=AutodiffDependentsEnum()
-        """
-
-        return StringToEnum('AutodiffDependents')[0]
-
 def AutodiffNumDependentsEnum():
         """
@@ -39 +29 @@
         return StringToEnum('AutodiffNumDependents')[0]
 
-def AutodiffIndependentsEnum():
-        """
-        AUTODIFFINDEPENDENTSENUM - Enum of AutodiffIndependents
-
-           Usage:
-              macro=AutodiffIndependentsEnum()
-        """
-
-        return StringToEnum('AutodiffIndependents')[0]
+def AutodiffNumDependentObjectsEnum():
+        """
+        AUTODIFFNUMDEPENDENTOBJECTSENUM - Enum of AutodiffNumDependentObjects
+
+           Usage:
+              macro=AutodiffNumDependentObjectsEnum()
+        """
+
+        return StringToEnum('AutodiffNumDependentObjects')[0]
+
+def AutodiffDependentObjectNamesEnum():
+        """
+        AUTODIFFDEPENDENTOBJECTNAMESENUM - Enum of AutodiffDependentObjectNames
+
+           Usage:
+              macro=AutodiffDependentObjectNamesEnum()
+        """
+
+        return StringToEnum('AutodiffDependentObjectNames')[0]
+
+def AutodiffDependentObjectTypesEnum():
+        """
+        AUTODIFFDEPENDENTOBJECTTYPESENUM - Enum of AutodiffDependentObjectTypes
+
+           Usage:
+              macro=AutodiffDependentObjectTypesEnum()
+        """
+
+        return StringToEnum('AutodiffDependentObjectTypes')[0]
+
+def AutodiffDependentObjectsEnum():
+        """
+        AUTODIFFDEPENDENTOBJECTSENUM - Enum of AutodiffDependentObjects
+
+           Usage:
+              macro=AutodiffDependentObjectsEnum()
+        """
+
+        return StringToEnum('AutodiffDependentObjects')[0]
 
 def AutodiffNumIndependentsEnum():
@@ -59 +79 @@
         return StringToEnum('AutodiffNumIndependents')[0]
 
+def AutodiffNumIndependentObjectsEnum():
+        """
+        AUTODIFFNUMINDEPENDENTOBJECTSENUM - Enum of AutodiffNumIndependentObjects
+
+           Usage:
+              macro=AutodiffNumIndependentObjectsEnum()
+        """
+
+        return StringToEnum('AutodiffNumIndependentObjects')[0]
+
+def AutodiffIndependentObjectNamesEnum():
+        """
+        AUTODIFFINDEPENDENTOBJECTNAMESENUM - Enum of AutodiffIndependentObjectNames
+
+           Usage:
+              macro=AutodiffIndependentObjectNamesEnum()
+        """
+
+        return StringToEnum('AutodiffIndependentObjectNames')[0]
+
+def AutodiffIndependentObjectTypesEnum():
+        """
+        AUTODIFFINDEPENDENTOBJECTTYPESENUM - Enum of AutodiffIndependentObjectTypes
+
+           Usage:
+              macro=AutodiffIndependentObjectTypesEnum()
+        """
+
+        return StringToEnum('AutodiffIndependentObjectTypes')[0]
+
+def AutodiffIndependentObjectsEnum():
+        """
+        AUTODIFFINDEPENDENTOBJECTSENUM - Enum of AutodiffIndependentObjects
+
+           Usage:
+              macro=AutodiffIndependentObjectsEnum()
+        """
+
+        return StringToEnum('AutodiffIndependentObjects')[0]
+
 def AutodiffJacobianEnum():
         """
@@ -79 +139 @@
         return StringToEnum('AutodiffXp')[0]
 
-def AutodiffFosForwardOutputEnum():
-        """
-        AUTODIFFFOSFORWARDOUTPUTENUM - Enum of AutodiffFosForwardOutput
-
-           Usage:
-              macro=AutodiffFosForwardOutputEnum()
-        """
-
-        return StringToEnum('AutodiffFosForwardOutput')[0]
+def AutodiffDriverEnum():
+        """
+        AUTODIFFDRIVERENUM - Enum of AutodiffDriver
+
+           Usage:
+              macro=AutodiffDriverEnum()
+        """
+
+        return StringToEnum('AutodiffDriver')[0]
+
+def AutodiffFosForwardIndexEnum():
+        """
+        AUTODIFFFOSFORWARDINDEXENUM - Enum of AutodiffFosForwardIndex
+
+           Usage:
+              macro=AutodiffFosForwardIndexEnum()
+        """
+
+        return StringToEnum('AutodiffFosForwardIndex')[0]
 
 def BalancethicknessSpcthicknessEnum():
@@ -199 +269 @@
         return StringToEnum('ConstantsYts')[0]
 
+def DependentObjectEnum():
+        """
+        DEPENDENTOBJECTENUM - Enum of DependentObject
+
+           Usage:
+              macro=DependentObjectEnum()
+        """
+
+        return StringToEnum('DependentObject')[0]
+
 def DiagnosticAbstolEnum():
         """
@@ -589 +669 @@
         return StringToEnum('HydrologyStabilization')[0]
 
+def IndependentObjectEnum():
+        """
+        INDEPENDENTOBJECTENUM - Enum of IndependentObject
+
+           Usage:
+              macro=IndependentObjectEnum()
+        """
+
+        return StringToEnum('IndependentObject')[0]
+
 def InversionControlParametersEnum():
         """
@@ -2539 +2629 @@
         return StringToEnum('DoubleInput')[0]
 
+def DataSetParamEnum():
+        """
+        DATASETPARAMENUM - Enum of DataSetParam
+
+           Usage:
+              macro=DataSetParamEnum()
+        """
+
+        return StringToEnum('DataSetParam')[0]
+
 def DoubleMatArrayParamEnum():
         """
@@ -4757 +4857 @@
         """
 
-        return 474
-
+        return 484
+

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

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=474;
+macro=484;