merge fixes

crecine · Jun 18, 2024 · 9e0057a · 9e0057a
1 parent f409ad5
commit 9e0057a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/aviary/interface/default_phase_info/height_energy_fiti.py b/aviary/interface/default_phase_info/height_energy_fiti.py
@@ -1,26 +1,12 @@
 from aviary.mission.flops_based.phases.time_integration_phases import SGMDetailedTakeoff, \
     SGMHeightEnergy, SGMDetailedLanding
-from aviary.subsystems.propulsion.propulsion_builder import CorePropulsionBuilder
-from aviary.subsystems.geometry.geometry_builder import CoreGeometryBuilder
-from aviary.subsystems.mass.mass_builder import CoreMassBuilder
-from aviary.subsystems.aerodynamics.aerodynamics_builder import CoreAerodynamicsBuilder
 from aviary.utils.aviary_values import AviaryValues
 from aviary.variable_info.variable_meta_data import _MetaData as BaseMetaData
 from aviary.variable_info.variables import Dynamic, Mission
-from aviary.variable_info.enums import SpeedType, AlphaModes, LegacyCode
+from aviary.variable_info.enums import SpeedType, AlphaModes
 
 from aviary.interface.default_phase_info.two_dof_fiti import add_default_sgm_args
 
-FLOPS = LegacyCode.FLOPS
-
-prop = CorePropulsionBuilder('core_propulsion', BaseMetaData)
-mass = CoreMassBuilder('core_mass', BaseMetaData, FLOPS)
-aero = CoreAerodynamicsBuilder('core_aerodynamics', BaseMetaData, FLOPS)
-geom = CoreGeometryBuilder('core_geometry', BaseMetaData, FLOPS)
-
-default_premission_subsystems = [prop, geom, mass, aero]
-default_mission_subsystems = [aero, prop]
-
 cruise_mach = .8,
 cruise_alt = 35e3,
 

diff --git a/aviary/interface/default_phase_info/two_dof_fiti.py b/aviary/interface/default_phase_info/two_dof_fiti.py
@@ -1,7 +1,9 @@
 from aviary.variable_info.enums import SpeedType, AlphaModes
 from aviary.mission.gasp_based.phases.time_integration_phases import SGMGroundroll, \
     SGMRotation, SGMAscentCombined, SGMAccel, SGMClimb, SGMCruise, SGMDescent
-from aviary.variable_info.variables import Aircraft
+from aviary.utils.aviary_values import AviaryValues
+from aviary.variable_info.variables import Aircraft, Mission, Dynamic, Settings
+from aviary.variable_info.enums import Verbosity
 
 # defaults for 2DOF based forward in time integeration phases
 cruise_alt = 35e3,

diff --git a/aviary/mission/flops_based/phases/test/test_time_integration_phases.py b/aviary/mission/flops_based/phases/test/test_time_integration_phases.py
@@ -7,7 +7,7 @@
     SGMHeightEnergy, SGMDetailedTakeoff, SGMDetailedLanding
 from aviary.subsystems.premission import CorePreMission
 from aviary.utils.functions import set_aviary_initial_values
-from aviary.variable_info.enums import Verbosity, EquationsOfMotion
+from aviary.variable_info.enums import EquationsOfMotion
 from aviary.variable_info.variables import Aircraft, Dynamic, Mission, Settings
 from aviary.variable_info.variables_in import VariablesIn