cleaned up some tests for CI failures and a couple minor changes

crecine · Jun 10, 2024 · f3918c4 · f3918c4
1 parent dfa5ac3
commit f3918c4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/aviary/examples/level2_shooting_traj.py b/aviary/examples/level2_shooting_traj.py
@@ -20,7 +20,7 @@ def custom_run_aviary(aircraft_filename, optimizer=None,
     """
     This function runs the aviary optimization problem for the specified aircraft configuration and mission.
 
-    It first creates an instance of the AviaryProblem class using the given phase_info, mission_method, and mass_method.
+    It first creates an instance of the AviaryProblem class using the given mission_method and mass_method.
     It then loads aircraft and options data from the user-provided aircraft_filename and checks for any clashing inputs.
     Pre-mission systems are added, phases are added and linked, then post-mission systems are added.
     A driver is added using the specified optimizer (The default optimizer depends on the analysis scheme).
@@ -48,7 +48,7 @@ def custom_run_aviary(aircraft_filename, optimizer=None,
             'builder': SGMCruise,
             'user_options': {
                 'mach': (0, 'unitless'),
-                'distance_trigger': (300, 'NM'),
+                'attr:distance_trigger': (500, 'NM'),
             },
         },
         'desc1': {

diff --git a/aviary/examples/test/test_level2_shooting_traj.py b/aviary/examples/test/test_level2_shooting_traj.py
@@ -1,16 +1,18 @@
+import unittest
+
+from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs
+
 from aviary.api import AnalysisScheme
 from aviary.examples.level2_shooting_traj import custom_run_aviary
-from aviary.interface.default_phase_info.two_dof import phase_info
-from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs
-import unittest
 
 
 @use_tempdirs
-@require_pyoptsparse(optimizer='IPOPT')
-def test_run_aviary():
-    input_deck = 'models/large_single_aisle_1/large_single_aisle_1_GwGm.csv'
-    custom_run_aviary(input_deck, phase_info,
-                      analysis_scheme=AnalysisScheme.SHOOTING, run_driver=False)
+class CustomTrajTestCase(unittest.TestCase):
+    @require_pyoptsparse(optimizer='IPOPT')
+    def test_run_aviary(self):
+        input_deck = 'models/large_single_aisle_1/large_single_aisle_1_GwGm.csv'
+        custom_run_aviary(
+            input_deck, analysis_scheme=AnalysisScheme.SHOOTING, run_driver=False)
 
 
 if __name__ == "__main__":

diff --git a/aviary/mission/gasp_based/phases/time_integration_traj.py b/aviary/mission/gasp_based/phases/time_integration_traj.py
@@ -60,10 +60,13 @@ def compute(self, inputs, outputs):
                 for name, data in vals_to_set.items():
                     var, units = data
                     if name.startswith('attr:'):
-                        new_val = (
-                            np.squeeze(self.convert2units(var, inputs[var], units)),
-                            units
-                        )
+                        if isinstance(var, str):
+                            new_val = (
+                                np.squeeze(self.convert2units(var, inputs[var], units)),
+                                units
+                            )
+                        else:
+                            new_val = data
                         setattr(phase, name.replace('attr:', ''), new_val)
                     elif name.startswith('rotation.'):
                         phase.rotation.set_val(name.replace(

diff --git a/aviary/mission/gasp_based/test/test_idle_descent_estimation.py b/aviary/mission/gasp_based/test/test_idle_descent_estimation.py
@@ -1,5 +1,6 @@
 import unittest
 import warnings
+import importlib
 
 import openmdao.api as om
 from aviary.interface.default_phase_info.two_dof_fiti_deprecated import create_2dof_based_descent_phases
@@ -14,7 +15,6 @@
 from aviary.variable_info.enums import Verbosity
 from aviary.utils.process_input_decks import create_vehicle
 from aviary.utils.preprocessors import preprocess_propulsion
-import importlib
 
 
 @unittest.skipUnless(importlib.util.find_spec("pyoptsparse") is not None, "pyoptsparse is not installed")