Allow a field to be found in different h5 files

This is done to search for the dynamic pressure in Pressure instead of
Dynamic_Pressure if required.

Author: amorison

stagpy/_step.py

@@ -267,18 +267,22 @@ def _get_raw_data(self, name):
         if fieldfile.is_file():
             parsed_data = stagyyparsers.fields(fieldfile)
         elif self.step.sdat.hdf5 and self._filesh5:
-            for filestem, list_fvar in self._filesh5.items():
-                if name in list_fvar:
+            # files in which the requested data can be found
+            files = [(stem, fvars) for stem, fvars in self._filesh5.items()
+                     if name in fvars]
+            for filestem, list_fvar in files:
+                if filestem in phyvars.SFIELD_FILES_H5:
+                    xmff = 'Data{}.xmf'.format(
+                        'Bottom' if name.endswith('bot') else 'Surface')
+                    header = self._header
+                else:
+                    xmff = 'Data.xmf'
+                    header = None
+                parsed_data = stagyyparsers.read_field_h5(
+                    self.step.sdat.hdf5 / xmff, filestem,
+                    self.step.isnap, header)
+                if parsed_data is not None:
                     break
-            if filestem in phyvars.SFIELD_FILES_H5:
-                xmff = 'Data{}.xmf'.format(
-                    'Bottom' if name.endswith('bot') else 'Surface')
-                header = self._header
-            else:
-                xmff = 'Data.xmf'
-                header = None
-            parsed_data = stagyyparsers.read_field_h5(
-                self.step.sdat.hdf5 / xmff, filestem, self.step.isnap, header)
         return list_fvar, parsed_data
 
     def _set(self, name, fld):

stagpy/phyvars.py

@@ -69,6 +69,10 @@
     ('Temperature', ['T']),
     ('Velocity', ['v1', 'v2', 'v3']),
     ('Dynamic_Pressure', ['p']),
+    # Depending on the version of StagYY and whether total pressure is used,
+    # the dynamic pressure might be written in this file instead.  It will be
+    # used as fallback by _step._Fields._get_raw_data.
+    ('Pressure', ['p']),
     ('Composition', ['c']),
     ('IronContent', ['cFe']),
     ('HPE', ['hpe']),