Changeset 14629

Timestamp:

04/17/13 11:08:27 (12 years ago)

Author:

Eric.Larour

Message:

CHG: updating enums to reflect change from petsc to toolkits options

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/PetscOptionsAnalysesEnum.m (deleted)
• m/enum/PetscOptionsStringsEnum.m (deleted)
• m/enum/ToolkitsOptionsAnalysesEnum.m (added)
• m/enum/ToolkitsOptionsStringsEnum.m (added)

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

@@ -533 +533 @@
         OutputFileNameEnum,
         LockFileNameEnum,
-        PetscOptionsAnalysesEnum,
-        PetscOptionsStringsEnum,
+        ToolkitsOptionsAnalysesEnum,
+        ToolkitsOptionsStringsEnum,
         QmuErrNameEnum,
         QmuInNameEnum,

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

@@ -510 +510 @@
                 case OutputFileNameEnum : return "OutputFileName";
                 case LockFileNameEnum : return "LockFileName";
-                case PetscOptionsAnalysesEnum : return "PetscOptionsAnalyses";
-                case PetscOptionsStringsEnum : return "PetscOptionsStrings";
+                case ToolkitsOptionsAnalysesEnum : return "ToolkitsOptionsAnalyses";
+                case ToolkitsOptionsStringsEnum : return "ToolkitsOptionsStrings";
                 case QmuErrNameEnum : return "QmuErrName";
                 case QmuInNameEnum : return "QmuInName";

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

@@ -523 +523 @@
               else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
               else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
-              else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
-              else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
+              else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
+              else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
               else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
               else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;

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

@@ -4939 +4939 @@
         return StringToEnum('LockFileName')[0]
 
-def PetscOptionsAnalysesEnum():
-        """
-        PETSCOPTIONSANALYSESENUM - Enum of PetscOptionsAnalyses
-
-           Usage:
-              macro=PetscOptionsAnalysesEnum()
-        """
-
-        return StringToEnum('PetscOptionsAnalyses')[0]
-
-def PetscOptionsStringsEnum():
-        """
-        PETSCOPTIONSSTRINGSENUM - Enum of PetscOptionsStrings
-
-           Usage:
-              macro=PetscOptionsStringsEnum()
-        """
-
-        return StringToEnum('PetscOptionsStrings')[0]
+def ToolkitsOptionsAnalysesEnum():
+        """
+        TOOLKITSOPTIONSANALYSESENUM - Enum of ToolkitsOptionsAnalyses
+
+           Usage:
+              macro=ToolkitsOptionsAnalysesEnum()
+        """
+
+        return StringToEnum('ToolkitsOptionsAnalyses')[0]
+
+def ToolkitsOptionsStringsEnum():
+        """
+        TOOLKITSOPTIONSSTRINGSENUM - Enum of ToolkitsOptionsStrings
+
+           Usage:
+              macro=ToolkitsOptionsStringsEnum()
+        """
+
+        return StringToEnum('ToolkitsOptionsStrings')[0]
 
 def QmuErrNameEnum():