[Python] Fix FlameBase.set_initial_guess from HDF

ischoegl · ischoegl · commit a2f2fff319cb · 2022-06-09T08:05:07.000-05:00
diff --git a/interfaces/cython/cantera/onedim.py b/interfaces/cython/cantera/onedim.py
@@ -106,10 +106,14 @@ def set_initial_guess(self, *args, data=None, group=None, **kwargs):
         :param data:
             Restart data, which are typically based on an earlier simulation
             result. Restart data may be specified using a `SolutionArray`,
-            `pandas.DataFrame`, or the path to a previously saved CSV file.
+            `pandas.DataFrame`, or previously saved CSV or HDF container files.
             Note that restart data do not overwrite boundary conditions.
-            DataFrame input requires a working installation of *pandas*, which
-            can be installed using pip or conda.
+            DataFrame input requires a working installation of *pandas*, whereas
+            HDF input requires an installation of *h5py*. These packages can be
+            installed using pip or conda (``pandas`` and ``h5py``, respectively).
+        :param group:
+            Group identifier within a HDF container file (only used in
+            combination with HDF restart data).
         """
         super().set_initial_guess(*args, data=data, group=group, **kwargs)
         if data is None:
@@ -121,14 +125,16 @@ def set_initial_guess(self, *args, data=None, group=None, **kwargs):
             arr = data
 
         elif isinstance(data, str):
-            if data.endswith('.csv'):
+            if data.endswith('.hdf5') or data.endswith('.h5'):
+                # data source identifies a HDF file
+                arr = SolutionArray(self.gas, extra=self.other_components())
+                arr.read_hdf(data, group=group, subgroup=self.domains[1].name)
+            elif data.endswith('.csv'):
                 # data source identifies a CSV file
                 arr = SolutionArray(self.gas, extra=self.other_components())
                 arr.read_csv(data)
             else:
-                raise ValueError(
-                    f"'{data}' does not identify CSV file ending with '.csv'."
-                )
+                raise ValueError(f"'{data}' does not identify CSV or HDF file.")
         else:
             # data source is presumably a pandas DataFrame
             arr = SolutionArray(self.gas, extra=self.other_components())
