Changeset 14689

Timestamp:

04/22/13 09:39:37 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: sync Enums and renamed NoneAnalysis to DefaultAnalysis in md.toolkits

Location:

issm/trunk-jpl/src/m

Files:

• classes/toolkits.m (modified) (2 diffs)
• classes/toolkits.py (modified) (1 diff)
• enum/DefaultAnalysisEnum.m (added)
• enum/EnumDefinitions.py (modified) (7 diffs)
• enum/IceFrontTypeEnum.m (added)
• enum/MaximumNumberOfEnums.m (modified) (1 diff)
• enum/NumericalfluxTypeEnum.m (added)
• enum/RiftfrontTypeEnum.m (added)
• enum/TypeEnum.m (deleted)

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

@@ -6 +6 @@
 classdef toolkits < dynamicprops
     properties (SetAccess=public) 
-                 NoneAnalysis           = struct();
+                 DefaultAnalysis           = struct();
                  %The other properties are dynamic
          end
@@ -41 +41 @@
                          %MUMPS is the default toolkits
                          if ismumps(),
-                                 obj.NoneAnalysis           = mumpsoptions();
+                                 obj.DefaultAnalysis           = mumpsoptions();
                          else
-                                 obj.NoneAnalysis           = iluasmoptions();
+                                 obj.DefaultAnalysis           = iluasmoptions();
                          end
 

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

@@ -19 +19 @@
                 #MUMPS is the default toolkits
                 if ismumps():
-                        self.NoneAnalysis           = mumpsoptions()
+                        self.DefaultAnalysis           = mumpsoptions()
                 else:
-                        self.NoneAnalysis           = iluasmoptions()
+                        self.DefaultAnalysis           = iluasmoptions()
 
                 #The other properties are dynamic

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

@@ -2279 +2279 @@
         return StringToEnum('AnalysisCounter')[0]
 
+def NoneAnalysisEnum():
+        """
+        NONEANALYSISENUM - Enum of NoneAnalysis
+
+           Usage:
+              macro=NoneAnalysisEnum()
+        """
+
+        return StringToEnum('NoneAnalysis')[0]
+
+def DefaultAnalysisEnum():
+        """
+        DEFAULTANALYSISENUM - Enum of DefaultAnalysis
+
+           Usage:
+              macro=DefaultAnalysisEnum()
+        """
+
+        return StringToEnum('DefaultAnalysis')[0]
+
 def BalancethicknessAnalysisEnum():
         """
@@ -2469 +2489 @@
         return StringToEnum('MeltingAnalysis')[0]
 
-def NoneAnalysisEnum():
-        """
-        NONEANALYSISENUM - Enum of NoneAnalysis
-
-           Usage:
-              macro=NoneAnalysisEnum()
-        """
-
-        return StringToEnum('NoneAnalysis')[0]
-
 def PrognosticAnalysisEnum():
         """
@@ -3019 +3029 @@
         return StringToEnum('TransientParam')[0]
 
+def IceFrontTypeEnum():
+        """
+        ICEFRONTTYPEENUM - Enum of IceFrontType
+
+           Usage:
+              macro=IceFrontTypeEnum()
+        """
+
+        return StringToEnum('IceFrontType')[0]
+
 def MacAyeal2dIceFrontEnum():
         """
@@ -3089 +3109 @@
         return StringToEnum('Numericalflux')[0]
 
+def NumericalfluxTypeEnum():
+        """
+        NUMERICALFLUXTYPEENUM - Enum of NumericalfluxType
+
+           Usage:
+              macro=NumericalfluxTypeEnum()
+        """
+
+        return StringToEnum('NumericalfluxType')[0]
+
 def ParamEnum():
         """
@@ -3199 +3229 @@
         return StringToEnum('Riftfront')[0]
 
+def RiftfrontTypeEnum():
+        """
+        RIFTFRONTTYPEENUM - Enum of RiftfrontType
+
+           Usage:
+              macro=RiftfrontTypeEnum()
+        """
+
+        return StringToEnum('RiftfrontType')[0]
+
 def SegmentEnum():
         """
@@ -3849 +3889 @@
         return StringToEnum('ThicknessAbsMisfit')[0]
 
-def TypeEnum():
-        """
-        TYPEENUM - Enum of Type
-
-           Usage:
-              macro=TypeEnum()
-        """
-
-        return StringToEnum('Type')[0]
-
 def VelEnum():
         """
@@ -5167 +5197 @@
         """
 
-        return 515
-
+        return 518
+

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

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=515;
+macro=518;