Merge pull request OpenMDAO#331 from jkirk5/cleanup

Engine deck conversion bugfix

aviary/utils/engine_deck_conversion.py

@@ -290,7 +290,7 @@ def EngineDeckConverter(input_file, output_file, data_format: EngineDeckType):
         formatted_data[key] = data[key].astype(float)
 
     # convert engine_data from dict to list so it can be sorted
-    sorted_values = np.array([formatted_data[key] for key in formatted_data]).transpose()
+    sorted_values = np.array(list(formatted_data.values())).transpose()
 
     # Sort by mach, then altitude, then throttle, then hybrid throttle
     sorted_values = sorted_values[np.lexsort(
@@ -300,14 +300,11 @@ def EngineDeckConverter(input_file, output_file, data_format: EngineDeckType):
     for idx, key in enumerate(formatted_data):
         formatted_data[key] = sorted_values[:, idx]
 
-    # rework formatted_data into 2d array
-    formatted_data = np.array([formatted_data[key]
-                              for key in header.keys()]).transpose().astype(float)
-
     # store formatted data into NamedValues object
     write_data = NamedValues()
-    for idx, key in enumerate(data):
-        write_data.set_val(header_names[key], data[key], default_units[key])
+
+    for key in data:
+        write_data.set_val(header_names[key], formatted_data[key], default_units[key])
 
     write_data_file(output_file, write_data, comments, include_timestamp=False)
 

aviary/utils/test/test_engine_deck_conversion.py

@@ -65,6 +65,7 @@ def compare_files(self, filepath, skip_list=[]):
                     exc_string = f'Error:  {filename}\nFound: {line_no_whitespace}\nExpected:  {expected_line}'
                     raise Exception(exc_string)
 
+    # TODO currently untested!!
     # def test_TF_conversion(self):
     #     return