minor cleanup

crecine · May 29, 2024 · 9be31e1 · 9be31e1
1 parent 65987d0
commit 9be31e1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/aviary/mission/gasp_based/ode/accel_ode.py b/aviary/mission/gasp_based/ode/accel_ode.py
@@ -7,8 +7,6 @@
 from aviary.subsystems.mass.mass_to_weight import MassToWeight
 from aviary.variable_info.enums import AnalysisScheme, AnalysisScheme, SpeedType
 from aviary.variable_info.variables import Aircraft, Dynamic, Mission
-from aviary.mission.ode.specific_energy_rate import SpecificEnergyRate
-from aviary.mission.ode.altitude_rate import AltitudeRate
 from aviary.mission.gasp_based.ode.time_integration_base_classes import add_SGM_required_inputs, add_SGM_required_outputs
 
 

diff --git a/aviary/mission/gasp_based/ode/base_ode.py b/aviary/mission/gasp_based/ode/base_ode.py
@@ -123,6 +123,7 @@ def AddAlphaControl(
             )
             alpha_comp_inputs = ["required_lift", Dynamic.Mission.LIFT]
 
+        # Future controller modes
         # elif alpha_mode is AlphaModes.FLIGHT_PATH_ANGLE:
         #     alpha_comp = om.BalanceComp(
         #         name="alpha",
@@ -137,7 +138,6 @@ def AddAlphaControl(
         #     )
         #     alpha_comp_inputs = [Dynamic.Mission.FLIGHT_PATH_ANGLE]
 
-        # Future controller modes
         # elif alpha_mode is AlphaModes.ALTITUDE_RATE:
         #     alpha_comp = om.BalanceComp(
         #         name="alpha",

diff --git a/aviary/mission/gasp_based/ode/flight_path_ode.py b/aviary/mission/gasp_based/ode/flight_path_ode.py
@@ -10,8 +10,6 @@
 from aviary.mission.gasp_based.ode.params import ParamPort
 from aviary.subsystems.propulsion.propulsion_builder import PropulsionBuilderBase
 from aviary.variable_info.variables import Aircraft, Dynamic, Mission
-from aviary.mission.ode.specific_energy_rate import SpecificEnergyRate
-from aviary.mission.ode.altitude_rate import AltitudeRate
 from aviary.mission.gasp_based.ode.time_integration_base_classes import add_SGM_required_inputs
 
 

diff --git a/aviary/validation_cases/benchmark_tests/test_bench_GwGm.py b/aviary/validation_cases/benchmark_tests/test_bench_GwGm.py
@@ -99,6 +99,7 @@ def test_bench_GwGm_SNOPT_lbm_s(self):
         assert_near_equal(prob.get_val(Mission.Landing.TOUCHDOWN_MASS, units='lbm'),
                           136823.47, tolerance=rtol)
 
+    # @unittest.skipUnless(CheckForOMSubmodelFix(), 'Skipping due to OpenMDAO Submodel Bug')
     @require_pyoptsparse(optimizer="IPOPT")
     def test_bench_GwGm_shooting(self):
         from aviary.interface.default_phase_info.two_dof_fiti_copy import phase_info, \
@@ -111,7 +112,6 @@ def test_bench_GwGm_shooting(self):
 
         rtol = 0.01
 
-        print(CheckForOMSubmodelFix())
         assert_near_equal(prob.get_val(Mission.Design.RESERVE_FUEL, units='lbm'),
                           4998, tolerance=rtol)