dev

Author: davidhassell

cf/read_write/um/umread.py

@@ -3529,7 +3529,7 @@ def is_um_file(self, filename):
         """
         try:
             self.file_open(filename)
-        except Exception:
+        except Exception as error:
             self.file_close()
             return False
         else:
@@ -3568,7 +3568,6 @@ def file_open(self, filename):
             byte_ordering=g.get("byte_ordering"),
             word_size=g.get("word_size"),
             fmt=g.get("fmt"),
-            parse=True,
         )
 
 

cf/umread_lib/umfile.py

@@ -10,6 +10,10 @@
 class UMFileException(Exception):
     pass
 
+# Integer header pointers
+LBLREC = 14
+LBPACK = 20
+LBEGIN = 28
 
 class File:
     """A class for a UM file that gives a view of the file including
@@ -322,7 +326,7 @@ def from_file_and_offsets(
 
         if data_offset is None:
             # Calculate the data offset from the integer header
-            if PP:
+            if file.fmt == "PP":
                 # We only support 64-word headers, so the data starts
                 # 66 words after the header_offset, i.e. 64 words of the
                 # header, plus 2 block control words.