Merge branch 'main' into user_feedback_cleanup

OpenMDAO · Jan 31, 2024 · 2861e87 · 2861e87
2 parents 39b63e4 + 7cb0258
commit 2861e87
Show file tree

Hide file tree

Showing 17 changed files with 377 additions and 1,156 deletions.
diff --git a/aviary/interface/default_phase_info/two_dof.py b/aviary/interface/default_phase_info/two_dof.py
@@ -102,9 +102,8 @@
             'alt_upper': (700, 'ft'),
             'alt_ref': (1000, 'ft'),
             'alt_defect_ref': (1000, 'ft'),
-            'alt_constraint_eq': (500, 'ft'),
+            'final_altitude': (500, 'ft'),
             'alt_constraint_ref': (500, 'ft'),
-            'alt_constraint_ref0': (0, 'ft'),
             'angle_lower': (-10, 'rad'),
             'angle_upper': (20, 'rad'),
             'angle_ref': (57.2958, 'deg'),

diff --git a/aviary/interface/utils/check_phase_info.py b/aviary/interface/utils/check_phase_info.py
@@ -103,9 +103,8 @@ def check_phase_info(phase_info, mission_method):
             **common_mass,
             **common_distance,
             **common_alt,
-            'alt_constraint_eq': tuple,
+            'final_altitude': tuple,
             'alt_constraint_ref': tuple,
-            'alt_constraint_ref0': tuple,
             'alt_defect_ref': tuple,
             **common_angle,
             'pitch_constraint_lower': tuple,

diff --git a/aviary/mission/flops_based/phases/detailed_landing_phases.py b/aviary/mission/flops_based/phases/detailed_landing_phases.py
@@ -32,9 +32,8 @@
     TakeoffTrajectory as _TakeoffTrajectory
 from aviary.mission.flops_based.phases.detailed_takeoff_phases import \
     _init_initial_guess_meta_data
-from aviary.mission.phase_builder_base import (
-    InitialGuessControl, InitialGuessParameter, InitialGuessPolynomialControl,
-    InitialGuessState, PhaseBuilderBase)
+from aviary.mission.phase_builder_base import PhaseBuilderBase
+from aviary.mission.initial_guess_builders import InitialGuessControl, InitialGuessParameter, InitialGuessPolynomialControl, InitialGuessState, InitialGuessTime
 from aviary.utils.aviary_values import AviaryValues
 from aviary.variable_info.functions import setup_trajectory_params
 from aviary.variable_info.variables import Dynamic, Mission

diff --git a/aviary/mission/flops_based/phases/detailed_takeoff_phases.py b/aviary/mission/flops_based/phases/detailed_takeoff_phases.py
@@ -46,9 +46,8 @@
 import openmdao.api as om
 
 from aviary.mission.flops_based.ode.takeoff_ode import TakeoffODE
-from aviary.mission.phase_builder_base import (
-    InitialGuessControl, InitialGuessParameter, InitialGuessPolynomialControl,
-    InitialGuessState, InitialGuessTime, PhaseBuilderBase)
+from aviary.mission.phase_builder_base import PhaseBuilderBase
+from aviary.mission.initial_guess_builders import InitialGuessControl, InitialGuessParameter, InitialGuessPolynomialControl, InitialGuessState, InitialGuessTime
 from aviary.utils.aviary_values import AviaryValues
 from aviary.variable_info.functions import setup_trajectory_params
 from aviary.variable_info.variables import Dynamic, Mission

diff --git a/aviary/mission/flops_based/phases/energy_phase.py b/aviary/mission/flops_based/phases/energy_phase.py
@@ -1,8 +1,7 @@
 import dymos as dm
 
-from aviary.mission.phase_builder_base import (
-    register, PhaseBuilderBase, InitialGuessControl, InitialGuessParameter,
-    InitialGuessPolynomialControl, InitialGuessState, InitialGuessTime)
+from aviary.mission.phase_builder_base import PhaseBuilderBase, register
+from aviary.mission.initial_guess_builders import InitialGuessState, InitialGuessTime, InitialGuessControl
 
 from aviary.utils.aviary_values import AviaryValues
 from aviary.variable_info.variable_meta_data import _MetaData
@@ -428,11 +427,11 @@ def _extra_ode_init_kwargs(self):
     desc='initial guess for horizontal distance traveled')
 
 EnergyPhase._add_initial_guess_meta_data(
-    InitialGuessState('altitude'),
+    InitialGuessControl('altitude'),
     desc='initial guess for vertical distances')
 
 EnergyPhase._add_initial_guess_meta_data(
-    InitialGuessState('mach'),
+    InitialGuessControl('mach'),
     desc='initial guess for speed')
 
 EnergyPhase._add_initial_guess_meta_data(

diff --git a/aviary/mission/gasp_based/ode/climb_ode.py b/aviary/mission/gasp_based/ode/climb_ode.py
@@ -11,7 +11,6 @@
 from aviary.mission.gasp_based.ode.params import ParamPort
 from aviary.subsystems.aerodynamics.aerodynamics_builder import AerodynamicsBuilderBase
 from aviary.subsystems.propulsion.propulsion_builder import PropulsionBuilderBase
-from aviary.subsystems.propulsion.propulsion_mission import PropulsionMission
 from aviary.variable_info.enums import AnalysisScheme, AlphaModes, SpeedType
 from aviary.variable_info.variables import Dynamic
 from aviary.mission.ode.specific_energy_rate import SpecificEnergyRate

diff --git a/aviary/mission/gasp_based/phases/2DOF_phase_builder.py b/aviary/mission/gasp_based/phases/2DOF_phase_builder.py