Changeset 18874

Timestamp:

11/28/14 09:45:00 (11 years ago)

Author:

Eric.Larour

Message:

NEW: new enums for:
-files whose names we now want to record (new FemModel constructor two commits ago).

• output definitions which now need an associated enum (from Outputdefinition1Enum to Outputdefinition10Enum).

Location:

issm/trunk-jpl/src/m/enum

Files:

• EnumDefinitions.py (modified) (3 diffs)
• InputFileNameEnum.m (added)
• MassconDefinitionenumEnum.m (added)
• MassconaxpbyDefinitionenumEnum.m (added)
• MassfluxatgateDefinitionenumEnum.m (added)
• MisfitDefinitionenumEnum.m (added)
• Outputdefinition10Enum.m (added)
• Outputdefinition1Enum.m (added)
• Outputdefinition2Enum.m (added)
• Outputdefinition3Enum.m (added)
• Outputdefinition4Enum.m (added)
• Outputdefinition5Enum.m (added)
• Outputdefinition6Enum.m (added)
• Outputdefinition7Enum.m (added)
• Outputdefinition8Enum.m (added)
• Outputdefinition9Enum.m (added)
• RootPathEnum.m (added)
• ToolkitsFileNameEnum.m (added)

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

@@ -484 +484 @@
 def MassconEnum(): return StringToEnum("Masscon")[0]
 def MassconNameEnum(): return StringToEnum("MassconName")[0]
+def MassconDefinitionenumEnum(): return StringToEnum("MassconDefinitionenum")[0]
 def MassconLevelsetEnum(): return StringToEnum("MassconLevelset")[0]
 def MassconaxpbyEnum(): return StringToEnum("Massconaxpby")[0]
 def MassconaxpbyNameEnum(): return StringToEnum("MassconaxpbyName")[0]
+def MassconaxpbyDefinitionenumEnum(): return StringToEnum("MassconaxpbyDefinitionenum")[0]
 def MassconaxpbyNamexEnum(): return StringToEnum("MassconaxpbyNamex")[0]
 def MassconaxpbyNameyEnum(): return StringToEnum("MassconaxpbyNamey")[0]
@@ -648 +650 @@
 def WaterColumnOldEnum(): return StringToEnum("WaterColumnOld")[0]
 def OutputdefinitionEnum(): return StringToEnum("Outputdefinition")[0]
+def Outputdefinition1Enum(): return StringToEnum("Outputdefinition1")[0]
+def Outputdefinition2Enum(): return StringToEnum("Outputdefinition2")[0]
+def Outputdefinition3Enum(): return StringToEnum("Outputdefinition3")[0]
+def Outputdefinition4Enum(): return StringToEnum("Outputdefinition4")[0]
+def Outputdefinition5Enum(): return StringToEnum("Outputdefinition5")[0]
+def Outputdefinition6Enum(): return StringToEnum("Outputdefinition6")[0]
+def Outputdefinition7Enum(): return StringToEnum("Outputdefinition7")[0]
+def Outputdefinition8Enum(): return StringToEnum("Outputdefinition8")[0]
+def Outputdefinition9Enum(): return StringToEnum("Outputdefinition9")[0]
+def Outputdefinition10Enum(): return StringToEnum("Outputdefinition10")[0]
 def OutputdefinitionListEnum(): return StringToEnum("OutputdefinitionList")[0]
 def MassfluxatgateEnum(): return StringToEnum("Massfluxatgate")[0]
 def MassfluxatgateNameEnum(): return StringToEnum("MassfluxatgateName")[0]
+def MassfluxatgateDefinitionenumEnum(): return StringToEnum("MassfluxatgateDefinitionenum")[0]
 def MassfluxatgateSegmentsEnum(): return StringToEnum("MassfluxatgateSegments")[0]
 def MisfitNameEnum(): return StringToEnum("MisfitName")[0]
+def MisfitDefinitionenumEnum(): return StringToEnum("MisfitDefinitionenum")[0]
 def MisfitModelEnumEnum(): return StringToEnum("MisfitModelEnum")[0]
 def MisfitObservationEnum(): return StringToEnum("MisfitObservation")[0]
@@ -711 +725 @@
 def OldGradientEnum(): return StringToEnum("OldGradient")[0]
 def OutputFilePointerEnum(): return StringToEnum("OutputFilePointer")[0]
+def ToolkitsFileNameEnum(): return StringToEnum("ToolkitsFileName")[0]
+def RootPathEnum(): return StringToEnum("RootPath")[0]
 def OutputFileNameEnum(): return StringToEnum("OutputFileName")[0]
+def InputFileNameEnum(): return StringToEnum("InputFileName")[0]
 def LockFileNameEnum(): return StringToEnum("LockFileName")[0]
 def ToolkitsOptionsAnalysesEnum(): return StringToEnum("ToolkitsOptionsAnalyses")[0]