Changeset 16407

Timestamp:

10/15/13 09:46:08 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renaming OutputdefinitionEnumsEnum OutputdefinitionListEnum (Enum should not be part of the name. this creates problems in matlab's version

Location:

issm/trunk-jpl/src

Files:

• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/outputdefinition.m (modified) (1 diff)
• m/classes/outputdefinition.py (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/OutputdefinitionEnumsEnum.m (deleted)
• m/enum/OutputdefinitionListEnum.m (added)

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

@@ -548 +548 @@
         /*Output Definitions{{{*/
         OutputdefinitionEnum,
-        OutputdefinitionEnumsEnum,
+        OutputdefinitionListEnum,
         MassfluxatgateEnum,
         MassfluxatgateNameEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -536 +536 @@
                 case WaterColumnOldEnum : return "WaterColumnOld";
                 case OutputdefinitionEnum : return "Outputdefinition";
-                case OutputdefinitionEnumsEnum : return "OutputdefinitionEnums";
+                case OutputdefinitionListEnum : return "OutputdefinitionList";
                 case MassfluxatgateEnum : return "Massfluxatgate";
                 case MassfluxatgateNameEnum : return "MassfluxatgateName";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -548 +548 @@
               else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
               else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
-              else if (strcmp(name,"OutputdefinitionEnums")==0) return OutputdefinitionEnumsEnum;
+              else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
               else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
               else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;

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

@@ -47 +47 @@
                 enums=unique(enums);
                 
-                WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1);
+                WriteData(fid,'data',enums,'enum',OutputdefinitionListEnum(),'format','DoubleMat','mattype',1);
                 end % }}}
         end

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

@@ -46 +46 @@
                 enums=npy.unique(enums);
                 
-                WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1);
+                WriteData(fid,'data',enums,'enum',OutputdefinitionListEnum(),'format','DoubleMat','mattype',1);
         # }}}

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

@@ -528 +528 @@
 def WaterColumnOldEnum(): return StringToEnum("WaterColumnOld")[0]
 def OutputdefinitionEnum(): return StringToEnum("Outputdefinition")[0]
-def OutputdefinitionEnumsEnum(): return StringToEnum("OutputdefinitionEnums")[0]
+def OutputdefinitionListEnum(): return StringToEnum("OutputdefinitionList")[0]
 def MassfluxatgateEnum(): return StringToEnum("Massfluxatgate")[0]
 def MassfluxatgateNameEnum(): return StringToEnum("MassfluxatgateName")[0]