diff --git a/aviary/api.py b/aviary/api.py index ecb3342f6e..7a96e37c96 100644 --- a/aviary/api.py +++ b/aviary/api.py @@ -51,9 +51,9 @@ from aviary.models.missions.height_energy_default import ( phase_info as default_height_energy_phase_info, ) -from aviary.interface.methods_for_level1 import run_level_1 -from aviary.interface.methods_for_level1 import run_aviary -from aviary.interface.methods_for_level2 import AviaryProblem, reload_aviary_problem +from aviary.interface.run_aviary import run_level_1 +from aviary.interface.run_aviary import run_aviary +from aviary.core.aviary_problem import AviaryProblem, reload_aviary_problem from aviary.utils.engine_deck_conversion import convert_engine_deck from aviary.utils.fortran_to_aviary import fortran_to_aviary from aviary.utils.functions import ( diff --git a/aviary/interface/methods_for_level2.py b/aviary/core/aviary_problem.py similarity index 100% rename from aviary/interface/methods_for_level2.py rename to aviary/core/aviary_problem.py diff --git a/aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb b/aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb index a45389a1fb..bec233c4dd 100644 --- a/aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb +++ b/aviary/docs/examples/coupled_aircraft_mission_optimization.ipynb @@ -230,6 +230,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level1 import run_aviary\n", + "\n", "from aviary.utils.doctape import glue_variable\n", "\n", "glue_variable(run_aviary.__name__, md_code=True)" diff --git a/aviary/docs/examples/multi_mission.ipynb b/aviary/docs/examples/multi_mission.ipynb index 72201ede6e..1475293d05 100644 --- a/aviary/docs/examples/multi_mission.ipynb +++ b/aviary/docs/examples/multi_mission.ipynb @@ -13,11 +13,7 @@ "# Testing Cell\n", "from aviary.api import Aircraft, AviaryProblem, Mission\n", "from aviary.examples.multi_mission import run_multimission_example\n", - "from aviary.utils.doctape import (\n", - " get_variable_name,\n", - " glue_variable,\n", - " glue_class_functions,\n", - ")\n", + "from aviary.utils.doctape import get_variable_name, glue_class_functions, glue_variable\n", "\n", "current_glued_vars = []\n", "\n", diff --git a/aviary/docs/getting_started/input_csv_phase_info.ipynb b/aviary/docs/getting_started/input_csv_phase_info.ipynb index 60beba97c3..5edc35a320 100644 --- a/aviary/docs/getting_started/input_csv_phase_info.ipynb +++ b/aviary/docs/getting_started/input_csv_phase_info.ipynb @@ -134,17 +134,17 @@ "\n", "import openmdao.api as om\n", "\n", - "from aviary.models.missions.height_energy_default import phase_info as HE_phase_info\n", - "from aviary.models.missions.two_dof_default import phase_info as TwoDOF_phase_info\n", "from aviary.mission.flight_phase_builder import FlightPhaseOptions\n", "from aviary.mission.height_energy.phases.groundroll_phase import GroundrollPhaseOptions as FGopt\n", + "from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhaseOptions\n", "from aviary.mission.two_dof.phases.accel_phase import AccelPhaseOptions\n", "from aviary.mission.two_dof.phases.ascent_phase import AscentPhaseOptions\n", "from aviary.mission.two_dof.phases.cruise_phase import CruisePhaseOptions\n", "from aviary.mission.two_dof.phases.flight_phase import FlightPhaseOptions\n", "from aviary.mission.two_dof.phases.groundroll_phase import GroundrollPhaseOptions as GGopt\n", "from aviary.mission.two_dof.phases.rotation_phase import RotationPhaseOptions\n", - "from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhaseOptions\n", + "from aviary.models.missions.height_energy_default import phase_info as HE_phase_info\n", + "from aviary.models.missions.two_dof_default import phase_info as TwoDOF_phase_info\n", "from aviary.utils.doctape import glue_keys\n", "\n", "solved_alpha = deepcopy(HE_phase_info['cruise'])\n", diff --git a/aviary/docs/getting_started/onboarding_ext_subsystem.ipynb b/aviary/docs/getting_started/onboarding_ext_subsystem.ipynb index e0f806239c..9e1d88f137 100644 --- a/aviary/docs/getting_started/onboarding_ext_subsystem.ipynb +++ b/aviary/docs/getting_started/onboarding_ext_subsystem.ipynb @@ -13,6 +13,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level2 import AviaryGroup\n", + "\n", "from aviary.utils.doctape import glue_class_options\n", "\n", "current_glued_vars = []\n", @@ -231,6 +232,7 @@ "import inspect\n", "\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "from aviary.utils.doctape import check_contains, glue_function_arguments\n", "\n", "imported_functions = {k for k, v in inspect.getmembers(AviaryProblem, inspect.isfunction)}\n", @@ -266,6 +268,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "from aviary.models.missions.height_energy_default import phase_info\n", "from aviary.utils.doctape import glue_class_functions, glue_variable\n", "\n", @@ -687,9 +690,7 @@ "outputs": [], "source": [ "# Testing Cell\n", - "from aviary.examples.external_subsystems.OAS_mass.OAS_wing_mass_builder import (\n", - " OASWingMassBuilder,\n", - ")\n", + "from aviary.examples.external_subsystems.OAS_mass.OAS_wing_mass_builder import OASWingMassBuilder\n", "from aviary.utils.doctape import glue_variable\n", "\n", "glue_variable(OASWingMassBuilder.__name__, md_code=True)" diff --git a/aviary/docs/getting_started/onboarding_level1.ipynb b/aviary/docs/getting_started/onboarding_level1.ipynb index 3a1e0396d1..a2c0145d2b 100644 --- a/aviary/docs/getting_started/onboarding_level1.ipynb +++ b/aviary/docs/getting_started/onboarding_level1.ipynb @@ -13,6 +13,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level2 import AviaryGroup\n", + "\n", "from aviary.utils.doctape import glue_class_options\n", "\n", "current_glued_vars = []\n", @@ -60,8 +61,9 @@ "# Testing Cell\n", "import inspect\n", "\n", - "import aviary.api as av\n", "from aviary.interface.methods_for_level1 import run_level_1\n", + "\n", + "import aviary.api as av\n", "from aviary.utils.doctape import check_value, glue_variable\n", "from aviary.utils.functions import get_model, get_path\n", "\n", @@ -772,10 +774,8 @@ "source": [ "# Testing Cell\n", "import aviary.api as av\n", - "\n", - "from aviary.variable_info.enums import EquationsOfMotion\n", "from aviary.utils.doctape import check_value, get_all_keys, get_variable_name\n", - "\n", + "from aviary.variable_info.enums import EquationsOfMotion\n", "\n", "TWO_DEGREES_OF_FREEDOM = EquationsOfMotion.TWO_DEGREES_OF_FREEDOM\n", "HEIGHT_ENERGY = EquationsOfMotion.HEIGHT_ENERGY\n", @@ -880,6 +880,7 @@ "source": [ "# Testing cell\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "from aviary.utils.doctape import glue_class_functions\n", "\n", "# Get all functions of class AviaryProblem\n", @@ -1003,6 +1004,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "from aviary.utils.doctape import glue_function_arguments\n", "\n", "# retrieve all argument of build_pre_mission(self, aviary_inputs, **kwargs)\n", diff --git a/aviary/docs/getting_started/onboarding_level2.ipynb b/aviary/docs/getting_started/onboarding_level2.ipynb index 7620fade44..beda1ecf9c 100644 --- a/aviary/docs/getting_started/onboarding_level2.ipynb +++ b/aviary/docs/getting_started/onboarding_level2.ipynb @@ -24,17 +24,18 @@ "outputs": [], "source": [ "# Testing Cell\n", - "import aviary.api as av\n", - "from aviary.api import Dynamic, Mission\n", "from aviary.interface.methods_for_level1 import run_aviary\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", + "import aviary.api as av\n", + "from aviary.api import Dynamic, Mission\n", "from aviary.core.aviary_group import AviaryGroup\n", "from aviary.utils.doctape import (\n", " get_variable_name,\n", + " glue_class_functions,\n", " glue_function_arguments,\n", " glue_keys,\n", " glue_variable,\n", - " glue_class_functions,\n", ")\n", "\n", "current_glued_vars = []\n", @@ -146,9 +147,9 @@ "source": [ "# Testing Cell\n", "import openmdao.api as om\n", + "from aviary.interface.methods_for_level2 import AviaryProblem\n", "\n", "from aviary.api import Mission\n", - "from aviary.interface.methods_for_level2 import AviaryProblem\n", "from aviary.mission.two_dof_problem_configurator import TwoDOFProblemConfigurator\n", "from aviary.utils.doctape import check_contains, glue_class_functions, glue_variable\n", "from aviary.variable_info.enums import EquationsOfMotion as EOM\n", @@ -330,8 +331,9 @@ "# Testing Cell\n", "import inspect\n", "\n", - "import aviary.api as av\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", + "import aviary.api as av\n", "from aviary.utils.doctape import get_attribute_name, glue_variable\n", "\n", "# read source code of __init__() starting from line 'self.model = AviaryGroup()'\n", @@ -380,7 +382,6 @@ "source": [ "# Testing Cell\n", "from aviary.utils.doctape import check_value, glue_variable\n", - "\n", "from aviary.utils.functions import get_model\n", "\n", "filename = 'aircraft_for_bench_GwGm.csv'\n", @@ -682,6 +683,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "from aviary.models.missions.two_dof_default import phase_info\n", "\n", "prob = AviaryProblem()\n", diff --git a/aviary/docs/getting_started/onboarding_level3.ipynb b/aviary/docs/getting_started/onboarding_level3.ipynb index 37a394678c..09a54c8083 100644 --- a/aviary/docs/getting_started/onboarding_level3.ipynb +++ b/aviary/docs/getting_started/onboarding_level3.ipynb @@ -28,8 +28,9 @@ "outputs": [], "source": [ "# Testing Cell\n", - "import aviary.api as av\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", + "import aviary.api as av\n", "from aviary.utils.doctape import glue_class_functions, glue_variable\n", "\n", "current_glued_vars = []\n", diff --git a/aviary/docs/misc_resources/modeling_exercise.ipynb b/aviary/docs/misc_resources/modeling_exercise.ipynb index b39ae4f01b..96c40e7893 100644 --- a/aviary/docs/misc_resources/modeling_exercise.ipynb +++ b/aviary/docs/misc_resources/modeling_exercise.ipynb @@ -97,7 +97,8 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level2 import AviaryGroup\n", - "from aviary.utils.doctape import glue_variable, glue_class_options\n", + "\n", + "from aviary.utils.doctape import glue_class_options, glue_variable\n", "\n", "current_glued_vars = []\n", "glue_class_options(AviaryGroup, current_glued_vars, md_code=True)" diff --git a/aviary/docs/theory_guide/gasp_based_bwb.ipynb b/aviary/docs/theory_guide/gasp_based_bwb.ipynb index f7274a2b66..2f16ccca43 100644 --- a/aviary/docs/theory_guide/gasp_based_bwb.ipynb +++ b/aviary/docs/theory_guide/gasp_based_bwb.ipynb @@ -14,20 +14,19 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft\n", - "from aviary.utils.doctape import get_variable_name, glue_variable\n", + "from aviary.subsystems.geometry.gasp_based.engine import (\n", + " BWBEngineSizeGroup,\n", + " EngineSize,\n", + " PercentNotInFuselage,\n", + ")\n", "from aviary.subsystems.geometry.gasp_based.fuselage import (\n", - " BWBFuselageParameters1,\n", " BWBCabinLayout,\n", - " BWBFuselageParameters2,\n", - " BWBFuselageSize,\n", " BWBFuselageGroup,\n", + " BWBFuselageParameters1,\n", + " BWBFuselageParameters2,\n", " BWBFuselageSize,\n", ")\n", - "from aviary.subsystems.geometry.gasp_based.engine import (\n", - " EngineSize,\n", - " BWBEngineSizeGroup,\n", - " PercentNotInFuselage,\n", - ")\n", + "from aviary.utils.doctape import get_variable_name, glue_variable\n", "\n", "glue_variable(get_variable_name(BWBFuselageParameters1), md_code=True)\n", "glue_variable(get_variable_name(BWBCabinLayout), md_code=True)\n", @@ -77,15 +76,15 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft, Mission\n", - "from aviary.utils.doctape import get_variable_name, glue_variable\n", + "from aviary.subsystems.geometry.gasp_based.wing import ExposedWing\n", "from aviary.subsystems.mass.gasp_based.design_load import (\n", - " BWBLoadSpeeds,\n", + " BWBDesignLoadGroup,\n", " BWBLoadFactors,\n", - " LoadSpeeds,\n", + " BWBLoadSpeeds,\n", " LoadFactors,\n", - " BWBDesignLoadGroup,\n", + " LoadSpeeds,\n", ")\n", - "from aviary.subsystems.geometry.gasp_based.wing import ExposedWing\n", + "from aviary.utils.doctape import get_variable_name, glue_variable\n", "\n", "glue_variable(get_variable_name(Aircraft.Design.WING_LOADING), md_code=True)\n", "glue_variable(get_variable_name(Mission.Design.GROSS_MASS), md_code=True)\n", @@ -124,14 +123,14 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft\n", - "from aviary.utils.doctape import get_variable_name, glue_variable\n", "from aviary.subsystems.mass.gasp_based.equipment_and_useful_load import (\n", + " BWBACMass,\n", + " BWBFurnishingMass,\n", " EquipAndUsefulLoadMassGroup,\n", " EquipMassPartialSum,\n", " UsefulLoadMass,\n", - " BWBACMass,\n", - " BWBFurnishingMass,\n", ")\n", + "from aviary.utils.doctape import get_variable_name, glue_variable\n", "\n", "glue_variable(get_variable_name(EquipAndUsefulLoadMassGroup), md_code=True)\n", "glue_variable(get_variable_name(EquipMassPartialSum), md_code=True)\n", @@ -176,22 +175,22 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft\n", - "from aviary.utils.doctape import get_variable_name, glue_variable\n", - "from aviary.subsystems.mass.gasp_based.wing import (\n", - " WingMassSolve,\n", - " BWBWingMassSolve,\n", - " BWBWingMassGroup,\n", - " WingMassTotal,\n", - ")\n", "from aviary.subsystems.geometry.gasp_based.wing import (\n", - " WingFoldArea,\n", - " WingFoldVolume,\n", " BWBWingFoldVolume,\n", " BWBWingGroup,\n", " BWBWingVolume,\n", + " WingFoldArea,\n", + " WingFoldVolume,\n", " WingParameters,\n", " WingVolume,\n", ")\n", + "from aviary.subsystems.mass.gasp_based.wing import (\n", + " BWBWingMassGroup,\n", + " BWBWingMassSolve,\n", + " WingMassSolve,\n", + " WingMassTotal,\n", + ")\n", + "from aviary.utils.doctape import get_variable_name, glue_variable\n", "\n", "glue_variable(get_variable_name(WingMassSolve), md_code=True)\n", "glue_variable(get_variable_name(BWBWingMassSolve), md_code=True)\n", @@ -239,14 +238,14 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft, Mission\n", - "from aviary.utils.doctape import get_variable_name, glue_variable\n", "from aviary.subsystems.mass.gasp_based.fuel import (\n", + " BodyTankCalculations,\n", " BWBFuselageMass,\n", + " FuelMassGroup,\n", " FuselageMass,\n", " StructMass,\n", - " BodyTankCalculations,\n", - " FuelMassGroup,\n", ")\n", + "from aviary.utils.doctape import get_variable_name, glue_variable\n", "\n", "glue_variable(get_variable_name(BWBFuselageMass), md_code=True)\n", "glue_variable(get_variable_name(FuselageMass), md_code=True)\n", @@ -319,19 +318,20 @@ "source": [ "# Testing Cell\n", "\n", - "from aviary.utils.doctape import get_all_non_aviary_names, get_variable_name, glue_variable\n", + "from aviary.subsystems.aerodynamics.gasp_based.common import AeroForces\n", "from aviary.subsystems.aerodynamics.gasp_based.gaspaero import (\n", + " AeroGeom,\n", + " BWBAeroSetup,\n", " BWBBodyLiftCurveSlope,\n", " BWBFormFactorAndSIWB,\n", - " BWBAeroSetup,\n", " BWBLiftCoeff,\n", " BWBLiftCoeffClean,\n", - " AeroGeom,\n", + " CruiseAero,\n", + " LowSpeedAero,\n", " Xlifts,\n", ")\n", - "from aviary.subsystems.aerodynamics.gasp_based.common import AeroForces\n", - "from aviary.subsystems.aerodynamics.gasp_based.gaspaero import CruiseAero, LowSpeedAero\n", "from aviary.subsystems.aerodynamics.gasp_based.table_based import TabularCruiseAero\n", + "from aviary.utils.doctape import get_all_non_aviary_names, get_variable_name, glue_variable\n", "\n", "glue_variable(get_variable_name(BWBBodyLiftCurveSlope), md_code=True)\n", "glue_variable(get_variable_name(BWBFormFactorAndSIWB), md_code=True)\n", diff --git a/aviary/docs/user_guide/aerodynamics.ipynb b/aviary/docs/user_guide/aerodynamics.ipynb index 70b123fdd9..287c490461 100644 --- a/aviary/docs/user_guide/aerodynamics.ipynb +++ b/aviary/docs/user_guide/aerodynamics.ipynb @@ -69,6 +69,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level1 import run_aviary\n", + "\n", "from aviary.utils.doctape import glue_class_functions\n", "\n", "# Get all functions of class CoreAerodynamicsBuilder\n", diff --git a/aviary/docs/user_guide/atmosphere.ipynb b/aviary/docs/user_guide/atmosphere.ipynb index da41e6bf02..f05d210e29 100644 --- a/aviary/docs/user_guide/atmosphere.ipynb +++ b/aviary/docs/user_guide/atmosphere.ipynb @@ -11,14 +11,14 @@ "outputs": [], "source": [ "# Testing Cell\n", + "import openmdao.api as om\n", + "\n", "from aviary.subsystems.atmosphere.atmosphere import AtmosphereComp\n", - "from aviary.subsystems.atmosphere.data.StandardAtm1976 import atm_data\n", "from aviary.subsystems.atmosphere.data.MIL_SPEC_210A_Cold import atm_data\n", "from aviary.subsystems.atmosphere.data.MIL_SPEC_210A_Hot import atm_data\n", "from aviary.subsystems.atmosphere.data.MIL_SPEC_210A_Polar import atm_data\n", "from aviary.subsystems.atmosphere.data.MIL_SPEC_210A_Tropical import atm_data\n", - "import openmdao.api as om\n", - "\n", + "from aviary.subsystems.atmosphere.data.StandardAtm1976 import atm_data\n", "from aviary.subsystems.atmosphere.utils import build_akima_coefs" ] }, diff --git a/aviary/docs/user_guide/aviary_commands.ipynb b/aviary/docs/user_guide/aviary_commands.ipynb index 51787c0422..50e6324750 100644 --- a/aviary/docs/user_guide/aviary_commands.ipynb +++ b/aviary/docs/user_guide/aviary_commands.ipynb @@ -186,8 +186,9 @@ "# Testing Cell\n", "import inspect\n", "\n", - "import aviary.api as av\n", "from aviary.interface.methods_for_level1 import run_level_1\n", + "\n", + "import aviary.api as av\n", "from aviary.utils.doctape import glue_actions, glue_variable\n", "from aviary.variable_info.variables import Settings\n", "\n", diff --git a/aviary/docs/user_guide/battery_subsystem_example.ipynb b/aviary/docs/user_guide/battery_subsystem_example.ipynb index 4b357ef6bc..ed3573492c 100644 --- a/aviary/docs/user_guide/battery_subsystem_example.ipynb +++ b/aviary/docs/user_guide/battery_subsystem_example.ipynb @@ -126,8 +126,9 @@ "# Testing Cell\n", "import inspect\n", "\n", - "import aviary.api as av\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", + "import aviary.api as av\n", "from aviary.subsystems.subsystem_builder import SubsystemBuilder\n", "from aviary.utils.doctape import (\n", " get_variable_name,\n", diff --git a/aviary/docs/user_guide/drawing_and_running_simple_missions.ipynb b/aviary/docs/user_guide/drawing_and_running_simple_missions.ipynb index 8e1fb5d3d5..de842c6b8e 100644 --- a/aviary/docs/user_guide/drawing_and_running_simple_missions.ipynb +++ b/aviary/docs/user_guide/drawing_and_running_simple_missions.ipynb @@ -14,6 +14,7 @@ "import inspect\n", "\n", "from aviary.interface.methods_for_level1 import run_aviary\n", + "\n", "from aviary.utils.doctape import glue_variable\n", "\n", "# glue all argument of function run_aviary()\n", @@ -55,7 +56,6 @@ "from aviary.utils.doctape import get_variable_name, glue_variable\n", "from aviary.variable_info.enums import EquationsOfMotion\n", "\n", - "\n", "glue_variable(\n", " 'height_energy', get_variable_name(EquationsOfMotion.HEIGHT_ENERGY).lower(), md_code=False\n", ")" diff --git a/aviary/docs/user_guide/examples_of_the_same_mission_at_different_UI_levels.ipynb b/aviary/docs/user_guide/examples_of_the_same_mission_at_different_UI_levels.ipynb index c7d012e4f1..fab705f169 100644 --- a/aviary/docs/user_guide/examples_of_the_same_mission_at_different_UI_levels.ipynb +++ b/aviary/docs/user_guide/examples_of_the_same_mission_at_different_UI_levels.ipynb @@ -15,6 +15,7 @@ "\n", "from aviary.interface.methods_for_level1 import run_aviary\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "from aviary.utils.doctape import glue_variable\n", "\n", "# glue all argument of function run_aviary()\n", diff --git a/aviary/docs/user_guide/external_aero.ipynb b/aviary/docs/user_guide/external_aero.ipynb index 224cc06529..233e49c1de 100644 --- a/aviary/docs/user_guide/external_aero.ipynb +++ b/aviary/docs/user_guide/external_aero.ipynb @@ -154,6 +154,7 @@ "source": [ "# Testing Cell\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "from aviary.subsystems.aerodynamics.aerodynamics_builder import AerodynamicsBuilder\n", "from aviary.utils.doctape import get_variable_name, glue_variable\n", "\n", diff --git a/aviary/docs/user_guide/features/blended_wing_body.ipynb b/aviary/docs/user_guide/features/blended_wing_body.ipynb index e8460f0e69..fc45ea13c9 100644 --- a/aviary/docs/user_guide/features/blended_wing_body.ipynb +++ b/aviary/docs/user_guide/features/blended_wing_body.ipynb @@ -138,8 +138,8 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft\n", + "from aviary.subsystems.geometry.gasp_based.wing import BWBWingFoldVolume, WingFoldArea\n", "from aviary.utils.doctape import get_variable_name, glue_variable\n", - "from aviary.subsystems.geometry.gasp_based.wing import WingFoldArea, BWBWingFoldVolume\n", "\n", "glue_variable(get_variable_name(Aircraft.Wing.VERTICAL_MOUNT_LOCATION), md_code=True)\n", "\n", @@ -233,17 +233,16 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft\n", - "from aviary.utils.doctape import get_all_non_aviary_names, get_variable_name, glue_variable\n", "from aviary.subsystems.aerodynamics.gasp_based.common import AeroForces\n", - "from aviary.subsystems.aerodynamics.gasp_based.table_based import TabularCruiseAero\n", "from aviary.subsystems.aerodynamics.gasp_based.gaspaero import (\n", - " BWBBodyLiftCurveSlope,\n", " AeroGeom,\n", " AeroSetup,\n", + " BWBBodyLiftCurveSlope,\n", " FormFactorAndSIWB,\n", " UFac,\n", - " BWBBodyLiftCurveSlope,\n", ")\n", + "from aviary.subsystems.aerodynamics.gasp_based.table_based import TabularCruiseAero\n", + "from aviary.utils.doctape import get_all_non_aviary_names, get_variable_name, glue_variable\n", "\n", "glue_variable(get_variable_name(Aircraft.Fuselage.HYDRAULIC_DIAMETER), md_code=True)\n", "glue_variable(get_variable_name(Aircraft.Fuselage.LIFT_CURVE_SLOPE_MACH0), md_code=True)\n", diff --git a/aviary/docs/user_guide/features_and_functionalities.ipynb b/aviary/docs/user_guide/features_and_functionalities.ipynb index e86bef5863..c3a5dd4c25 100644 --- a/aviary/docs/user_guide/features_and_functionalities.ipynb +++ b/aviary/docs/user_guide/features_and_functionalities.ipynb @@ -11,9 +11,10 @@ "outputs": [], "source": [ "# Testing Cell\n", - "from aviary.api import LegacyCode\n", "from aviary.interface.methods_for_level2 import AviaryGroup\n", - "from aviary.utils.doctape import glue_variable, glue_class_options\n", + "\n", + "from aviary.api import LegacyCode\n", + "from aviary.utils.doctape import glue_class_options, glue_variable\n", "\n", "current_glued_vars = []\n", "glue_class_options(AviaryGroup, current_glued_vars, md_code=True)\n", diff --git a/aviary/docs/user_guide/mass.ipynb b/aviary/docs/user_guide/mass.ipynb index db552cba70..c1f7cfb253 100644 --- a/aviary/docs/user_guide/mass.ipynb +++ b/aviary/docs/user_guide/mass.ipynb @@ -28,7 +28,6 @@ "from aviary.subsystems.mass.gasp_based.design_load import DesignLoadGroup\n", "from aviary.subsystems.mass.gasp_based.equipment_and_useful_load import EquipAndUsefulLoadMassGroup\n", "from aviary.subsystems.mass.gasp_based.fixed import FixedMassGroup\n", - "from aviary.subsystems.mass.gasp_based.wing import WingMassGroup\n", "from aviary.subsystems.mass.gasp_based.fuel import FuelMassGroup\n", "from aviary.subsystems.mass.gasp_based.wing import WingMassGroup\n", "from aviary.utils.doctape import get_variable_name, glue_variable\n", diff --git a/aviary/docs/user_guide/multi_mission.ipynb b/aviary/docs/user_guide/multi_mission.ipynb index 65101a0f41..4c74fe8b28 100644 --- a/aviary/docs/user_guide/multi_mission.ipynb +++ b/aviary/docs/user_guide/multi_mission.ipynb @@ -13,7 +13,7 @@ "# Testing Cell\n", "\n", "from aviary.api import Aircraft, AviaryProblem\n", - "from aviary.utils.doctape import get_variable_name, glue_variable, glue_class_functions\n", + "from aviary.utils.doctape import get_variable_name, glue_class_functions, glue_variable\n", "\n", "glue_variable(get_variable_name(Aircraft.CrewPayload.Design.NUM_PASSENGERS), md_code=True)\n", "glue_variable(get_variable_name(Aircraft.CrewPayload.NUM_PASSENGERS), md_code=True)\n", diff --git a/aviary/docs/user_guide/off_design_missions.ipynb b/aviary/docs/user_guide/off_design_missions.ipynb index a32df9c71e..2ec0d78e87 100644 --- a/aviary/docs/user_guide/off_design_missions.ipynb +++ b/aviary/docs/user_guide/off_design_missions.ipynb @@ -13,7 +13,7 @@ "# Testing Cell\n", "import aviary.api as av\n", "from aviary.api import Settings\n", - "from aviary.utils.doctape import glue_variable, check_value\n", + "from aviary.utils.doctape import check_value, glue_variable\n", "\n", "str_problem_type = Settings.PROBLEM_TYPE\n", "str_sizing = av.ProblemType.SIZING.value\n", @@ -287,8 +287,9 @@ "\"\"\"\n", "\n", "from aviary.interface.methods_for_level2 import _load_off_design\n", - "from aviary.variable_info.enums import LegacyCode\n", + "\n", "import aviary.api as av\n", + "from aviary.variable_info.enums import LegacyCode\n", "\n", "optimizer = 'SLSQP'\n", "phase_info = av.default_height_energy_phase_info\n", @@ -360,6 +361,7 @@ "source": [ "# Testing Cell\n", "import os\n", + "\n", "import aviary.api as av\n", "from aviary.utils.doctape import check_contains\n", "\n", diff --git a/aviary/docs/user_guide/payload_range_functionality.ipynb b/aviary/docs/user_guide/payload_range_functionality.ipynb index 112e1fdb44..ee43f95240 100644 --- a/aviary/docs/user_guide/payload_range_functionality.ipynb +++ b/aviary/docs/user_guide/payload_range_functionality.ipynb @@ -13,7 +13,7 @@ "# Testing Cell\n", "import aviary.api as av\n", "from aviary.api import Settings\n", - "from aviary.utils.doctape import glue_variable, check_value\n", + "from aviary.utils.doctape import check_value, glue_variable\n", "\n", "HEIGHT_ENERGY = av.EquationsOfMotion.HEIGHT_ENERGY\n", "glue_variable('height_energy', HEIGHT_ENERGY.name, md_code=True)\n", diff --git a/aviary/docs/user_guide/phase_info.ipynb b/aviary/docs/user_guide/phase_info.ipynb index b8a6893a8b..e72526086e 100644 --- a/aviary/docs/user_guide/phase_info.ipynb +++ b/aviary/docs/user_guide/phase_info.ipynb @@ -13,13 +13,13 @@ "# Testing Cell\n", "from aviary.mission.flight_phase_builder import FlightPhaseOptions\n", "from aviary.mission.height_energy.phases.groundroll_phase import GroundrollPhaseOptions as FGopt\n", + "from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhaseOptions\n", "from aviary.mission.two_dof.phases.accel_phase import AccelPhaseOptions\n", "from aviary.mission.two_dof.phases.ascent_phase import AscentPhaseOptions\n", "from aviary.mission.two_dof.phases.cruise_phase import CruisePhaseOptions\n", "from aviary.mission.two_dof.phases.flight_phase import FlightPhaseOptions\n", "from aviary.mission.two_dof.phases.groundroll_phase import GroundrollPhaseOptions as GGopt\n", "from aviary.mission.two_dof.phases.rotation_phase import RotationPhaseOptions\n", - "from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhaseOptions\n", "from aviary.utils.doctape import glue_keys\n", "\n", "dummy_phase_info = {}\n", diff --git a/aviary/docs/user_guide/phase_info_conversion.ipynb b/aviary/docs/user_guide/phase_info_conversion.ipynb index cf96acd74d..eca8581642 100644 --- a/aviary/docs/user_guide/phase_info_conversion.ipynb +++ b/aviary/docs/user_guide/phase_info_conversion.ipynb @@ -13,13 +13,13 @@ "# Testing Cell\n", "from aviary.mission.flight_phase_builder import FlightPhaseOptions\n", "from aviary.mission.height_energy.phases.groundroll_phase import GroundrollPhaseOptions as FGopt\n", + "from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhaseOptions\n", "from aviary.mission.two_dof.phases.accel_phase import AccelPhaseOptions\n", "from aviary.mission.two_dof.phases.ascent_phase import AscentPhaseOptions\n", "from aviary.mission.two_dof.phases.cruise_phase import CruisePhaseOptions\n", "from aviary.mission.two_dof.phases.flight_phase import FlightPhaseOptions\n", "from aviary.mission.two_dof.phases.groundroll_phase import GroundrollPhaseOptions as GGopt\n", "from aviary.mission.two_dof.phases.rotation_phase import RotationPhaseOptions\n", - "from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhaseOptions\n", "from aviary.utils.doctape import glue_keys\n", "\n", "dummy_phase_info = {}\n", diff --git a/aviary/docs/user_guide/postprocessing_and_visualizing_results.ipynb b/aviary/docs/user_guide/postprocessing_and_visualizing_results.ipynb index 1cc61c8ff5..7a23d618e2 100644 --- a/aviary/docs/user_guide/postprocessing_and_visualizing_results.ipynb +++ b/aviary/docs/user_guide/postprocessing_and_visualizing_results.ipynb @@ -11,8 +11,9 @@ "outputs": [], "source": [ "# Testing Cell\n", - "import aviary.api as av\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", + "import aviary.api as av\n", "from aviary.utils.doctape import glue_class_functions, glue_function_arguments, glue_variable\n", "\n", "current_glued_vars = []\n", diff --git a/aviary/docs/user_guide/reserve_missions.ipynb b/aviary/docs/user_guide/reserve_missions.ipynb index 359578f1f2..25722f37c7 100644 --- a/aviary/docs/user_guide/reserve_missions.ipynb +++ b/aviary/docs/user_guide/reserve_missions.ipynb @@ -11,9 +11,10 @@ "outputs": [], "source": [ "# Testing Cell\n", - "import aviary.api as av\n", "from aviary.interface.methods_for_level2 import AviaryGroup, AviaryProblem\n", - "from aviary.utils.doctape import glue_class_functions, glue_variable, glue_class_options\n", + "\n", + "import aviary.api as av\n", + "from aviary.utils.doctape import glue_class_functions, glue_class_options, glue_variable\n", "\n", "current_glued_vars = []\n", "\n", @@ -233,10 +234,11 @@ "import os\n", "from importlib.machinery import SourceFileLoader\n", "\n", + "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", "import aviary.api as av\n", - "from aviary.models.missions.two_dof_default import phase_info\n", "from aviary.interface.download_models import get_model\n", - "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "from aviary.models.missions.two_dof_default import phase_info\n", "from aviary.utils.doctape import check_contains\n", "\n", "prob = AviaryProblem()\n", @@ -282,9 +284,10 @@ "# Testing Cell\n", "from copy import deepcopy\n", "\n", - "from aviary.models.missions.two_dof_default import phase_info\n", - "from aviary.interface.download_models import get_model\n", "from aviary.interface.methods_for_level2 import AviaryProblem\n", + "\n", + "from aviary.interface.download_models import get_model\n", + "from aviary.models.missions.two_dof_default import phase_info\n", "from aviary.utils.doctape import check_value\n", "\n", "climb1_info = deepcopy(phase_info['climb1'])\n", diff --git a/aviary/docs/user_guide/subsystems.ipynb b/aviary/docs/user_guide/subsystems.ipynb index 409434a109..1afa185a0b 100644 --- a/aviary/docs/user_guide/subsystems.ipynb +++ b/aviary/docs/user_guide/subsystems.ipynb @@ -12,6 +12,7 @@ "source": [ "# Testing Cell\n", "import aviary.interface.methods_for_level2 as methods_for_level2\n", + "\n", "from aviary.subsystems.subsystem_builder import SubsystemBuilder\n", "from aviary.utils.doctape import glue_variable\n", "from aviary.utils.functions import get_path\n", diff --git a/aviary/examples/external_subsystems/battery/battery_builder.py b/aviary/examples/external_subsystems/battery/battery_builder.py index c42e1b95c3..a6d4a1d5b3 100644 --- a/aviary/examples/external_subsystems/battery/battery_builder.py +++ b/aviary/examples/external_subsystems/battery/battery_builder.py @@ -1,6 +1,4 @@ -from aviary.examples.external_subsystems.battery.battery_variable_meta_data import ( - ExtendedMetaData, -) +from aviary.examples.external_subsystems.battery.battery_variable_meta_data import ExtendedMetaData from aviary.examples.external_subsystems.battery.battery_variables import Aircraft, Dynamic from aviary.examples.external_subsystems.battery.model.battery_mission import BatteryMission from aviary.examples.external_subsystems.battery.model.battery_premission import BatteryPreMission diff --git a/aviary/examples/external_subsystems/battery/run_external_battery_mission_example.py b/aviary/examples/external_subsystems/battery/run_external_battery_mission_example.py index b1ee5a8a1d..99a904b21a 100644 --- a/aviary/examples/external_subsystems/battery/run_external_battery_mission_example.py +++ b/aviary/examples/external_subsystems/battery/run_external_battery_mission_example.py @@ -1,9 +1,9 @@ """Example mission using the a detailed battery model.""" from aviary.api import default_height_energy_phase_info as phase_info +from aviary.core.aviary_problem import AviaryProblem from aviary.examples.external_subsystems.battery.battery_builder import BatteryBuilder from aviary.examples.external_subsystems.battery.battery_variable_meta_data import ExtendedMetaData -from aviary.interface.methods_for_level2 import AviaryProblem from aviary.utils.functions import get_aviary_resource_path battery_builder = BatteryBuilder(include_constraints=False) diff --git a/aviary/examples/external_subsystems/engine_NPSS/test/test_NPSS_builder.py b/aviary/examples/external_subsystems/engine_NPSS/test/test_NPSS_builder.py index ecd8100319..5ecaa464b0 100644 --- a/aviary/examples/external_subsystems/engine_NPSS/test/test_NPSS_builder.py +++ b/aviary/examples/external_subsystems/engine_NPSS/test/test_NPSS_builder.py @@ -10,7 +10,6 @@ from aviary.examples.external_subsystems.engine_NPSS.NPSS_engine_builder import ( NPSSTabularEngineBuilder, ) - from aviary.examples.external_subsystems.engine_NPSS.NPSS_variable_meta_data import ExtendedMetaData diff --git a/aviary/examples/run_level1_example.py b/aviary/examples/run_basic_example.py similarity index 97% rename from aviary/examples/run_level1_example.py rename to aviary/examples/run_basic_example.py index ae1cd57aaf..133d263a87 100644 --- a/aviary/examples/run_level1_example.py +++ b/aviary/examples/run_basic_example.py @@ -1,6 +1,6 @@ """ This is a basic example of running a coupled aircraft design-mission optimization in Aviary using -the "level 1" API. +the python API. The properties of the aircraft are defined in a pre-existing ".csv" file - in this case it describes a conventional single-aisle commercial transport. The mission is defined using a "phase_info" file, diff --git a/aviary/examples/run_level3_example.py b/aviary/examples/run_custom_example.py similarity index 98% rename from aviary/examples/run_level3_example.py rename to aviary/examples/run_custom_example.py index a51608bb1f..562ced4022 100644 --- a/aviary/examples/run_level3_example.py +++ b/aviary/examples/run_custom_example.py @@ -1,11 +1,10 @@ """ -This is an example of running a coupled aircraft design-mission optimization in Aviary without using the lower level APIs. -It runs the same aircraft and mission as the `level1_example.py` and 'level2_example.py' scripts. +This is an example of running a coupled aircraft design-mission optimization in Aviary without using the API. +It runs the same aircraft and mission as the `basic_example.py` script. The aircraft is loaded from .csv and the default height energy phase_info dictionary is imported from the file. This script unwraps the subsystem and trajectory builders, exposing how Aviary interacts with openMDAO and Dymos. -It is divided into sections separated by '####' with the level2 api calls commented out so you can see what happens in each level2 method. - +It is divided into sections separated by '####' with the api calls commented out so you can see what happens in each method. """ import warnings diff --git a/aviary/examples/run_level2_with_detailed_landing.py b/aviary/examples/run_detailed_landing_example.py similarity index 100% rename from aviary/examples/run_level2_with_detailed_landing.py rename to aviary/examples/run_detailed_landing_example.py diff --git a/aviary/examples/run_level2_with_detailed_takeoff.py b/aviary/examples/run_detailed_takeoff_example.py similarity index 100% rename from aviary/examples/run_level2_with_detailed_takeoff.py rename to aviary/examples/run_detailed_takeoff_example.py diff --git a/aviary/examples/run_level2_example.py b/aviary/examples/run_level2_example.py deleted file mode 100644 index f6ea8d44b2..0000000000 --- a/aviary/examples/run_level2_example.py +++ /dev/null @@ -1,39 +0,0 @@ -""" -This is an example of running a coupled aircraft design-mission optimization in Aviary using the -"level 2" API. It runs the same aircraft and mission as the `level1_example.py` script, but it uses -the AviaryProblem class to set up the problem. This exposes more options and flexibility to the user. - -The same ".csv" file is used to define the aircraft, but now the phase_info dictionary is directly -imported from the file and passed as an argument. It is common for level 2 scripts to modify -existing phase_info, but here it is used as-is here to match the level 1 example. - -We then call the correct methods in order to set up and run an Aviary optimization problem. Most -methods have optional arguments, but none are necessary here. The selection of the SLSQP optimizer -limited to 50 iterations are included to demonstrate of how those common settings are set. -""" - -from aviary.models.missions.height_energy_default import phase_info - -import aviary.api as av - -prob = av.AviaryProblem() - -# Load aircraft and options data from provided sources -prob.load_inputs( - 'models/aircraft/advanced_single_aisle/advanced_single_aisle_FLOPS.csv', phase_info -) - -prob.check_and_preprocess_inputs() - -prob.build_model() - -# optimizer and iteration limit are optional provided here -prob.add_driver('SLSQP', max_iter=50) - -prob.add_design_variables() - -prob.add_objective() - -prob.setup() - -prob.run_aviary_problem() diff --git a/aviary/examples/run_custom_optimization_example.py b/aviary/examples/run_optimization_example.py similarity index 94% rename from aviary/examples/run_custom_optimization_example.py rename to aviary/examples/run_optimization_example.py index 468a4591bc..709c66e921 100644 --- a/aviary/examples/run_custom_optimization_example.py +++ b/aviary/examples/run_optimization_example.py @@ -1,6 +1,6 @@ """ -This is an example of running constrained optimization in Aviary using the "level 2" API. It runs -the same aircraft and mission as the `level1_example.py` script, but it uses the AviaryProblem class +This is an example of running constrained optimization in Aviary using the python API. It runs +the same aircraft and mission as the `run_basic_example.py` script, but it uses the AviaryProblem class to set up the problem. The same ".csv" file is used to define the aircraft, but wing area and engine scale factor are added @@ -9,9 +9,8 @@ and engine scale factor is reduced to its lower bound. """ -from aviary.models.missions.height_energy_default import phase_info - import aviary.api as av +from aviary.models.missions.height_energy_default import phase_info # Suppress outputs prob = av.AviaryProblem(verbosity=0) diff --git a/aviary/examples/test/test_all_examples.py b/aviary/examples/test/test_all_examples.py index a592a4f2b6..8d035c0cc0 100644 --- a/aviary/examples/test/test_all_examples.py +++ b/aviary/examples/test/test_all_examples.py @@ -9,8 +9,8 @@ import unittest from pathlib import Path -from openmdao.utils.testing_utils import use_tempdirs from openmdao.utils.general_utils import set_pyoptsparse_opt +from openmdao.utils.testing_utils import use_tempdirs from parameterized import parameterized # TODO: Address any issue that requires a skip. diff --git a/aviary/interface/cmd_entry_points.py b/aviary/interface/cmd_entry_points.py index 680c0b985a..2bc765c535 100644 --- a/aviary/interface/cmd_entry_points.py +++ b/aviary/interface/cmd_entry_points.py @@ -4,8 +4,8 @@ from aviary.interface.download_models import _exec_hangar, _setup_hangar_parser from aviary.interface.graphical_input import _exec_flight_profile, _setup_flight_profile_parser -from aviary.interface.methods_for_level1 import _exec_level1, _setup_level1_parser from aviary.interface.plot_drag_polar import _exec_plot_drag_polar, _setup_plot_drag_polar_parser +from aviary.interface.run_aviary import _exec_level1, _setup_level1_parser from aviary.interface.test_installation import _exec_installation_test, _setup_installation_test from aviary.utils.aero_table_conversion_cmd import _exec_ATC, _setup_ATC_parser from aviary.utils.engine_deck_conversion_cmd import _exec_EDC, _setup_EDC_parser diff --git a/aviary/interface/reports.py b/aviary/interface/reports.py index 9895a63906..b0cd840e21 100644 --- a/aviary/interface/reports.py +++ b/aviary/interface/reports.py @@ -9,7 +9,7 @@ from openmdao.utils.mpi import MPI from openmdao.utils.reports_system import register_report -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.interface.utils import write_markdown_variable_table from aviary.utils.named_values import NamedValues from aviary.utils.utils import wrapped_convert_units diff --git a/aviary/interface/methods_for_level1.py b/aviary/interface/run_aviary.py similarity index 97% rename from aviary/interface/methods_for_level1.py rename to aviary/interface/run_aviary.py index 5105dc6231..55d0f0cd7b 100644 --- a/aviary/interface/methods_for_level1.py +++ b/aviary/interface/run_aviary.py @@ -1,8 +1,8 @@ """This file contains functions needed to run Aviary using the Level 1 interface.""" -from importlib.util import spec_from_file_location, module_from_spec -from pathlib import Path import sys +from importlib.util import module_from_spec, spec_from_file_location +from pathlib import Path from aviary.utils.functions import get_path from aviary.variable_info.enums import Verbosity @@ -74,7 +74,7 @@ def run_aviary( else: name = None - from aviary.interface.methods_for_level2 import AviaryProblem + from aviary.core.aviary_problem import AviaryProblem # Build problem prob = AviaryProblem(name=name, verbosity=verbosity) diff --git a/aviary/interface/test/test_height_energy_mission.py b/aviary/interface/test/test_height_energy_mission.py index 7ca1349ba6..6383a5a5dd 100644 --- a/aviary/interface/test/test_height_energy_mission.py +++ b/aviary/interface/test/test_height_energy_mission.py @@ -3,19 +3,19 @@ import sys import unittest from copy import deepcopy - from io import StringIO + import dymos from openmdao.core.problem import _clear_problem_names from openmdao.utils.reports_system import clear_reports from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.interface.methods_for_level1 import run_aviary -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem +from aviary.interface.run_aviary import run_aviary from aviary.mission.height_energy.phases.energy_phase import EnergyPhase from aviary.subsystems.test.test_dummy_subsystem import ArrayGuessSubsystemBuilder -from aviary.variable_info.variables import Dynamic from aviary.variable_info.enums import Transcription +from aviary.variable_info.variables import Dynamic @use_tempdirs diff --git a/aviary/interface/test/test_interface_bugs.py b/aviary/interface/test/test_interface_bugs.py index 737ca5bdb7..0e14e8f8e9 100644 --- a/aviary/interface/test/test_interface_bugs.py +++ b/aviary/interface/test/test_interface_bugs.py @@ -4,7 +4,7 @@ import openmdao.api as om from openmdao.utils.testing_utils import use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.test_aircraft.GwFm_phase_info import phase_info as ph_in from aviary.subsystems.subsystem_builder import SubsystemBuilder from aviary.utils.functions import get_aviary_resource_path diff --git a/aviary/interface/test/test_linkage_logic.py b/aviary/interface/test/test_linkage_logic.py index abe7ee68ab..fc1893565c 100644 --- a/aviary/interface/test/test_linkage_logic.py +++ b/aviary/interface/test/test_linkage_logic.py @@ -4,7 +4,7 @@ from openmdao.core.problem import _clear_problem_names from openmdao.utils.testing_utils import use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem @use_tempdirs diff --git a/aviary/interface/test/test_phase_info.py b/aviary/interface/test/test_phase_info.py index 2a9ea3b400..0a59a91d11 100644 --- a/aviary/interface/test/test_phase_info.py +++ b/aviary/interface/test/test_phase_info.py @@ -9,9 +9,10 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import use_tempdirs -from aviary.models.missions.height_energy_default import ( - phase_info as ph_in_height_energy, -) +from aviary.core.aviary_problem import AviaryProblem +from aviary.mission.phase_builder import PhaseBuilder as PhaseBuilder +from aviary.mission.phase_builder import phase_info_to_builder +from aviary.models.missions.height_energy_default import phase_info as ph_in_height_energy from aviary.models.missions.height_energy_default import ( phase_info_parameterization as phase_info_parameterization_height_energy, ) @@ -19,9 +20,6 @@ from aviary.models.missions.two_dof_default import ( phase_info_parameterization as phase_info_parameterization_two_dof, ) -from aviary.interface.methods_for_level2 import AviaryProblem -from aviary.mission.phase_builder import PhaseBuilder as PhaseBuilder -from aviary.mission.phase_builder import phase_info_to_builder from aviary.variable_info.variables import Mission diff --git a/aviary/interface/test/test_preprocess.py b/aviary/interface/test/test_preprocess.py index f5e20ae5ec..1a00d5cc8c 100644 --- a/aviary/interface/test/test_preprocess.py +++ b/aviary/interface/test/test_preprocess.py @@ -2,12 +2,12 @@ Test preprocessing as part of the level 2 interface. """ -from copy import deepcopy import unittest +from copy import deepcopy from openmdao.utils.testing_utils import use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.advanced_single_aisle.phase_info import phase_info from aviary.variable_info.variables import Aircraft diff --git a/aviary/interface/test/test_reports.py b/aviary/interface/test/test_reports.py index c5eb2963da..b4a5e10f59 100644 --- a/aviary/interface/test/test_reports.py +++ b/aviary/interface/test/test_reports.py @@ -7,9 +7,9 @@ from openmdao.core.problem import _clear_problem_names from openmdao.utils.testing_utils import set_env_vars, use_tempdirs +from aviary.core.aviary_problem import AviaryProblem +from aviary.interface.run_aviary import run_aviary from aviary.models.missions.height_energy_default import phase_info -from aviary.interface.methods_for_level1 import run_aviary -from aviary.interface.methods_for_level2 import AviaryProblem from aviary.subsystems.subsystem_builder import SubsystemBuilder from aviary.utils.develop_metadata import add_meta_data from aviary.variable_info.variable_meta_data import CoreMetaData diff --git a/aviary/interface/test/test_reserve_support.py b/aviary/interface/test/test_reserve_support.py index 0cea403eb7..a6c6d48cf0 100644 --- a/aviary/interface/test/test_reserve_support.py +++ b/aviary/interface/test/test_reserve_support.py @@ -4,9 +4,9 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import use_tempdirs -from aviary.models.missions.two_dof_default import phase_info as ph_in_gasp -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.test_aircraft.GwFm_phase_info import phase_info as ph_in_flops +from aviary.models.missions.two_dof_default import phase_info as ph_in_gasp from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/interface/test/test_save_results.py b/aviary/interface/test/test_save_results.py index d15e24d863..839d07cced 100644 --- a/aviary/interface/test/test_save_results.py +++ b/aviary/interface/test/test_save_results.py @@ -4,7 +4,7 @@ from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs import aviary.api as av -from aviary.interface.methods_for_level2 import reload_aviary_problem +from aviary.core.aviary_problem import reload_aviary_problem from aviary.models.missions.height_energy_default import phase_info, phase_info_parameterization from aviary.utils.functions import get_path diff --git a/aviary/interface/utils.py b/aviary/interface/utils.py index 80c6ae9de8..b13d57f160 100644 --- a/aviary/interface/utils.py +++ b/aviary/interface/utils.py @@ -1,7 +1,7 @@ +import warnings from math import floor, log10 import numpy as np -import warnings from aviary.variable_info.enums import Verbosity diff --git a/aviary/mission/flight_phase_builder.py b/aviary/mission/flight_phase_builder.py index 01f1beeccd..171876e4b8 100644 --- a/aviary/mission/flight_phase_builder.py +++ b/aviary/mission/flight_phase_builder.py @@ -2,15 +2,9 @@ import numpy as np from aviary.mission.height_energy.ode.energy_ODE import EnergyODE -from aviary.mission.phase_utils import ( - add_subsystem_variables_to_phase, - get_initial, -) -from aviary.mission.initial_guess_builders import ( - InitialGuessState, - InitialGuessControl, -) +from aviary.mission.initial_guess_builders import InitialGuessControl, InitialGuessState from aviary.mission.phase_builder import PhaseBuilder, register +from aviary.mission.phase_utils import add_subsystem_variables_to_phase, get_initial from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.enums import EquationsOfMotion, ThrottleAllocation, Transcription diff --git a/aviary/mission/height_energy/ode/energy_ODE.py b/aviary/mission/height_energy/ode/energy_ODE.py index df5f2d532b..cddf82c2d3 100644 --- a/aviary/mission/height_energy/ode/energy_ODE.py +++ b/aviary/mission/height_energy/ode/energy_ODE.py @@ -3,7 +3,6 @@ from aviary.mission.base_ode import BaseODE as _BaseODE from aviary.mission.height_energy.ode.mission_EOM import MissionEOM - from aviary.subsystems.propulsion.throttle_allocation import ThrottleAllocator from aviary.variable_info.enums import SpeedType, ThrottleAllocation from aviary.variable_info.variables import Aircraft, Dynamic, Mission diff --git a/aviary/mission/height_energy/phases/groundroll_phase.py b/aviary/mission/height_energy/phases/groundroll_phase.py index 432104eb9c..1a234dc4b0 100644 --- a/aviary/mission/height_energy/phases/groundroll_phase.py +++ b/aviary/mission/height_energy/phases/groundroll_phase.py @@ -1,17 +1,17 @@ import dymos as dm -from aviary.mission.two_dof.ode.groundroll_ode import GroundrollODE from aviary.mission.initial_guess_builders import ( InitialGuessIntegrationVariable, InitialGuessPolynomialControl, InitialGuessState, ) from aviary.mission.phase_builder import PhaseBuilder, register +from aviary.mission.phase_utils import add_subsystem_variables_to_phase +from aviary.mission.two_dof.ode.groundroll_ode import GroundrollODE from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.variable_meta_data import _MetaData from aviary.variable_info.variables import Dynamic -from aviary.mission.phase_utils import add_subsystem_variables_to_phase # Solved 2DOF uses this builder. # diff --git a/aviary/mission/phase_builder.py b/aviary/mission/phase_builder.py index 1db9fbdb7b..78e52a0b3e 100644 --- a/aviary/mission/phase_builder.py +++ b/aviary/mission/phase_builder.py @@ -10,8 +10,8 @@ from collections import namedtuple import dymos as dm -import openmdao.api as om import numpy as np +import openmdao.api as om from aviary.mission.height_energy.ode.energy_ODE import EnergyODE from aviary.mission.initial_guess_builders import InitialGuess diff --git a/aviary/mission/solved_two_dof/ode/test/test_unsteady_alpha_thrust_iter_group.py b/aviary/mission/solved_two_dof/ode/test/test_unsteady_alpha_thrust_iter_group.py index a9d77378d5..991ec504a7 100644 --- a/aviary/mission/solved_two_dof/ode/test/test_unsteady_alpha_thrust_iter_group.py +++ b/aviary/mission/solved_two_dof/ode/test/test_unsteady_alpha_thrust_iter_group.py @@ -5,13 +5,11 @@ from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal from aviary.constants import GRAV_ENGLISH_LBM -from aviary.mission.two_dof.ode.params import set_params_for_unit_tests -from aviary.mission.solved_two_dof.ode.unsteady_control_iter_group import ( - UnsteadyControlIterGroup, -) +from aviary.mission.solved_two_dof.ode.unsteady_control_iter_group import UnsteadyControlIterGroup from aviary.mission.solved_two_dof.ode.unsteady_solved_flight_conditions import ( UnsteadySolvedFlightConditions, ) +from aviary.mission.two_dof.ode.params import set_params_for_unit_tests from aviary.subsystems.aerodynamics.aerodynamics_builder import CoreAerodynamicsBuilder from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.enums import LegacyCode, SpeedType diff --git a/aviary/mission/solved_two_dof/ode/test/test_unsteady_solved_ode.py b/aviary/mission/solved_two_dof/ode/test/test_unsteady_solved_ode.py index b762989d06..4d5b102c7e 100644 --- a/aviary/mission/solved_two_dof/ode/test/test_unsteady_solved_ode.py +++ b/aviary/mission/solved_two_dof/ode/test/test_unsteady_solved_ode.py @@ -5,8 +5,8 @@ from openmdao.utils.assert_utils import assert_near_equal from aviary.constants import GRAV_ENGLISH_LBM -from aviary.mission.two_dof.ode.params import set_params_for_unit_tests from aviary.mission.solved_two_dof.ode.unsteady_solved_ode import UnsteadySolvedODE +from aviary.mission.two_dof.ode.params import set_params_for_unit_tests from aviary.subsystems.propulsion.utils import build_engine_deck from aviary.utils.test_utils.default_subsystems import get_default_mission_subsystems from aviary.variable_info.enums import SpeedType diff --git a/aviary/mission/solved_two_dof/ode/unsteady_solved_ode.py b/aviary/mission/solved_two_dof/ode/unsteady_solved_ode.py index ce91b44bcf..d6c00b1d8b 100644 --- a/aviary/mission/solved_two_dof/ode/unsteady_solved_ode.py +++ b/aviary/mission/solved_two_dof/ode/unsteady_solved_ode.py @@ -2,13 +2,13 @@ import openmdao.api as om from aviary.constants import RHO_SEA_LEVEL_ENGLISH as rho_sl -from aviary.mission.two_dof.ode.params import ParamPort -from aviary.mission.two_dof.ode.two_dof_ode import TwoDOFODE from aviary.mission.solved_two_dof.ode.gamma_comp import GammaComp from aviary.mission.solved_two_dof.ode.unsteady_solved_eom import UnsteadySolvedEOM from aviary.mission.solved_two_dof.ode.unsteady_solved_flight_conditions import ( UnsteadySolvedFlightConditions, ) +from aviary.mission.two_dof.ode.params import ParamPort +from aviary.mission.two_dof.ode.two_dof_ode import TwoDOFODE from aviary.subsystems.aerodynamics.aerodynamics_builder import AerodynamicsBuilder from aviary.subsystems.atmosphere.atmosphere import Atmosphere from aviary.subsystems.propulsion.propulsion_builder import PropulsionBuilder diff --git a/aviary/mission/solved_two_dof_problem_configurator.py b/aviary/mission/solved_two_dof_problem_configurator.py index 6340f8c33d..ac1fac20a7 100644 --- a/aviary/mission/solved_two_dof_problem_configurator.py +++ b/aviary/mission/solved_two_dof_problem_configurator.py @@ -1,13 +1,13 @@ from aviary.mission.height_energy.phases.groundroll_phase import ( GroundrollPhase as GroundrollPhaseVelocityIntegrated, ) -from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhase from aviary.mission.problem_configurator import ProblemConfiguratorBase +from aviary.mission.solved_two_dof.phases.solved_twodof_phase import SolvedTwoDOFPhase +from aviary.mission.utils import process_guess_var from aviary.subsystems.propulsion.utils import build_engine_deck from aviary.utils.utils import wrapped_convert_units from aviary.variable_info.enums import LegacyCode from aviary.variable_info.variables import Dynamic, Mission -from aviary.mission.utils import process_guess_var class SolvedTwoDOFProblemConfigurator(ProblemConfiguratorBase): diff --git a/aviary/mission/test/test_external_subsystems_in_mission.py b/aviary/mission/test/test_external_subsystems_in_mission.py index b612ffcd11..94d44e1f38 100644 --- a/aviary/mission/test/test_external_subsystems_in_mission.py +++ b/aviary/mission/test/test_external_subsystems_in_mission.py @@ -6,9 +6,9 @@ import openmdao.api as om from openmdao.utils.testing_utils import use_tempdirs +from aviary.core.aviary_problem import AviaryProblem from aviary.models.missions.height_energy_default import phase_info as energy_phase_info from aviary.models.missions.two_dof_default import phase_info as two_dof_phase_info -from aviary.interface.methods_for_level2 import AviaryProblem from aviary.subsystems.subsystem_builder import SubsystemBuilder from aviary.variable_info.variables import Aircraft diff --git a/aviary/mission/two_dof/ode/accel_ode.py b/aviary/mission/two_dof/ode/accel_ode.py index 1bca68632d..5e9ab9f5ef 100644 --- a/aviary/mission/two_dof/ode/accel_ode.py +++ b/aviary/mission/two_dof/ode/accel_ode.py @@ -2,7 +2,6 @@ from aviary.mission.two_dof.ode.accel_eom import AccelerationRates from aviary.mission.two_dof.ode.params import ParamPort - from aviary.mission.two_dof.ode.two_dof_ode import TwoDOFODE from aviary.subsystems.mass.mass_to_weight import MassToWeight from aviary.variable_info.variables import Dynamic diff --git a/aviary/mission/two_dof/ode/breguet_cruise_ode.py b/aviary/mission/two_dof/ode/breguet_cruise_ode.py index 342f139a1f..1a741489f9 100644 --- a/aviary/mission/two_dof/ode/breguet_cruise_ode.py +++ b/aviary/mission/two_dof/ode/breguet_cruise_ode.py @@ -1,11 +1,11 @@ import numpy as np import openmdao.api as om +from aviary.mission.ode.altitude_rate import AltitudeRate +from aviary.mission.ode.specific_energy_rate import SpecificEnergyRate from aviary.mission.two_dof.ode.breguet_cruise_eom import ElectricRangeComp, RangeComp from aviary.mission.two_dof.ode.params import ParamPort from aviary.mission.two_dof.ode.two_dof_ode import TwoDOFODE -from aviary.mission.ode.altitude_rate import AltitudeRate -from aviary.mission.ode.specific_energy_rate import SpecificEnergyRate from aviary.subsystems.mass.mass_to_weight import MassToWeight from aviary.subsystems.propulsion.propulsion_builder import PropulsionBuilder from aviary.variable_info.enums import SpeedType diff --git a/aviary/mission/two_dof/ode/test/test_breguet_cruise_ode.py b/aviary/mission/two_dof/ode/test/test_breguet_cruise_ode.py index f8009a9745..fc983f6f9d 100644 --- a/aviary/mission/two_dof/ode/test/test_breguet_cruise_ode.py +++ b/aviary/mission/two_dof/ode/test/test_breguet_cruise_ode.py @@ -4,10 +4,7 @@ import openmdao.api as om from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal -from aviary.mission.two_dof.ode.breguet_cruise_ode import ( - BreguetCruiseODE, - ElectricBreguetCruiseODE, -) +from aviary.mission.two_dof.ode.breguet_cruise_ode import BreguetCruiseODE, ElectricBreguetCruiseODE from aviary.mission.two_dof.ode.params import set_params_for_unit_tests from aviary.subsystems.propulsion.utils import build_engine_deck from aviary.utils.test_utils.default_subsystems import get_default_mission_subsystems diff --git a/aviary/mission/two_dof/phases/accel_phase.py b/aviary/mission/two_dof/phases/accel_phase.py index ac94a6a988..1e05371871 100644 --- a/aviary/mission/two_dof/phases/accel_phase.py +++ b/aviary/mission/two_dof/phases/accel_phase.py @@ -1,14 +1,14 @@ -from aviary.mission.two_dof.ode.accel_ode import AccelODE from aviary.mission.initial_guess_builders import ( InitialGuessControl, InitialGuessIntegrationVariable, InitialGuessState, ) from aviary.mission.phase_builder import PhaseBuilder, register +from aviary.mission.phase_utils import add_subsystem_variables_to_phase +from aviary.mission.two_dof.ode.accel_ode import AccelODE from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.variables import Dynamic -from aviary.mission.phase_utils import add_subsystem_variables_to_phase class AccelPhaseOptions(AviaryOptionsDictionary): diff --git a/aviary/mission/two_dof/phases/ascent_phase.py b/aviary/mission/two_dof/phases/ascent_phase.py index 078077af58..92c214f448 100644 --- a/aviary/mission/two_dof/phases/ascent_phase.py +++ b/aviary/mission/two_dof/phases/ascent_phase.py @@ -1,16 +1,16 @@ import numpy as np -from aviary.mission.two_dof.ode.ascent_ode import AscentODE from aviary.mission.initial_guess_builders import ( InitialGuessControl, InitialGuessIntegrationVariable, InitialGuessState, ) from aviary.mission.phase_builder import PhaseBuilder +from aviary.mission.phase_utils import add_subsystem_variables_to_phase +from aviary.mission.two_dof.ode.ascent_ode import AscentODE from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.variables import Dynamic -from aviary.mission.phase_utils import add_subsystem_variables_to_phase class AscentPhaseOptions(AviaryOptionsDictionary): diff --git a/aviary/mission/two_dof/phases/cruise_phase.py b/aviary/mission/two_dof/phases/cruise_phase.py index 370c3cda9b..f3757db093 100644 --- a/aviary/mission/two_dof/phases/cruise_phase.py +++ b/aviary/mission/two_dof/phases/cruise_phase.py @@ -1,10 +1,7 @@ -from aviary.mission.two_dof.ode.breguet_cruise_ode import ( - BreguetCruiseODE, - ElectricBreguetCruiseODE, -) from aviary.mission.initial_guess_builders import InitialGuessIntegrationVariable, InitialGuessState from aviary.mission.phase_builder import PhaseBuilder from aviary.mission.phase_utils import add_subsystem_variables_to_phase +from aviary.mission.two_dof.ode.breguet_cruise_ode import BreguetCruiseODE, ElectricBreguetCruiseODE from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.variables import Dynamic diff --git a/aviary/mission/two_dof/phases/flight_phase.py b/aviary/mission/two_dof/phases/flight_phase.py index e2cd51d5d2..ed48ead3ed 100644 --- a/aviary/mission/two_dof/phases/flight_phase.py +++ b/aviary/mission/two_dof/phases/flight_phase.py @@ -6,6 +6,7 @@ ) from aviary.mission.phase_builder import PhaseBuilder from aviary.mission.phase_utils import add_subsystem_variables_to_phase +from aviary.mission.two_dof.ode.climb_ode import ClimbODE from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.enums import SpeedType diff --git a/aviary/mission/two_dof/phases/groundroll_phase.py b/aviary/mission/two_dof/phases/groundroll_phase.py index 96868ec66c..36b42a8461 100644 --- a/aviary/mission/two_dof/phases/groundroll_phase.py +++ b/aviary/mission/two_dof/phases/groundroll_phase.py @@ -1,14 +1,14 @@ -from aviary.mission.two_dof.ode.groundroll_ode import GroundrollODE from aviary.mission.initial_guess_builders import ( InitialGuessControl, InitialGuessIntegrationVariable, InitialGuessState, ) from aviary.mission.phase_builder import PhaseBuilder +from aviary.mission.phase_utils import add_subsystem_variables_to_phase +from aviary.mission.two_dof.ode.groundroll_ode import GroundrollODE from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.variables import Dynamic -from aviary.mission.phase_utils import add_subsystem_variables_to_phase class GroundrollPhaseOptions(AviaryOptionsDictionary): diff --git a/aviary/mission/two_dof/phases/rotation_phase.py b/aviary/mission/two_dof/phases/rotation_phase.py index e1f0c5d35e..ce3e8ea5b1 100644 --- a/aviary/mission/two_dof/phases/rotation_phase.py +++ b/aviary/mission/two_dof/phases/rotation_phase.py @@ -1,16 +1,16 @@ import numpy as np -from aviary.mission.two_dof.ode.rotation_ode import RotationODE from aviary.mission.initial_guess_builders import ( InitialGuessControl, InitialGuessIntegrationVariable, InitialGuessState, ) from aviary.mission.phase_builder import PhaseBuilder +from aviary.mission.phase_utils import add_subsystem_variables_to_phase +from aviary.mission.two_dof.ode.rotation_ode import RotationODE from aviary.utils.aviary_options_dict import AviaryOptionsDictionary from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.variables import Dynamic -from aviary.mission.phase_utils import add_subsystem_variables_to_phase class RotationPhaseOptions(AviaryOptionsDictionary): diff --git a/aviary/mission/two_dof_problem_configurator.py b/aviary/mission/two_dof_problem_configurator.py index b0c9d561ae..ef812f640e 100644 --- a/aviary/mission/two_dof_problem_configurator.py +++ b/aviary/mission/two_dof_problem_configurator.py @@ -1,6 +1,7 @@ import openmdao.api as om from aviary.constants import GRAV_ENGLISH_LBM, RHO_SEA_LEVEL_ENGLISH +from aviary.mission.problem_configurator import ProblemConfiguratorBase from aviary.mission.two_dof.ode.landing_ode import LandingSegment from aviary.mission.two_dof.ode.params import ParamPort from aviary.mission.two_dof.ode.taxi_ode import TaxiSegment @@ -11,7 +12,6 @@ from aviary.mission.two_dof.phases.groundroll_phase import GroundrollPhase from aviary.mission.two_dof.phases.rotation_phase import RotationPhase from aviary.mission.two_dof.polynomial_fit import PolynomialFit -from aviary.mission.problem_configurator import ProblemConfiguratorBase from aviary.mission.utils import process_guess_var from aviary.subsystems.propulsion.utils import build_engine_deck from aviary.utils.process_input_decks import initialization_guessing, update_GASP_options diff --git a/aviary/mission/utils.py b/aviary/mission/utils.py index f653ef7fb8..e828860968 100644 --- a/aviary/mission/utils.py +++ b/aviary/mission/utils.py @@ -1,5 +1,5 @@ -import openmdao.api as om import numpy as np +import openmdao.api as om from aviary.utils.functions import promote_aircraft_and_mission_vars diff --git a/aviary/models/aircraft/blended_wing_body/generic_BWB_2dof_phase_info.py b/aviary/models/aircraft/blended_wing_body/generic_BWB_2dof_phase_info.py index d709e0cc03..1047f1f618 100644 --- a/aviary/models/aircraft/blended_wing_body/generic_BWB_2dof_phase_info.py +++ b/aviary/models/aircraft/blended_wing_body/generic_BWB_2dof_phase_info.py @@ -1,6 +1,5 @@ from aviary.variable_info.enums import SpeedType - # 2DOF phase_info = { 'groundroll': { diff --git a/aviary/models/missions/height_energy_default.py b/aviary/models/missions/height_energy_default.py index 33507335ae..855564e1a9 100644 --- a/aviary/models/missions/height_energy_default.py +++ b/aviary/models/missions/height_energy_default.py @@ -1,5 +1,5 @@ -from aviary.variable_info.variables import Mission from aviary.variable_info.enums import Transcription +from aviary.variable_info.variables import Mission # defaults for height energy based phases diff --git a/aviary/subsystems/aerodynamics/aerodynamics_builder.py b/aviary/subsystems/aerodynamics/aerodynamics_builder.py index e5167ffc94..a7e676bb33 100644 --- a/aviary/subsystems/aerodynamics/aerodynamics_builder.py +++ b/aviary/subsystems/aerodynamics/aerodynamics_builder.py @@ -31,7 +31,6 @@ from aviary.variable_info.variable_meta_data import _MetaData from aviary.variable_info.variables import Aircraft, Dynamic, Mission, Settings - GASP = LegacyCode.GASP FLOPS = LegacyCode.FLOPS diff --git a/aviary/subsystems/aerodynamics/flops_based/takeoff_aero_group.py b/aviary/subsystems/aerodynamics/flops_based/takeoff_aero_group.py index 0899aa0663..08df9d010d 100644 --- a/aviary/subsystems/aerodynamics/flops_based/takeoff_aero_group.py +++ b/aviary/subsystems/aerodynamics/flops_based/takeoff_aero_group.py @@ -9,8 +9,8 @@ from aviary.subsystems.aerodynamics.flops_based.ground_effect import GroundEffect from aviary.subsystems.aerodynamics.gasp_based.common import AeroForces from aviary.utils.aviary_values import AviaryValues -from aviary.variable_info.variables import Aircraft, Dynamic, Mission from aviary.variable_info.functions import add_aviary_option +from aviary.variable_info.variables import Aircraft, Dynamic, Mission class TakeoffAeroGroup(om.Group): diff --git a/aviary/subsystems/aerodynamics/flops_based/test/test_tabular_aero_group.py b/aviary/subsystems/aerodynamics/flops_based/test/test_tabular_aero_group.py index 2ffa1003c2..d509c68427 100644 --- a/aviary/subsystems/aerodynamics/flops_based/test/test_tabular_aero_group.py +++ b/aviary/subsystems/aerodynamics/flops_based/test/test_tabular_aero_group.py @@ -7,8 +7,8 @@ from openmdao.utils.testing_utils import use_tempdirs from parameterized import parameterized +from aviary.core.aviary_problem import AviaryProblem from aviary.models.missions.height_energy_default import phase_info -from aviary.interface.methods_for_level2 import AviaryProblem from aviary.subsystems.aerodynamics.aerodynamics_builder import CoreAerodynamicsBuilder from aviary.subsystems.atmosphere.atmosphere import Atmosphere from aviary.subsystems.premission import CorePreMission diff --git a/aviary/subsystems/aerodynamics/flops_based/test/test_takeoff_aero_group.py b/aviary/subsystems/aerodynamics/flops_based/test/test_takeoff_aero_group.py index 808500dda1..faa7ca2c91 100644 --- a/aviary/subsystems/aerodynamics/flops_based/test/test_takeoff_aero_group.py +++ b/aviary/subsystems/aerodynamics/flops_based/test/test_takeoff_aero_group.py @@ -12,10 +12,10 @@ from aviary.subsystems.aerodynamics.aerodynamics_builder import CoreAerodynamicsBuilder from aviary.subsystems.atmosphere.atmosphere import Atmosphere from aviary.utils.aviary_values import AviaryValues, get_items +from aviary.utils.preprocessors import preprocess_options from aviary.variable_info.enums import LegacyCode from aviary.variable_info.functions import setup_model_options from aviary.variable_info.variables import Aircraft, Dynamic, Mission -from aviary.utils.preprocessors import preprocess_options class TestTakeoffAeroGroup(unittest.TestCase): diff --git a/aviary/subsystems/aerodynamics/gasp_based/flaps_model/test/test_flaps_group.py b/aviary/subsystems/aerodynamics/gasp_based/flaps_model/test/test_flaps_group.py index 07e4428bf9..a850e7921e 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/flaps_model/test/test_flaps_group.py +++ b/aviary/subsystems/aerodynamics/gasp_based/flaps_model/test/test_flaps_group.py @@ -3,10 +3,10 @@ import openmdao.api as om from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal -from aviary.subsystems.aerodynamics.gasp_based.flaps_model.flaps_model import FlapsGroup from aviary.subsystems.aerodynamics.gasp_based.flaps_model.basic_calculations import ( BasicFlapsGeometry, ) +from aviary.subsystems.aerodynamics.gasp_based.flaps_model.flaps_model import FlapsGroup from aviary.variable_info.enums import FlapType from aviary.variable_info.functions import setup_model_options from aviary.variable_info.options import get_option_defaults diff --git a/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py b/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py index d243dcb564..0e7ea0a6c8 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py +++ b/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py @@ -1,11 +1,12 @@ import warnings + import numpy as np import openmdao.api as om from openmdao.utils import cs_safe as cs from aviary.constants import GRAV_ENGLISH_LBM from aviary.subsystems.aerodynamics.gasp_based.common import AeroForces, CLFromLift, TanhRampComp -from aviary.utils.math import sigmoidX, smooth_min, d_smooth_min +from aviary.utils.math import d_smooth_min, sigmoidX, smooth_min from aviary.variable_info.enums import AircraftTypes, Verbosity from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output from aviary.variable_info.variables import Aircraft, Dynamic, Mission, Settings diff --git a/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py b/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py index aa369b5fe9..a2dcdce37b 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py +++ b/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py @@ -9,6 +9,11 @@ from aviary.subsystems.aerodynamics.gasp_based.gaspaero import ( AeroGeom, + BWBAeroSetup, + BWBBodyLiftCurveSlope, + BWBFormFactorAndSIWB, + BWBLiftCoeff, + BWBLiftCoeffClean, CruiseAero, DragCoef, DragCoefClean, @@ -18,13 +23,8 @@ LiftCoeffClean, LowSpeedAero, UFac, - Xlifts, WingTailRatios, - BWBBodyLiftCurveSlope, - BWBFormFactorAndSIWB, - BWBLiftCoeff, - BWBLiftCoeffClean, - BWBAeroSetup, + Xlifts, ) from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.functions import setup_model_options diff --git a/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py b/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py index 9ed3eae972..cce2af017a 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py +++ b/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py @@ -1,7 +1,6 @@ import unittest import openmdao.api as om -from aviary.subsystems.atmosphere.atmosphere import AtmosphereComp from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal from aviary.subsystems.aerodynamics.gasp_based.interference import ( @@ -13,6 +12,7 @@ WingFuselageInterferenceMission, WingFuselageInterferencePremission, ) +from aviary.subsystems.atmosphere.atmosphere import AtmosphereComp from aviary.variable_info.variables import Aircraft, Dynamic tol = 1e-6 diff --git a/aviary/subsystems/aerodynamics/gasp_based/test/test_solved_aero_group.py b/aviary/subsystems/aerodynamics/gasp_based/test/test_solved_aero_group.py index 6319c815fd..29075b9f09 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/test/test_solved_aero_group.py +++ b/aviary/subsystems/aerodynamics/gasp_based/test/test_solved_aero_group.py @@ -11,8 +11,8 @@ import openmdao.api as om from openmdao.utils.assert_utils import assert_near_equal +from aviary.core.aviary_problem import AviaryProblem from aviary.models.missions.height_energy_default import phase_info -from aviary.interface.methods_for_level2 import AviaryProblem from aviary.subsystems.subsystem_builder import SubsystemBuilder from aviary.utils.csv_data_file import read_data_file from aviary.utils.named_values import NamedValues diff --git a/aviary/subsystems/aerodynamics/test/test_gasp_drag.py b/aviary/subsystems/aerodynamics/test/test_gasp_drag.py index 733f84eef9..0e1aafc934 100644 --- a/aviary/subsystems/aerodynamics/test/test_gasp_drag.py +++ b/aviary/subsystems/aerodynamics/test/test_gasp_drag.py @@ -5,8 +5,8 @@ from openmdao.utils.assert_utils import assert_near_equal +from aviary.core.aviary_problem import AviaryProblem from aviary.models.missions.two_dof_default import phase_info -from aviary.interface.methods_for_level2 import AviaryProblem from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Cold.py b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Cold.py index dfda090a0e..62034be529 100644 --- a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Cold.py +++ b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Cold.py @@ -5,6 +5,7 @@ """ from collections import namedtuple + import numpy as np atm_data = namedtuple('MIL_SPEC_210A_Cold', ['alt', 'temp', 'pres', 'rho']) diff --git a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Hot.py b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Hot.py index 1f36e9e163..3cfdcec615 100644 --- a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Hot.py +++ b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Hot.py @@ -5,6 +5,7 @@ """ from collections import namedtuple + import numpy as np atm_data = namedtuple('MIL_SPEC_210A_Hot', ['alt', 'temp', 'pres', 'rho']) diff --git a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Polar.py b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Polar.py index 32eaea67e2..23844170ee 100644 --- a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Polar.py +++ b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Polar.py @@ -5,6 +5,7 @@ """ from collections import namedtuple + import numpy as np atm_data = namedtuple('MIL_SPEC_210A_Polar', ['alt', 'temp', 'pres', 'rho']) diff --git a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Tropical.py b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Tropical.py index 638aa8ce26..d88c74435c 100644 --- a/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Tropical.py +++ b/aviary/subsystems/atmosphere/data/MIL_SPEC_210A_Tropical.py @@ -41,6 +41,7 @@ """ from collections import namedtuple + import numpy as np atm_data = namedtuple('MIL_SPEC_210A_Tropical', ['alt', 'temp', 'pres', 'rho']) diff --git a/aviary/subsystems/atmosphere/data/StandardAtm1976.py b/aviary/subsystems/atmosphere/data/StandardAtm1976.py index 2ac104b009..6fe3f98ad3 100644 --- a/aviary/subsystems/atmosphere/data/StandardAtm1976.py +++ b/aviary/subsystems/atmosphere/data/StandardAtm1976.py @@ -6,11 +6,10 @@ Notes: The data table contains data from -5,000 meters to 83,000 meters altitude """ -from collections import namedtuple import sys +from collections import namedtuple import numpy as np - import openmdao.api as om atm_data = namedtuple('USatm1976Data', ['alt', 'temp', 'pres', 'rho']) diff --git a/aviary/subsystems/geometry/flops_based/fuselage.py b/aviary/subsystems/geometry/flops_based/fuselage.py index 35c4cfaf1e..dbf82716a5 100644 --- a/aviary/subsystems/geometry/flops_based/fuselage.py +++ b/aviary/subsystems/geometry/flops_based/fuselage.py @@ -3,7 +3,7 @@ import numpy as np import openmdao.api as om -from aviary.utils.math import smooth_int_tanh, d_smooth_int_tanh +from aviary.utils.math import d_smooth_int_tanh, smooth_int_tanh from aviary.variable_info.enums import Verbosity from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output from aviary.variable_info.variables import Aircraft, Mission, Settings diff --git a/aviary/subsystems/geometry/flops_based/prep_geom.py b/aviary/subsystems/geometry/flops_based/prep_geom.py index a96086800f..9d02abf107 100644 --- a/aviary/subsystems/geometry/flops_based/prep_geom.py +++ b/aviary/subsystems/geometry/flops_based/prep_geom.py @@ -36,8 +36,8 @@ from aviary.subsystems.geometry.flops_based.wetted_area_total import TotalWettedArea from aviary.subsystems.geometry.flops_based.wing import WingPrelim from aviary.subsystems.geometry.flops_based.wing_detailed_bwb import ( - BWBUpdateDetailedWingDist, BWBComputeDetailedWingDist, + BWBUpdateDetailedWingDist, BWBWingPrelim, ) from aviary.variable_info.enums import AircraftTypes, Verbosity diff --git a/aviary/subsystems/geometry/flops_based/test/test_fuselage.py b/aviary/subsystems/geometry/flops_based/test/test_fuselage.py index e839ee9d2d..99eac5a259 100644 --- a/aviary/subsystems/geometry/flops_based/test/test_fuselage.py +++ b/aviary/subsystems/geometry/flops_based/test/test_fuselage.py @@ -1,14 +1,15 @@ import unittest + import openmdao.api as om from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal from openmdao.utils.testing_utils import use_tempdirs from aviary.subsystems.geometry.flops_based.fuselage import ( BWBDetailedCabinLayout, + BWBFuselagePrelim, BWBSimpleCabinLayout, DetailedCabinLayout, SimpleCabinLayout, - BWBFuselagePrelim, ) from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.functions import setup_model_options diff --git a/aviary/subsystems/geometry/flops_based/test/test_prep_geom.py b/aviary/subsystems/geometry/flops_based/test/test_prep_geom.py index e334ab0f31..a0286a67e8 100644 --- a/aviary/subsystems/geometry/flops_based/test/test_prep_geom.py +++ b/aviary/subsystems/geometry/flops_based/test/test_prep_geom.py @@ -18,8 +18,8 @@ from aviary.subsystems.geometry.flops_based.fuselage import FuselagePrelim from aviary.subsystems.geometry.flops_based.nacelle import Nacelles from aviary.subsystems.geometry.flops_based.prep_geom import ( - _BWBWing, PrepGeom, + _BWBWing, _Fuselage, _FuselageRatios, _Prelim, diff --git a/aviary/subsystems/geometry/flops_based/test/test_wing_detailed_bwb.py b/aviary/subsystems/geometry/flops_based/test/test_wing_detailed_bwb.py index 8ca47622a7..2e5469b21f 100644 --- a/aviary/subsystems/geometry/flops_based/test/test_wing_detailed_bwb.py +++ b/aviary/subsystems/geometry/flops_based/test/test_wing_detailed_bwb.py @@ -1,5 +1,6 @@ -import numpy as np import unittest + +import numpy as np import openmdao.api as om from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal from openmdao.utils.testing_utils import use_tempdirs diff --git a/aviary/subsystems/geometry/gasp_based/empennage.py b/aviary/subsystems/geometry/gasp_based/empennage.py index 9eab367bdf..b67feb739f 100644 --- a/aviary/subsystems/geometry/gasp_based/empennage.py +++ b/aviary/subsystems/geometry/gasp_based/empennage.py @@ -1,7 +1,7 @@ import numpy as np import openmdao.api as om -from aviary.variable_info.functions import add_aviary_input, add_aviary_output, add_aviary_option +from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/geometry/gasp_based/size_group.py b/aviary/subsystems/geometry/gasp_based/size_group.py index 469af82850..9273cd3b87 100644 --- a/aviary/subsystems/geometry/gasp_based/size_group.py +++ b/aviary/subsystems/geometry/gasp_based/size_group.py @@ -2,9 +2,9 @@ from aviary.subsystems.geometry.gasp_based.electric import CableSize from aviary.subsystems.geometry.gasp_based.empennage import EmpennageSize -from aviary.subsystems.geometry.gasp_based.engine import EngineSize, BWBEngineSizeGroup -from aviary.subsystems.geometry.gasp_based.fuselage import FuselageGroup, BWBFuselageGroup -from aviary.subsystems.geometry.gasp_based.wing import WingGroup, BWBWingGroup +from aviary.subsystems.geometry.gasp_based.engine import BWBEngineSizeGroup, EngineSize +from aviary.subsystems.geometry.gasp_based.fuselage import BWBFuselageGroup, FuselageGroup +from aviary.subsystems.geometry.gasp_based.wing import BWBWingGroup, WingGroup from aviary.variable_info.enums import AircraftTypes from aviary.variable_info.functions import add_aviary_option from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/geometry/gasp_based/test/test_override.py b/aviary/subsystems/geometry/gasp_based/test/test_override.py index 16722d1c8d..a992e408c1 100644 --- a/aviary/subsystems/geometry/gasp_based/test/test_override.py +++ b/aviary/subsystems/geometry/gasp_based/test/test_override.py @@ -5,7 +5,7 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import use_tempdirs -from aviary.interface.methods_for_level2 import AviaryGroup +from aviary.core.aviary_problem import AviaryGroup from aviary.subsystems.aerodynamics.gasp_based.gaspaero import AeroGeom from aviary.subsystems.premission import CorePreMission from aviary.subsystems.propulsion.utils import build_engine_deck diff --git a/aviary/subsystems/geometry/gasp_based/test/test_wing.py b/aviary/subsystems/geometry/gasp_based/test/test_wing.py index cd37a45e17..b1c503b350 100644 --- a/aviary/subsystems/geometry/gasp_based/test/test_wing.py +++ b/aviary/subsystems/geometry/gasp_based/test/test_wing.py @@ -5,9 +5,9 @@ from openmdao.utils.testing_utils import use_tempdirs from aviary.subsystems.geometry.gasp_based.wing import ( - BWBWingVolume, BWBWingFoldVolume, BWBWingGroup, + BWBWingVolume, ExposedWing, WingFoldArea, WingFoldVolume, diff --git a/aviary/subsystems/geometry/gasp_based/wing.py b/aviary/subsystems/geometry/gasp_based/wing.py index db7851cf0a..c60b6a9070 100644 --- a/aviary/subsystems/geometry/gasp_based/wing.py +++ b/aviary/subsystems/geometry/gasp_based/wing.py @@ -7,7 +7,7 @@ ) from aviary.subsystems.geometry.gasp_based.strut import StrutGeom from aviary.utils.conflict_checks import check_fold_location_definition -from aviary.utils.math import sigmoidX, dSigmoidXdx +from aviary.utils.math import dSigmoidXdx, sigmoidX from aviary.variable_info.enums import AircraftTypes, Verbosity from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output from aviary.variable_info.variables import Aircraft, Mission, Settings diff --git a/aviary/subsystems/mass/flops_based/cargo_containers.py b/aviary/subsystems/mass/flops_based/cargo_containers.py index 47a4995381..bf2c21538d 100644 --- a/aviary/subsystems/mass/flops_based/cargo_containers.py +++ b/aviary/subsystems/mass/flops_based/cargo_containers.py @@ -2,7 +2,7 @@ import openmdao.api as om from aviary.constants import GRAV_ENGLISH_LBM -from aviary.utils.math import sin_int4, dydx_sin_int4 +from aviary.utils.math import dydx_sin_int4, sin_int4 from aviary.variable_info.functions import add_aviary_input, add_aviary_output from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/fuel_capacity.py b/aviary/subsystems/mass/flops_based/fuel_capacity.py index 932588d3b6..4281718c86 100644 --- a/aviary/subsystems/mass/flops_based/fuel_capacity.py +++ b/aviary/subsystems/mass/flops_based/fuel_capacity.py @@ -1,8 +1,8 @@ import openmdao.api as om +from openmdao.utils.units import convert_units from aviary.variable_info.functions import add_aviary_input, add_aviary_output from aviary.variable_info.variables import Aircraft -from openmdao.utils.units import convert_units class FuelCapacityGroup(om.Group): diff --git a/aviary/subsystems/mass/flops_based/test/test_air_conditioning.py b/aviary/subsystems/mass/flops_based/test/test_air_conditioning.py index 7200c76417..5b56f61769 100644 --- a/aviary/subsystems/mass/flops_based/test/test_air_conditioning.py +++ b/aviary/subsystems/mass/flops_based/test/test_air_conditioning.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.air_conditioning import AltAirCondMass, TransportAirCondMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_anti_icing.py b/aviary/subsystems/mass/flops_based/test/test_anti_icing.py index 7b7629c3e2..49003841f9 100644 --- a/aviary/subsystems/mass/flops_based/test/test_anti_icing.py +++ b/aviary/subsystems/mass/flops_based/test/test_anti_icing.py @@ -9,11 +9,11 @@ from aviary.subsystems.mass.flops_based.anti_icing import AntiIcingMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_apu.py b/aviary/subsystems/mass/flops_based/test/test_apu.py index 47d1e31d9a..ecbeb28061 100644 --- a/aviary/subsystems/mass/flops_based/test/test_apu.py +++ b/aviary/subsystems/mass/flops_based/test/test_apu.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.apu import TransportAPUMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_avionics.py b/aviary/subsystems/mass/flops_based/test/test_avionics.py index d5e9d29078..1e64dd6e22 100644 --- a/aviary/subsystems/mass/flops_based/test/test_avionics.py +++ b/aviary/subsystems/mass/flops_based/test/test_avionics.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.avionics import TransportAvionicsMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_cargo_containers.py b/aviary/subsystems/mass/flops_based/test/test_cargo_containers.py index 7161b566a6..78d899e74d 100644 --- a/aviary/subsystems/mass/flops_based/test/test_cargo_containers.py +++ b/aviary/subsystems/mass/flops_based/test/test_cargo_containers.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.cargo_containers import TransportCargoContainersMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_crew.py b/aviary/subsystems/mass/flops_based/test/test_crew.py index f656cea1e6..ebfd2fe8e5 100644 --- a/aviary/subsystems/mass/flops_based/test/test_crew.py +++ b/aviary/subsystems/mass/flops_based/test/test_crew.py @@ -4,14 +4,14 @@ from openmdao.utils.testing_utils import use_tempdirs from parameterized import parameterized -from aviary.subsystems.mass.flops_based.crew import FlightCrewMass, CabinCrewMass +from aviary.subsystems.mass.flops_based.crew import CabinCrewMass, FlightCrewMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_electrical.py b/aviary/subsystems/mass/flops_based/test/test_electrical.py index 5748dfebda..94abc5e5b4 100644 --- a/aviary/subsystems/mass/flops_based/test/test_electrical.py +++ b/aviary/subsystems/mass/flops_based/test/test_electrical.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.electrical import AltElectricalMass, ElectricalMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_empty_margin.py b/aviary/subsystems/mass/flops_based/test/test_empty_margin.py index 9b15998674..2a87877604 100644 --- a/aviary/subsystems/mass/flops_based/test/test_empty_margin.py +++ b/aviary/subsystems/mass/flops_based/test/test_empty_margin.py @@ -7,11 +7,11 @@ from aviary.subsystems.mass.flops_based.empty_margin import EmptyMassMargin from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_engine.py b/aviary/subsystems/mass/flops_based/test/test_engine.py index fc6278d200..18e2da152a 100644 --- a/aviary/subsystems/mass/flops_based/test/test_engine.py +++ b/aviary/subsystems/mass/flops_based/test/test_engine.py @@ -13,11 +13,11 @@ from aviary.utils.preprocessors import preprocess_propulsion from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Settings diff --git a/aviary/subsystems/mass/flops_based/test/test_engine_controls.py b/aviary/subsystems/mass/flops_based/test/test_engine_controls.py index ea705a065a..68d9da71fb 100644 --- a/aviary/subsystems/mass/flops_based/test/test_engine_controls.py +++ b/aviary/subsystems/mass/flops_based/test/test_engine_controls.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.engine_controls import TransportEngineCtrlsMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_engine_oil.py b/aviary/subsystems/mass/flops_based/test/test_engine_oil.py index 961ac22623..c8bb2386bb 100644 --- a/aviary/subsystems/mass/flops_based/test/test_engine_oil.py +++ b/aviary/subsystems/mass/flops_based/test/test_engine_oil.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.engine_oil import AltEngineOilMass, TransportEngineOilMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_engine_pod.py b/aviary/subsystems/mass/flops_based/test/test_engine_pod.py index 07e3ac0530..d1269c7c85 100644 --- a/aviary/subsystems/mass/flops_based/test/test_engine_pod.py +++ b/aviary/subsystems/mass/flops_based/test/test_engine_pod.py @@ -9,11 +9,11 @@ from aviary.subsystems.mass.flops_based.engine_pod import EnginePodMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_fin.py b/aviary/subsystems/mass/flops_based/test/test_fin.py index 24d7af4739..641398fb63 100644 --- a/aviary/subsystems/mass/flops_based/test/test_fin.py +++ b/aviary/subsystems/mass/flops_based/test/test_fin.py @@ -9,12 +9,12 @@ from aviary.utils.aviary_values import AviaryValues from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, do_validation_test, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_fuel_system.py b/aviary/subsystems/mass/flops_based/test/test_fuel_system.py index 12c3fb265e..453157a384 100644 --- a/aviary/subsystems/mass/flops_based/test/test_fuel_system.py +++ b/aviary/subsystems/mass/flops_based/test/test_fuel_system.py @@ -11,11 +11,11 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_furnishings.py b/aviary/subsystems/mass/flops_based/test/test_furnishings.py index af0e1f0457..4f89bd55a0 100644 --- a/aviary/subsystems/mass/flops_based/test/test_furnishings.py +++ b/aviary/subsystems/mass/flops_based/test/test_furnishings.py @@ -13,12 +13,12 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_fuselage.py b/aviary/subsystems/mass/flops_based/test/test_fuselage.py index 0d409f46f7..4fcd059e18 100644 --- a/aviary/subsystems/mass/flops_based/test/test_fuselage.py +++ b/aviary/subsystems/mass/flops_based/test/test_fuselage.py @@ -14,11 +14,11 @@ from aviary.utils.aviary_values import AviaryValues from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.functions import setup_model_options from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_horizontail_tail.py b/aviary/subsystems/mass/flops_based/test/test_horizontail_tail.py index de43ab99e0..d0380ceb56 100644 --- a/aviary/subsystems/mass/flops_based/test/test_horizontail_tail.py +++ b/aviary/subsystems/mass/flops_based/test/test_horizontail_tail.py @@ -11,10 +11,10 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_hydraulics.py b/aviary/subsystems/mass/flops_based/test/test_hydraulics.py index 9a31f34a31..d8a4732243 100644 --- a/aviary/subsystems/mass/flops_based/test/test_hydraulics.py +++ b/aviary/subsystems/mass/flops_based/test/test_hydraulics.py @@ -11,11 +11,11 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_instruments.py b/aviary/subsystems/mass/flops_based/test/test_instruments.py index 6e4efd43ec..fa3e91558f 100644 --- a/aviary/subsystems/mass/flops_based/test/test_instruments.py +++ b/aviary/subsystems/mass/flops_based/test/test_instruments.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.instruments import TransportInstrumentMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_landing_gear.py b/aviary/subsystems/mass/flops_based/test/test_landing_gear.py index dd585de091..530466a8db 100644 --- a/aviary/subsystems/mass/flops_based/test/test_landing_gear.py +++ b/aviary/subsystems/mass/flops_based/test/test_landing_gear.py @@ -13,11 +13,11 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_landing_mass.py b/aviary/subsystems/mass/flops_based/test/test_landing_mass.py index 50446cc73e..f81d0a3d80 100644 --- a/aviary/subsystems/mass/flops_based/test/test_landing_mass.py +++ b/aviary/subsystems/mass/flops_based/test/test_landing_mass.py @@ -7,10 +7,10 @@ from aviary.subsystems.mass.flops_based.landing_mass import LandingMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_misc_engine.py b/aviary/subsystems/mass/flops_based/test/test_misc_engine.py index c9d727271b..5b460c35eb 100644 --- a/aviary/subsystems/mass/flops_based/test/test_misc_engine.py +++ b/aviary/subsystems/mass/flops_based/test/test_misc_engine.py @@ -13,11 +13,11 @@ from aviary.utils.preprocessors import preprocess_propulsion from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Settings diff --git a/aviary/subsystems/mass/flops_based/test/test_nacelle.py b/aviary/subsystems/mass/flops_based/test/test_nacelle.py index b9e940fb02..b94016803f 100644 --- a/aviary/subsystems/mass/flops_based/test/test_nacelle.py +++ b/aviary/subsystems/mass/flops_based/test/test_nacelle.py @@ -13,11 +13,11 @@ from aviary.utils.preprocessors import preprocess_propulsion from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Settings diff --git a/aviary/subsystems/mass/flops_based/test/test_paint.py b/aviary/subsystems/mass/flops_based/test/test_paint.py index 93291f3d4d..6b6d7f9c62 100644 --- a/aviary/subsystems/mass/flops_based/test/test_paint.py +++ b/aviary/subsystems/mass/flops_based/test/test_paint.py @@ -7,10 +7,10 @@ from aviary.subsystems.mass.flops_based.paint import PaintMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_passenger_service.py b/aviary/subsystems/mass/flops_based/test/test_passenger_service.py index c338106098..70755b4a43 100644 --- a/aviary/subsystems/mass/flops_based/test/test_passenger_service.py +++ b/aviary/subsystems/mass/flops_based/test/test_passenger_service.py @@ -11,11 +11,11 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_payload.py b/aviary/subsystems/mass/flops_based/test/test_payload.py index b07f512781..17d3ec8943 100644 --- a/aviary/subsystems/mass/flops_based/test/test_payload.py +++ b/aviary/subsystems/mass/flops_based/test/test_payload.py @@ -8,12 +8,12 @@ from aviary.utils.aviary_values import AviaryValues from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, do_validation_test, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_starter.py b/aviary/subsystems/mass/flops_based/test/test_starter.py index a7bd7f40f0..49184d19c9 100644 --- a/aviary/subsystems/mass/flops_based/test/test_starter.py +++ b/aviary/subsystems/mass/flops_based/test/test_starter.py @@ -9,12 +9,12 @@ from aviary.subsystems.mass.flops_based.starter import TransportStarterMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_surface_controls.py b/aviary/subsystems/mass/flops_based/test/test_surface_controls.py index b941c054b7..20484b880c 100644 --- a/aviary/subsystems/mass/flops_based/test/test_surface_controls.py +++ b/aviary/subsystems/mass/flops_based/test/test_surface_controls.py @@ -11,11 +11,11 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_thrust_reverser.py b/aviary/subsystems/mass/flops_based/test/test_thrust_reverser.py index 5d81f3015e..2649c178f0 100644 --- a/aviary/subsystems/mass/flops_based/test/test_thrust_reverser.py +++ b/aviary/subsystems/mass/flops_based/test/test_thrust_reverser.py @@ -12,11 +12,11 @@ from aviary.utils.preprocessors import preprocess_propulsion from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Settings diff --git a/aviary/subsystems/mass/flops_based/test/test_unusable_fuel.py b/aviary/subsystems/mass/flops_based/test/test_unusable_fuel.py index 449f44e62b..af05855b27 100644 --- a/aviary/subsystems/mass/flops_based/test/test_unusable_fuel.py +++ b/aviary/subsystems/mass/flops_based/test/test_unusable_fuel.py @@ -11,11 +11,11 @@ ) from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/flops_based/test/test_vertical_tail.py b/aviary/subsystems/mass/flops_based/test/test_vertical_tail.py index a1a13b3cd6..36b2e9e8e1 100644 --- a/aviary/subsystems/mass/flops_based/test/test_vertical_tail.py +++ b/aviary/subsystems/mass/flops_based/test/test_vertical_tail.py @@ -8,11 +8,11 @@ from aviary.subsystems.mass.flops_based.vertical_tail import AltVerticalTailMass, VerticalTailMass from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_options, print_case, - Version, ) from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/flops_based/test/test_wing_common.py b/aviary/subsystems/mass/flops_based/test/test_wing_common.py index 64b4e5dfd0..9265719d1f 100644 --- a/aviary/subsystems/mass/flops_based/test/test_wing_common.py +++ b/aviary/subsystems/mass/flops_based/test/test_wing_common.py @@ -11,7 +11,6 @@ WingMiscMass, WingShearControlMass, ) -from aviary.variable_info.functions import setup_model_options from aviary.utils.aviary_values import AviaryValues from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( @@ -19,6 +18,7 @@ get_flops_case_names, print_case, ) +from aviary.variable_info.functions import setup_model_options from aviary.variable_info.variables import Aircraft, Mission, Settings bwb_cases = ['BWBsimpleFLOPS', 'BWBdetailedFLOPS'] diff --git a/aviary/subsystems/mass/flops_based/test/test_wing_group.py b/aviary/subsystems/mass/flops_based/test/test_wing_group.py index 0a63f5038e..cd56cc7c0c 100644 --- a/aviary/subsystems/mass/flops_based/test/test_wing_group.py +++ b/aviary/subsystems/mass/flops_based/test/test_wing_group.py @@ -2,9 +2,10 @@ import openmdao.api as om from openmdao.utils.testing_utils import use_tempdirs + from aviary.subsystems.mass.flops_based.wing_group import WingMassGroup +from aviary.validation_cases.validation_tests import Version, flops_validation_test, get_flops_data from aviary.variable_info.variables import Aircraft, Mission -from aviary.validation_cases.validation_tests import flops_validation_test, get_flops_data, Version @use_tempdirs diff --git a/aviary/subsystems/mass/flops_based/test/test_wing_simple.py b/aviary/subsystems/mass/flops_based/test/test_wing_simple.py index 36d022a624..9c1a75008c 100644 --- a/aviary/subsystems/mass/flops_based/test/test_wing_simple.py +++ b/aviary/subsystems/mass/flops_based/test/test_wing_simple.py @@ -7,11 +7,11 @@ from aviary.subsystems.mass.flops_based.wing_simple import SimpleWingBendingFact from aviary.utils.test_utils.variable_test import assert_match_varnames from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, print_case, - Version, ) from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/gasp_based/design_load.py b/aviary/subsystems/mass/gasp_based/design_load.py index d6146a4c00..86c7480dee 100644 --- a/aviary/subsystems/mass/gasp_based/design_load.py +++ b/aviary/subsystems/mass/gasp_based/design_load.py @@ -2,7 +2,7 @@ import openmdao.api as om from aviary.constants import RHO_SEA_LEVEL_ENGLISH -from aviary.utils.math import sigmoidX, dSigmoidXdx +from aviary.utils.math import dSigmoidXdx, sigmoidX from aviary.variable_info.enums import Verbosity from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output from aviary.variable_info.variables import Aircraft, Mission, Settings diff --git a/aviary/subsystems/mass/gasp_based/equipment_and_useful_load.py b/aviary/subsystems/mass/gasp_based/equipment_and_useful_load.py index 5a7f71acc5..a9ac48c07d 100644 --- a/aviary/subsystems/mass/gasp_based/equipment_and_useful_load.py +++ b/aviary/subsystems/mass/gasp_based/equipment_and_useful_load.py @@ -2,7 +2,7 @@ import openmdao.api as om from aviary.constants import GRAV_ENGLISH_LBM -from aviary.utils.math import sigmoidX, dSigmoidXdx, smooth_max, d_smooth_max +from aviary.utils.math import d_smooth_max, dSigmoidXdx, sigmoidX, smooth_max from aviary.variable_info.enums import AircraftTypes, GASPEngineType, Verbosity from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output from aviary.variable_info.variables import Aircraft, Mission, Settings diff --git a/aviary/subsystems/mass/gasp_based/fuel.py b/aviary/subsystems/mass/gasp_based/fuel.py index 62358e4244..0bbe220465 100644 --- a/aviary/subsystems/mass/gasp_based/fuel.py +++ b/aviary/subsystems/mass/gasp_based/fuel.py @@ -1,6 +1,5 @@ import numpy as np import openmdao.api as om - from openmdao.utils.units import convert_units from aviary.constants import GRAV_ENGLISH_LBM diff --git a/aviary/subsystems/mass/gasp_based/mass_premission.py b/aviary/subsystems/mass/gasp_based/mass_premission.py index 838ee067cf..fc8c80bc2a 100644 --- a/aviary/subsystems/mass/gasp_based/mass_premission.py +++ b/aviary/subsystems/mass/gasp_based/mass_premission.py @@ -1,10 +1,10 @@ import openmdao.api as om -from aviary.subsystems.mass.gasp_based.design_load import DesignLoadGroup, BWBDesignLoadGroup +from aviary.subsystems.mass.gasp_based.design_load import BWBDesignLoadGroup, DesignLoadGroup from aviary.subsystems.mass.gasp_based.equipment_and_useful_load import EquipAndUsefulLoadMassGroup from aviary.subsystems.mass.gasp_based.fixed import FixedMassGroup from aviary.subsystems.mass.gasp_based.fuel import FuelMassGroup -from aviary.subsystems.mass.gasp_based.wing import WingMassGroup, BWBWingMassGroup +from aviary.subsystems.mass.gasp_based.wing import BWBWingMassGroup, WingMassGroup from aviary.variable_info.enums import AircraftTypes from aviary.variable_info.functions import add_aviary_option from aviary.variable_info.variables import Aircraft diff --git a/aviary/subsystems/mass/gasp_based/test/test_design_load.py b/aviary/subsystems/mass/gasp_based/test/test_design_load.py index e1f58cc988..5b9d8e44a5 100644 --- a/aviary/subsystems/mass/gasp_based/test/test_design_load.py +++ b/aviary/subsystems/mass/gasp_based/test/test_design_load.py @@ -5,17 +5,15 @@ from openmdao.utils.testing_utils import use_tempdirs from aviary.subsystems.mass.gasp_based.design_load import ( + BWBDesignLoadGroup, + BWBLoadFactors, + BWBLoadSpeeds, DesignLoadGroup, LiftCurveSlopeAtCruise, LoadFactors, LoadParameters, LoadSpeeds, ) -from aviary.subsystems.mass.gasp_based.design_load import ( - BWBDesignLoadGroup, - BWBLoadFactors, - BWBLoadSpeeds, -) from aviary.variable_info.functions import setup_model_options from aviary.variable_info.options import get_option_defaults from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/subsystems/mass/gasp_based/test/test_equipment_and_useful_load.py b/aviary/subsystems/mass/gasp_based/test/test_equipment_and_useful_load.py index 07755a1e58..486901a2b9 100644 --- a/aviary/subsystems/mass/gasp_based/test/test_equipment_and_useful_load.py +++ b/aviary/subsystems/mass/gasp_based/test/test_equipment_and_useful_load.py @@ -5,16 +5,16 @@ from openmdao.utils.testing_utils import use_tempdirs from aviary.subsystems.mass.gasp_based.equipment_and_useful_load import ( + ACMass, BWBACMass, - BWBFurnishingMass, BWBEquipMassGroup, - ACMass, + BWBFurnishingMass, + EquipAndUsefulLoadMassGroup, + EquipMassGroup, EquipMassPartialSum, - FurnishingMass, EquipMassSum, - EquipMassGroup, + FurnishingMass, UsefulLoadMass, - EquipAndUsefulLoadMassGroup, ) from aviary.variable_info.enums import GASPEngineType from aviary.variable_info.functions import setup_model_options diff --git a/aviary/subsystems/mass/gasp_based/test/test_fuel.py b/aviary/subsystems/mass/gasp_based/test/test_fuel.py index d70e62a220..176eb9a4f7 100644 --- a/aviary/subsystems/mass/gasp_based/test/test_fuel.py +++ b/aviary/subsystems/mass/gasp_based/test/test_fuel.py @@ -6,13 +6,13 @@ from aviary.subsystems.mass.gasp_based.fuel import ( BodyTankCalculations, + BWBFuselageMass, FuelAndOEMOutputs, FuelMass, FuelMassGroup, FuelSysAndFullFuselageMass, FuselageMass, StructMass, - BWBFuselageMass, ) from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.enums import Verbosity diff --git a/aviary/subsystems/mass/gasp_based/test/test_wing.py b/aviary/subsystems/mass/gasp_based/test/test_wing.py index 999a2ca90d..01828982cf 100644 --- a/aviary/subsystems/mass/gasp_based/test/test_wing.py +++ b/aviary/subsystems/mass/gasp_based/test/test_wing.py @@ -4,12 +4,17 @@ from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal from openmdao.utils.testing_utils import use_tempdirs -from aviary.subsystems.mass.gasp_based.wing import WingMassGroup, WingMassSolve, WingMassTotal -from aviary.subsystems.mass.gasp_based.wing import BWBWingMassSolve, BWBWingMassGroup +from aviary.subsystems.mass.gasp_based.wing import ( + BWBWingMassGroup, + BWBWingMassSolve, + WingMassGroup, + WingMassSolve, + WingMassTotal, +) +from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.functions import setup_model_options from aviary.variable_info.options import get_option_defaults from aviary.variable_info.variables import Aircraft, Mission -from aviary.utils.aviary_values import AviaryValues class WingMassSolveTestCase(unittest.TestCase): diff --git a/aviary/subsystems/performance/test/test_performance_premission.py b/aviary/subsystems/performance/test/test_performance_premission.py index 7bd33b6ea8..5d16fdfb85 100644 --- a/aviary/subsystems/performance/test/test_performance_premission.py +++ b/aviary/subsystems/performance/test/test_performance_premission.py @@ -2,8 +2,9 @@ import openmdao.api as om from openmdao.utils.assert_utils import assert_check_partials, assert_near_equal -from aviary.variable_info.variables import Aircraft, Mission + from aviary.subsystems.performance.performance_premission import PerformancePremission +from aviary.variable_info.variables import Aircraft, Mission class PerformancePremissionTest(unittest.TestCase): diff --git a/aviary/subsystems/propulsion/propeller/propeller_map.py b/aviary/subsystems/propulsion/propeller/propeller_map.py index 9c24d0aa86..d18c93b836 100644 --- a/aviary/subsystems/propulsion/propeller/propeller_map.py +++ b/aviary/subsystems/propulsion/propeller/propeller_map.py @@ -6,10 +6,10 @@ from aviary.utils.csv_data_file import read_data_file from aviary.utils.data_interpolator_builder import build_data_interpolator +from aviary.utils.named_values import NamedValues from aviary.variable_info.enums import Verbosity from aviary.variable_info.functions import add_aviary_option from aviary.variable_info.variables import Aircraft, Dynamic, Settings -from aviary.utils.named_values import NamedValues aliases = { # whitespaces are replaced with underscores converted to lowercase before diff --git a/aviary/subsystems/propulsion/propeller/test/test_propeller_map.py b/aviary/subsystems/propulsion/propeller/test/test_propeller_map.py index e3549a9114..cccf24309a 100644 --- a/aviary/subsystems/propulsion/propeller/test/test_propeller_map.py +++ b/aviary/subsystems/propulsion/propeller/test/test_propeller_map.py @@ -4,9 +4,9 @@ from openmdao.utils.assert_utils import assert_near_equal from aviary.subsystems.propulsion.propeller.propeller_map import PropellerMap +from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.functions import setup_model_options from aviary.variable_info.variables import Aircraft -from aviary.utils.aviary_values import AviaryValues class PropellerMapTest(unittest.TestCase): diff --git a/aviary/subsystems/propulsion/test/test_custom_engine_model.py b/aviary/subsystems/propulsion/test/test_custom_engine_model.py index e50f5c2afe..65cd72d003 100644 --- a/aviary/subsystems/propulsion/test/test_custom_engine_model.py +++ b/aviary/subsystems/propulsion/test/test_custom_engine_model.py @@ -6,7 +6,7 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.subsystems.propulsion.engine_model import EngineModel from aviary.utils.aviary_values import AviaryValues from aviary.variable_info.variables import Dynamic diff --git a/aviary/subsystems/test/test_external_subsystem_bus.py b/aviary/subsystems/test/test_external_subsystem_bus.py index 1fec8d9f80..a06621a778 100644 --- a/aviary/subsystems/test/test_external_subsystem_bus.py +++ b/aviary/subsystems/test/test_external_subsystem_bus.py @@ -9,7 +9,7 @@ from openmdao.utils.testing_utils import use_tempdirs import aviary.api as av -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.missions.height_energy_default import phase_info as ph_in from aviary.subsystems.subsystem_builder import SubsystemBuilder from aviary.variable_info.variables import Dynamic diff --git a/aviary/subsystems/test/test_flops_based_premission.py b/aviary/subsystems/test/test_flops_based_premission.py index 2ef158f33a..dc5efd6b0d 100644 --- a/aviary/subsystems/test/test_flops_based_premission.py +++ b/aviary/subsystems/test/test_flops_based_premission.py @@ -5,7 +5,7 @@ from openmdao.utils.testing_utils import use_tempdirs from parameterized import parameterized -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.subsystems.premission import CorePreMission from aviary.subsystems.propulsion.utils import build_engine_deck from aviary.utils.functions import set_aviary_initial_values @@ -15,12 +15,12 @@ get_geom_and_mass_subsystems, ) from aviary.validation_cases.validation_tests import ( + Version, flops_validation_test, get_flops_case_names, get_flops_inputs, get_flops_outputs, print_case, - Version, ) from aviary.variable_info.functions import setup_model_options from aviary.variable_info.variables import Aircraft, Mission, Settings diff --git a/aviary/subsystems/test/test_gasp_based_premission.py b/aviary/subsystems/test/test_gasp_based_premission.py index 9c6688efb1..ba005997f4 100644 --- a/aviary/subsystems/test/test_gasp_based_premission.py +++ b/aviary/subsystems/test/test_gasp_based_premission.py @@ -3,7 +3,7 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.subsystems.premission import CorePreMission from aviary.subsystems.propulsion.utils import build_engine_deck from aviary.utils.functions import set_aviary_initial_values diff --git a/aviary/utils/aero_table_conversion.py b/aviary/utils/aero_table_conversion.py index 65432d0d3b..adb28d9835 100644 --- a/aviary/utils/aero_table_conversion.py +++ b/aviary/utils/aero_table_conversion.py @@ -4,10 +4,10 @@ import re from enum import Enum from pathlib import Path -from scipy.interpolate import interp1d import numpy as np from openmdao.components.interp_util.interp import InterpND +from scipy.interpolate import interp1d from aviary.interface.utils import round_it from aviary.utils.conversion_utils import _parse, _read_map, _rep @@ -16,7 +16,6 @@ from aviary.utils.named_values import NamedValues from aviary.variable_info.enums import CodeOrigin - _gasp_keys = ['Altitude', 'Mach', 'Angle of Attack'] default_units = { 'Altitude': 'ft', @@ -482,7 +481,7 @@ def _make_structured_grid(data, method='lagrange3', fields=['CL', 'CD']): if __name__ == '__main__': - from aviary.utils.aero_table_conversion_cmd import _setup_ATC_parser, _exec_ATC + from aviary.utils.aero_table_conversion_cmd import _exec_ATC, _setup_ATC_parser parser = argparse.ArgumentParser( description='Converts FLOPS- or GASP-formatted aero data files into Aviary csv format.\n' diff --git a/aviary/utils/doctape.py b/aviary/utils/doctape.py index 8b08fb111b..3a5764e28f 100644 --- a/aviary/utils/doctape.py +++ b/aviary/utils/doctape.py @@ -6,6 +6,7 @@ import subprocess import tempfile import textwrap + import numpy as np from aviary.interface.cmd_entry_points import _command_map diff --git a/aviary/utils/engine_deck_conversion.py b/aviary/utils/engine_deck_conversion.py index f09e56fb0d..7973ba5ebd 100644 --- a/aviary/utils/engine_deck_conversion.py +++ b/aviary/utils/engine_deck_conversion.py @@ -17,7 +17,6 @@ from aviary.variable_info.enums import EngineDeckType from aviary.variable_info.variables import Dynamic - MACH = EngineModelVariables.MACH ALTITUDE = EngineModelVariables.ALTITUDE THROTTLE = EngineModelVariables.THROTTLE @@ -725,7 +724,7 @@ def compute(self, inputs, outputs): if __name__ == '__main__': - from aviary.utils.engine_deck_conversion_cmd import setup_EDC, _setup_EDC_parser + from aviary.utils.engine_deck_conversion_cmd import _setup_EDC_parser, setup_EDC parser = argparse.ArgumentParser() _setup_EDC_parser(parser) diff --git a/aviary/utils/propeller_map_conversion.py b/aviary/utils/propeller_map_conversion.py index 0a23ebff7b..2e0f6da2ad 100644 --- a/aviary/utils/propeller_map_conversion.py +++ b/aviary/utils/propeller_map_conversion.py @@ -1,17 +1,16 @@ #!/usr/bin/python import argparse import getpass - from datetime import datetime from enum import Enum import numpy as np from aviary.interface.utils import round_it -from aviary.utils.named_values import NamedValues +from aviary.utils.conversion_utils import _parse, _read_map, _rep from aviary.utils.csv_data_file import write_data_file from aviary.utils.functions import get_path -from aviary.utils.conversion_utils import _parse, _read_map, _rep +from aviary.utils.named_values import NamedValues class PropMapType(Enum): diff --git a/aviary/utils/test/test_doctape.py b/aviary/utils/test/test_doctape.py index a25b4409ea..d3f3859119 100644 --- a/aviary/utils/test/test_doctape.py +++ b/aviary/utils/test/test_doctape.py @@ -12,6 +12,7 @@ check_contains, check_value, get_all_keys, + get_all_non_aviary_names, get_attribute_name, get_previous_line, get_value, @@ -22,7 +23,6 @@ glue_variable, gramatical_list, run_command_no_file_error, - get_all_non_aviary_names, ) try: @@ -96,7 +96,7 @@ def test_glue_keys(self): glue_keys({'d1': {'d2': 2}}, display=False) def test_glue_class_functions(self): - from aviary.interface.methods_for_level2 import AviaryProblem + from aviary.core.aviary_problem import AviaryProblem curr_glued = [] glue_class_functions(AviaryProblem, curr_glued, prefix='zz') diff --git a/aviary/validation_cases/benchmark_tests/test_0_iters.py b/aviary/validation_cases/benchmark_tests/test_0_iters.py index 76a2fa218d..c85b2c4cfa 100644 --- a/aviary/validation_cases/benchmark_tests/test_0_iters.py +++ b/aviary/validation_cases/benchmark_tests/test_0_iters.py @@ -3,7 +3,7 @@ from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.advanced_single_aisle.advanced_single_aisle_data import inputs from aviary.models.missions.height_energy_default import phase_info as height_energy_phase_info from aviary.models.missions.two_dof_default import phase_info as two_dof_phase_info diff --git a/aviary/validation_cases/benchmark_tests/test_FLOPS_based_sizing_N3CC.py b/aviary/validation_cases/benchmark_tests/test_FLOPS_based_sizing_N3CC.py index 5cde88667c..94e5c04355 100644 --- a/aviary/validation_cases/benchmark_tests/test_FLOPS_based_sizing_N3CC.py +++ b/aviary/validation_cases/benchmark_tests/test_FLOPS_based_sizing_N3CC.py @@ -7,16 +7,14 @@ N3CC data """ -from copy import deepcopy import unittest +from copy import deepcopy import numpy as np - import openmdao.api as om -from openmdao.utils.testing_utils import use_tempdirs -from openmdao.utils.testing_utils import require_pyoptsparse +from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.advanced_single_aisle.phase_info import phase_info from aviary.utils.test_utils.assert_utils import warn_timeseries_near_equal from aviary.validation_cases.benchmark_utils import compare_against_expected_values diff --git a/aviary/validation_cases/benchmark_tests/test_bench_FwFm.py b/aviary/validation_cases/benchmark_tests/test_bench_FwFm.py index 41a9717e8b..56dba01337 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_FwFm.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_FwFm.py @@ -6,7 +6,7 @@ from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs from aviary.api import Mission -from aviary.interface.methods_for_level1 import run_aviary +from aviary.interface.run_aviary import run_aviary from aviary.validation_cases.benchmark_utils import compare_against_expected_values try: diff --git a/aviary/validation_cases/benchmark_tests/test_bench_FwGm.py b/aviary/validation_cases/benchmark_tests/test_bench_FwGm.py index 4083292d54..5b8fe9f1c1 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_FwGm.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_FwGm.py @@ -5,8 +5,8 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs +from aviary.interface.run_aviary import run_aviary from aviary.models.missions.two_dof_default import phase_info -from aviary.interface.methods_for_level1 import run_aviary from aviary.variable_info.variables import Aircraft, Mission diff --git a/aviary/validation_cases/benchmark_tests/test_bench_GwFm.py b/aviary/validation_cases/benchmark_tests/test_bench_GwFm.py index ec4075c14e..4fa0b14271 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_GwFm.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_GwFm.py @@ -14,7 +14,7 @@ from openmdao.core.problem import _clear_problem_names from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.interface.methods_for_level1 import run_aviary +from aviary.interface.run_aviary import run_aviary from aviary.models.aircraft.test_aircraft.GwFm_phase_info import phase_info from aviary.validation_cases.benchmark_utils import compare_against_expected_values diff --git a/aviary/validation_cases/benchmark_tests/test_bench_GwGm.py b/aviary/validation_cases/benchmark_tests/test_bench_GwGm.py index 206aa067b4..b659059b8b 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_GwGm.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_GwGm.py @@ -5,8 +5,8 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs +from aviary.interface.run_aviary import run_aviary from aviary.models.missions.two_dof_default import phase_info -from aviary.interface.methods_for_level1 import run_aviary from aviary.variable_info.variables import Aircraft, Dynamic, Mission @@ -117,7 +117,7 @@ def test_bench_GwGm_SNOPT(self): if __name__ == '__main__': - # unittest.main() - test = ProblemPhaseTestCase() - test.setUp() - test.test_bench_GwGm_SNOPT() + unittest.main() + # test = ProblemPhaseTestCase() + # test.setUp() + # test.test_bench_GwGm_SNOPT() diff --git a/aviary/validation_cases/benchmark_tests/test_bench_electrified_large_turboprop_freighter.py b/aviary/validation_cases/benchmark_tests/test_bench_electrified_large_turboprop_freighter.py index 87bf7914b4..d270488666 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_electrified_large_turboprop_freighter.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_electrified_large_turboprop_freighter.py @@ -2,10 +2,9 @@ from copy import deepcopy from numpy.testing import assert_almost_equal -from openmdao.utils.testing_utils import use_tempdirs from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.large_turboprop_freighter.electrified_phase_info import ( energy_phase_info, two_dof_phase_info, diff --git a/aviary/validation_cases/benchmark_tests/test_bench_large_turboprop_freighter.py b/aviary/validation_cases/benchmark_tests/test_bench_large_turboprop_freighter.py index e74a8385a5..295617f5e2 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_large_turboprop_freighter.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_large_turboprop_freighter.py @@ -4,7 +4,7 @@ from numpy.testing import assert_almost_equal from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.large_turboprop_freighter.phase_info import ( energy_phase_info, two_dof_phase_info, diff --git a/aviary/validation_cases/benchmark_tests/test_bench_multiengine.py b/aviary/validation_cases/benchmark_tests/test_bench_multiengine.py index 01cbcb2c53..ab0c3b9940 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_multiengine.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_multiengine.py @@ -7,13 +7,13 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.models.missions.height_energy_default import phase_info -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.aircraft.multi_engine_single_aisle.multi_engine_single_aisle_data import ( engine_1_inputs, engine_2_inputs, inputs, ) +from aviary.models.missions.height_energy_default import phase_info from aviary.subsystems.propulsion.utils import build_engine_deck from aviary.variable_info.enums import ThrottleAllocation from aviary.variable_info.variables import Aircraft diff --git a/aviary/validation_cases/benchmark_tests/test_bench_multimission.py b/aviary/validation_cases/benchmark_tests/test_bench_multimission.py index 110e1317ab..5e0f2cc9ce 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_multimission.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_multimission.py @@ -1,4 +1,5 @@ import unittest + import openmdao.api as om from openmdao.core.problem import _clear_problem_names from openmdao.utils.assert_utils import assert_near_equal diff --git a/aviary/validation_cases/benchmark_tests/test_bench_off_design.py b/aviary/validation_cases/benchmark_tests/test_bench_off_design.py index 678019c8ef..c2a79513e4 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_off_design.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_off_design.py @@ -4,7 +4,7 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.models.missions.height_energy_default import phase_info as energy_phase_info from aviary.models.missions.two_dof_default import phase_info as twodof_phase_info from aviary.variable_info.variables import Aircraft, Mission, Settings diff --git a/aviary/validation_cases/benchmark_tests/test_bench_optimize_throttle.py b/aviary/validation_cases/benchmark_tests/test_bench_optimize_throttle.py index f4bf5388da..b2ec3526b7 100644 --- a/aviary/validation_cases/benchmark_tests/test_bench_optimize_throttle.py +++ b/aviary/validation_cases/benchmark_tests/test_bench_optimize_throttle.py @@ -2,14 +2,13 @@ from copy import deepcopy import numpy as np - import openmdao.api as om from openmdao.core.problem import _clear_problem_names from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs from aviary.api import Mission -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem from aviary.variable_info.variables import Aircraft, Dynamic, Mission, Settings phase_info = { diff --git a/aviary/validation_cases/benchmark_tests/test_bwb_GwGm.py b/aviary/validation_cases/benchmark_tests/test_bwb_GwGm.py index d8249e3d5d..aa9afb5afc 100644 --- a/aviary/validation_cases/benchmark_tests/test_bwb_GwGm.py +++ b/aviary/validation_cases/benchmark_tests/test_bwb_GwGm.py @@ -5,9 +5,8 @@ from openmdao.utils.assert_utils import assert_near_equal from openmdao.utils.testing_utils import require_pyoptsparse, use_tempdirs +from aviary.interface.run_aviary import run_aviary from aviary.models.aircraft.blended_wing_body.generic_BWB_2dof_phase_info import phase_info - -from aviary.interface.methods_for_level1 import run_aviary from aviary.variable_info.variables import Mission diff --git a/aviary/validation_cases/benchmark_tests/test_subsystems_within_a_mission.py b/aviary/validation_cases/benchmark_tests/test_subsystems_within_a_mission.py index 806a286147..4c3ab991a8 100644 --- a/aviary/validation_cases/benchmark_tests/test_subsystems_within_a_mission.py +++ b/aviary/validation_cases/benchmark_tests/test_subsystems_within_a_mission.py @@ -4,7 +4,8 @@ from numpy.testing import assert_almost_equal, assert_equal from openmdao.utils.testing_utils import use_tempdirs -from aviary.interface.methods_for_level2 import AviaryProblem +from aviary.core.aviary_problem import AviaryProblem +from aviary.models.missions.two_dof_default import phase_info as two_dof_phase_info from aviary.subsystems.test.test_dummy_subsystem import ( AdditionalArrayGuessSubsystemBuilder, Aircraft, @@ -13,7 +14,6 @@ MoreMission, PostOnlyBuilder, ) -from aviary.models.missions.two_dof_default import phase_info as two_dof_phase_info @use_tempdirs diff --git a/aviary/validation_cases/validation_data/flops_data/FLOPS_Test_Data.py b/aviary/validation_cases/validation_data/flops_data/FLOPS_Test_Data.py index 481ce01a6f..8da795118f 100644 --- a/aviary/validation_cases/validation_data/flops_data/FLOPS_Test_Data.py +++ b/aviary/validation_cases/validation_data/flops_data/FLOPS_Test_Data.py @@ -1,3 +1,6 @@ +from aviary.models.aircraft.advanced_single_aisle.advanced_single_aisle_data import N3CC +from aviary.models.aircraft.blended_wing_body.bwb_detailed_FLOPS_data import BWBdetailedFLOPS +from aviary.models.aircraft.blended_wing_body.bwb_simple_FLOPS_data import BWBsimpleFLOPS from aviary.models.aircraft.large_single_aisle_1.large_single_aisle_1_FLOPS_data import ( LargeSingleAisle1FLOPS, ) @@ -13,9 +16,6 @@ from aviary.models.aircraft.multi_engine_single_aisle.multi_engine_single_aisle_data import ( MultiEngineSingleAisle, ) -from aviary.models.aircraft.advanced_single_aisle.advanced_single_aisle_data import N3CC -from aviary.models.aircraft.blended_wing_body.bwb_simple_FLOPS_data import BWBsimpleFLOPS -from aviary.models.aircraft.blended_wing_body.bwb_detailed_FLOPS_data import BWBdetailedFLOPS FLOPS_Test_Data = {} diff --git a/aviary/variable_info/variable_meta_data.py b/aviary/variable_info/variable_meta_data.py index 1e516e96aa..e976ce9f9d 100644 --- a/aviary/variable_info/variable_meta_data.py +++ b/aviary/variable_info/variable_meta_data.py @@ -3,18 +3,19 @@ """ from copy import deepcopy + import numpy as np from aviary.utils.develop_metadata import add_meta_data from aviary.variable_info.enums import ( AircraftTypes, + AtmosphereModel, EquationsOfMotion, FlapType, GASPEngineType, LegacyCode, ProblemType, Verbosity, - AtmosphereModel, ) from aviary.variable_info.variables import Aircraft, Dynamic, Mission, Settings diff --git a/aviary/visualization/dashboard.py b/aviary/visualization/dashboard.py index 5f410bd38f..f2dd03175b 100644 --- a/aviary/visualization/dashboard.py +++ b/aviary/visualization/dashboard.py @@ -1450,6 +1450,7 @@ def save_dashboard(event): if __name__ == '__main__': import argparse + from aviary.visualization.dashboard_cmd import _dashboard_cmd, _dashboard_setup_parser parser = argparse.ArgumentParser() diff --git a/aviary/visualization/dashboard_cmd.py b/aviary/visualization/dashboard_cmd.py index 6e207a5fc8..8557fa0f44 100644 --- a/aviary/visualization/dashboard_cmd.py +++ b/aviary/visualization/dashboard_cmd.py @@ -4,9 +4,9 @@ """ import argparse -from pathlib import Path import shutil import zipfile +from pathlib import Path def _dashboard_setup_parser(parser): diff --git a/aviary/visualization/realtime_plot.py b/aviary/visualization/realtime_plot.py index 45754faa14..44de6f2e57 100644 --- a/aviary/visualization/realtime_plot.py +++ b/aviary/visualization/realtime_plot.py @@ -2,9 +2,9 @@ import os import pathlib import subprocess -from openmdao.utils.file_utils import _load_and_exec + import openmdao.utils.hooks as hooks -from openmdao.utils.file_utils import is_python_file +from openmdao.utils.file_utils import _load_and_exec, is_python_file def _rtplot_setup_parser(parser): diff --git a/pyproject.toml b/pyproject.toml index 43503b0dc5..609fafb5bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,7 @@ readme = "README.md" license = "Apache-2.0" requires_python = ">=3.10" dependencies = [ + "numpy<2.4", "dymos>=1.14.0", "hvplot", "importlib_resources",