Changeset 23768

Timestamp:

03/06/19 15:21:43 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: recordlength is now int64

File:

• issm/trunk-jpl/src/m/solve/WriteData.py (modified) (9 diffs)

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

@@ -65 +65 @@
 
                 #first write length of record
-                fid.write(pack('i',4+4))  #1 bool (disguised as an int)+code
+                fid.write(pack('q',4+4))  #1 bool (disguised as an int)+code
 
                 #write data code:
@@ -79 +79 @@
 
                 #first write length of record
-                fid.write(pack('i',4+4))  #1 integer + code
+                fid.write(pack('q',4+4))  #1 integer + code
 
                 #write data code:
@@ -93 +93 @@
 
                 #first write length of record
-                fid.write(pack('i',8+4))  #1 double+code
+                fid.write(pack('q',8+4))  #1 double+code
 
                 #write data code:
@@ -104 +104 @@
         elif datatype=='String':    # {{{
                 #first write length of record
-                fid.write(pack('i',len(data)+4+4))  #string + string size + code
+                fid.write(pack('q',len(data)+4+4))  #string + string size + code
 
                 #write data code:
@@ -133 +133 @@
 
                 #first write length of record
-                fid.write(pack('i',4+4+8*np.product(s)+4+4))    #2 integers (32 bits) + the double matrix + code + matrix type
+                fid.write(pack('q',4+4+8*np.product(s)+4+4))    #2 integers (32 bits) + the double matrix + code + matrix type
 
                 #write data code and matrix type:
@@ -176 +176 @@
                         raise ValueError('field {} cannot be marshalled because it is larger than 4^31 bytes!'.format(enum))
 
-                fid.write(pack('i',recordlength))  #2 integers (32 bits) + the double matrix + code + matrix type
+                fid.write(pack('q',recordlength))  #2 integers (32 bits) + the double matrix + code + matrix type
 
                 #write data code and matrix type:
@@ -225 +225 @@
                         raise ValueError('field %s cannot be marshalled because it is larger than 4^31 bytes!' % enum)
 
-                fid.write(pack('i',recordlength))  #2 integers (32 bits) + the matrix + code + matrix type
+                fid.write(pack('q',recordlength))  #2 integers (32 bits) + the matrix + code + matrix type
 
                 #write data code and matrix type:
@@ -285 +285 @@
 
                 #write length of record
-                fid.write(pack('i',recordlength))
+                fid.write(pack('q',recordlength))
 
                 #write data code:
@@ -324 +324 @@
 
                 #write length of record
-                fid.write(pack('i',recordlength))
+                fid.write(pack('q',recordlength))
 
                 #write data code: