Changeset 21144

Timestamp:

08/17/16 08:36:57 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no more ENums

Location:

issm/trunk-jpl/src/m

Files:

• modules/EnumToString.m (deleted)
• modules/EnumToString.py (deleted)
• modules/StringToEnum.m (deleted)
• modules/StringToEnum.py (deleted)
• solve/WriteData.m (modified) (5 diffs)
• solve/WriteData.py (modified) (3 diffs)

issm/trunk-jpl/src/m/solve/WriteData.m

@@ -52 +52 @@
 %Step 2: write the data itself.
 if     strcmpi(format,'Boolean'),% {{{
-        if(numel(data)~=1), error(['field ' EnumToString(enum) ' cannot be marshalled as it has more than one element!']); end
+        if(numel(data)~=1), error(['field ' name ' cannot be marshalled as it has more than one element!']); end
 
         %first write length of record
@@ -64 +64 @@
         % }}}
 elseif strcmpi(format,'Integer'), % {{{
-        if(numel(data)~=1), error(['field ' EnumToString(enum) ' cannot be marshalled as it has more than one element!']); end
+        if(numel(data)~=1), error(['field ' name ' cannot be marshalled as it has more than one element!']); end
 
         %first write length of record
@@ -76 +76 @@
         % }}}
 elseif strcmpi(format,'Double'), % {{{
-        if(numel(data)~=1), error(['field ' EnumToString(enum) ' cannot be marshalled as it has more than one element!']); end
+        if(numel(data)~=1), error(['field ' name ' cannot be marshalled as it has more than one element!']); end
 
         %first write length of record
@@ -155 +155 @@
         %first write length of record
         recordlength=4+4+8*s(1)*s(2)+4+4; %2 integers (32 bits) + the double matrix + code + matrix type
-        if recordlength>2^31; error(['field ' EnumToString(enum) ' cannot be marshalled because it is larger than 2^31 bytes!']); end
+        if recordlength>2^31; error(['field ' name ' cannot be marshalled because it is larger than 2^31 bytes!']); end
         fwrite(fid,recordlength,'int');
 
@@ -232 +232 @@
         % }}}
 else  % {{{
-        error(['WriteData error message: data type: ' num2str(format) ' not supported yet! (' EnumToString(enum) ')']);
+        error(['WriteData error message: data type: ' num2str(format) ' not supported yet! (' name ')']);
 end % }}}
 end

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -64 +64 @@
         if   m.strcmpi(format,'Boolean'):    # {{{
 #               if len(data) !=1:
-#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
+#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % name[0])
 
                 #first write length of record
@@ -78 +78 @@
         elif m.strcmpi(format,'Integer'):    # {{{
 #               if len(data) !=1:
-#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
+#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % name[0])
 
                 #first write length of record
@@ -92 +92 @@
         elif m.strcmpi(format,'Double'):    # {{{
 #               if len(data) !=1:
-#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
+#                       raise ValueError('field %s cannot be marshalled as it has more than one element!' % name[0])
 
                 #first write length of record