dev

Author: davidhassell

cf/data/array/umarray.py

@@ -280,12 +280,12 @@ def _get_rec(self, f, header_offset):
         # code, then you must aslo set 'parse=True' in the `open`
         # method.
         # ------------------------------------------------------------
-        
+
         # for v in f.vars:
         #     for r in v.recs:
         #         if r.hdr_offset == header_offset:
         #             return r
-                
+
     def _set_units(self, int_hdr):
         """The units and calendar properties.
 

cf/read_write/um/umread.py

@@ -480,7 +480,6 @@ class UMField:
 
     def __init__(
         self,
-            f,
         var,
         fmt,
         byte_ordering,
@@ -498,8 +497,6 @@ def __init__(
 
         :Parameters:
 
-            f: `umfile.File`
-
             var: `umfile.Var`
 
             byte_ordering: `str`
@@ -556,7 +553,6 @@ def __init__(
 
         self.verbose = verbose
 
-        self.f = f
         self.fmt = fmt
         self.height_at_top_of_model = height_at_top_of_model
         self.byte_ordering = byte_ordering
@@ -2469,10 +2465,8 @@ def data_type_in_file(self, rec):
             `numpy.dtype`
 
         """
-        int_hdr = rec.int_hdr
-        
         # Find the data type
-        if int_hdr.item(lbuser2) == 3:
+        if rec.int_hdr.item(lbuser2) == 3:
             # Boolean
             return np.dtype(bool)
 
@@ -3451,7 +3445,6 @@ def read(
 
         um = [
             UMField(
-                f,
                 var,
                 f.fmt,
                 f.byte_ordering,
@@ -3500,6 +3493,7 @@ def _open_um_file(
                 byte_ordering=byte_ordering,
                 word_size=word_size,
                 fmt=fmt,
+                parse=True
             )
         except Exception as error:
             try:
@@ -3574,7 +3568,7 @@ def file_open(self, filename):
             byte_ordering=g.get("byte_ordering"),
             word_size=g.get("word_size"),
             fmt=g.get("fmt"),
-            parse=True
+            parse=True,
         )
 
 

cf/umread_lib/c-lib/bits/type_dep_protos.h

@@ -12,12 +12,6 @@ int get_var_gridcode(const INTEGER *int_hdr);
 int get_var_packing(const INTEGER *int_hdr);
 REAL get_var_real_fill_value(const REAL *int_hdr);
 
-/* int my_get_extra_data_length(const INTEGER *int_hdr);
-int my_get_num_data_words(const INTEGER *int_hdr);
-int my_get_ff_disk_length(const INTEGER *int_hdr); */
-
-
-
 /* read.c */
 
 size_t read_words(int fd, 

cf/umread_lib/c-lib/type-dep/interpret_header.c

@@ -139,4 +139,3 @@ REAL get_var_real_fill_value(const REAL *real_hdr)
 {
   return real_hdr[INDEX_BMDI];
 }
-

cf/umread_lib/c-lib/umfile.c

@@ -18,7 +18,6 @@ int get_type_and_num_words(int word_size,
     default:
       return -1;
     }
-  
 }
 
 int get_extra_data_offset_and_length(int word_size, 
@@ -164,10 +163,3 @@ int read_record_data(int fd,
   /* invalid word size falls through to error return */
   ERRBLKI;
 }
-
-
-/* Get the word address of the current file position. */
-int file_pos(int fd)
-{
-  return lseek(fd, 0, SEEK_CUR);
-}

cf/umread_lib/cInterface.py

@@ -377,7 +377,6 @@ def c_rec_to_py_rec(self, c_rec_p):
         header_offset = c_rec.header_offset
         data_offset = c_rec.data_offset
         disk_length = c_rec.disk_length
-
         return umfile.Rec(
             int_hdr, real_hdr, header_offset, data_offset, disk_length
         )

cf/umread_lib/umfile.py

@@ -11,15 +11,6 @@ class UMFileException(Exception):
     pass
 
 
-LBLREC = 14
-LBROW = 17
-LBNPT = 18
-LBEXT = 19
-LBPACK = 20
-LBEGIN = 28
-LBNREC = 29
-
-
 class File:
     """A class for a UM file that gives a view of the file including
     sets of PP records combined into variables."""
@@ -328,8 +319,7 @@ def from_file_and_offsets(
         int_hdr, real_hdr = c.read_header(
             file.fd, header_offset, file.byte_ordering, word_size
         )
-        PP =  file.fmt == "PP"
-        
+
         if data_offset is None:
             # Calculate the data offset from the integer header
             if PP:
@@ -348,9 +338,14 @@ def from_file_and_offsets(
                 disk_length = int_hdr[LBLREC] * 4
             else:
                 disk_length = int_hdr[LBLREC] * word_size
-          
+
         return cls(
-            int_hdr, real_hdr, header_offset, data_offset, disk_length, file=file
+            int_hdr,
+            real_hdr,
+            header_offset,
+            data_offset,
+            disk_length,
+            file=file,
         )
 
     def read_extra_data(self):