Legacy parser: remove magic < 9 logic

Author: amorison

stagpy/stagyyparsers.py

@@ -370,52 +370,46 @@ def fields(fieldfile, only_header=False, only_istep=False):
 
         magic %= 100
         if magic < 9:
-            # the rest of the parser still check lower values in case this
-            # constraint is alleviated
             raise ParsingError(fieldfile, 'magic < 9 not supported')
 
         # extra ghost point in horizontal direction
-        header['xyp'] = int(magic >= 9 and nval == 4)
+        header['xyp'] = int(nval == 4)  # magic >= 9
 
         # total number of values in relevant space basis
         # (e1, e2, e3) = (theta, phi, radius) in spherical geometry
         #              = (x, y, z)            in cartesian geometry
         header['nts'] = readbin(nwords=3)
 
         # number of blocks, 2 for yinyang or cubed sphere
-        header['ntb'] = readbin() if magic >= 7 else 1
+        header['ntb'] = readbin()  # magic >= 7
 
         # aspect ratio
         header['aspect'] = readbin('f', 2)
 
         # number of parallel subdomains
         header['ncs'] = readbin(nwords=3)  # (e1, e2, e3) space
-        header['ncb'] = readbin() if magic >= 8 else 1  # blocks
+        header['ncb'] = readbin()  # magic >= 8, blocks
 
         # r - coordinates
         # rgeom[0:self.nrtot+1, 0] are edge radial position
         # rgeom[0:self.nrtot, 1] are cell-center radial position
-        if magic >= 2:
-            header['rgeom'] = readbin('f', header['nts'][2] * 2 + 1)
-        else:
-            header['rgeom'] = np.array(range(0, header['nts'][2] * 2 + 1))\
-                * 0.5 / header['nts'][2]
+        header['rgeom'] = readbin('f', header['nts'][2] * 2 + 1)  # magic >= 2
         header['rgeom'] = np.resize(header['rgeom'], (header['nts'][2] + 1, 2))
 
-        header['rcmb'] = readbin('f') if magic >= 7 else None
+        header['rcmb'] = readbin('f')  # magic >= 7
 
-        header['ti_step'] = readbin() if magic >= 3 else 0
+        header['ti_step'] = readbin()  # magic >= 3
         if only_istep:
             return header['ti_step']
-        header['ti_ad'] = readbin('f') if magic >= 3 else 0
-        header['erupta_total'] = readbin('f') if magic >= 5 else 0
-        header['bot_temp'] = readbin('f') if magic >= 6 else 1
+        header['ti_ad'] = readbin('f')  # magic >= 3
+        header['erupta_total'] = readbin('f')  # magic >= 5
+        header['bot_temp'] = readbin('f')  # magic >= 6
         header['core_temp'] = readbin('f') if magic >= 10 else 1
 
-        if magic >= 4:
-            header['e1_coord'] = readbin('f', header['nts'][0])
-            header['e2_coord'] = readbin('f', header['nts'][1])
-            header['e3_coord'] = readbin('f', header['nts'][2])
+        # magic >= 4
+        header['e1_coord'] = readbin('f', header['nts'][0])
+        header['e2_coord'] = readbin('f', header['nts'][1])
+        header['e3_coord'] = readbin('f', header['nts'][2])
 
         if only_header:
             return header