Rename Mission.Design.* variables to Aircraft.Design.*

aviary/core/aviary_group.py

@@ -891,7 +891,7 @@ def add_post_mission_systems(self, verbosity=None):
             ecomp,
             promotes_inputs=[
                 ('fuel_burned', Mission.Summary.FUEL_BURNED),
-                ('reserve_fuel', Mission.Design.RESERVE_FUEL),
+                ('reserve_fuel', Mission.RESERVE_FUEL),
             ],
             promotes_outputs=[('overall_fuel', Mission.Summary.TOTAL_FUEL_MASS)],
         )
@@ -1282,7 +1282,7 @@ def add_design_variables(self, problem_type: ProblemType = None, verbosity=None)
             optimize_mass = self.pre_mission_info.get('optimize_mass')
             if optimize_mass:
                 self.add_design_var(
-                    Mission.Design.GROSS_MASS,
+                    Aircraft.Design.GROSS_MASS,
                     units='lbm',
                     lower=10,
                     upper=900.0e3,
@@ -1298,7 +1298,7 @@ def add_design_variables(self, problem_type: ProblemType = None, verbosity=None)
             # capacity
             if problem_type is ProblemType.SIZING:
                 self.add_design_var(
-                    Mission.Design.GROSS_MASS,
+                    Aircraft.Design.GROSS_MASS,
                     lower=10.0,
                     upper=None,
                     units='lbm',
@@ -1321,7 +1321,7 @@ def add_design_variables(self, problem_type: ProblemType = None, verbosity=None)
                         add_constraint=True,
                     ),
                     promotes_inputs=[
-                        ('lhs:GTOW', Mission.Design.GROSS_MASS),
+                        ('lhs:GTOW', Aircraft.Design.GROSS_MASS),
                         ('rhs:GTOW', Mission.Summary.GROSS_MASS),
                     ],
                 )
@@ -1333,7 +1333,7 @@ def add_design_variables(self, problem_type: ProblemType = None, verbosity=None)
                 # target range problem
                 # fixed vehicle (design GTOW) but variable actual GTOW for off-design
                 # get the design gross mass and set as the upper bound for the gross mass design variable
-                MTOW = self.aviary_inputs.get_val(Mission.Design.GROSS_MASS, 'lbm')
+                MTOW = self.aviary_inputs.get_val(Aircraft.Design.GROSS_MASS, 'lbm')
                 self.add_design_var(
                     Mission.Summary.GROSS_MASS,
                     lower=10.0,
@@ -1376,7 +1376,7 @@ def add_design_variables(self, problem_type: ProblemType = None, verbosity=None)
                         gross_mass_resid={'val': 30, 'units': 'kg'},
                     ),
                     promotes_inputs=[
-                        ('design_mass', Mission.Design.GROSS_MASS),
+                        ('design_mass', Aircraft.Design.GROSS_MASS),
                         ('actual_mass', Mission.Summary.GROSS_MASS),
                     ],
                     promotes_outputs=['gross_mass_resid'],
@@ -1499,9 +1499,7 @@ def _add_subsystem_guesses(self, phase_name, phase, target_prob, parent_prefix):
                     units=val_dict.get('units', None),
                 )
 
-    def add_fuel_reserve_component(
-        self, post_mission=True, reserves_name=Mission.Design.RESERVE_FUEL
-    ):
+    def add_fuel_reserve_component(self, post_mission=True, reserves_name=Mission.RESERVE_FUEL):
         if post_mission:
             reserve_calc_location = self.post_mission
         else:

aviary/core/aviary_problem.py

@@ -769,7 +769,7 @@ def set_design_range(self, missions: list[str], range: str):
         for name, group in matching_names:
             target_range, units = group.post_mission_info['target_range']
             design_range.append(convert_units(target_range, units, 'nmi'))
-        # TODO: loop through all the .csv files and extract Mission.Design.RANGE
+        # TODO: loop through all the .csv files and extract Aircraft.Design.RANGE
         design_range_max = np.max(design_range)
         self.set_val(range, val=design_range_max, units='nmi')
 
@@ -1380,8 +1380,8 @@ def run_off_design_mission(
         # Set up problem for mission, such as equations of motion, configurators, etc.
         inputs = deepcopy(self.aviary_inputs)
 
-        design_gross_mass = self.get_val(Mission.Design.GROSS_MASS, units='lbm')[0]
-        inputs.set_val(Mission.Design.GROSS_MASS, design_gross_mass, units='lbm')
+        design_gross_mass = self.get_val(Aircraft.Design.GROSS_MASS, units='lbm')[0]
+        inputs.set_val(Aircraft.Design.GROSS_MASS, design_gross_mass, units='lbm')
 
         if problem_type is not None:
             inputs.set_val(Settings.PROBLEM_TYPE, problem_type)
@@ -1463,7 +1463,7 @@ def run_off_design_mission(
             # variable bounds.
             if mission_gross_mass is None:
                 mission_gross_mass = off_design_prob.aviary_inputs.get_val(
-                    Mission.Design.GROSS_MASS, 'lbm'
+                    Aircraft.Design.GROSS_MASS, 'lbm'
                 )
             off_design_prob.aviary_inputs.set_val(
                 Mission.Summary.GROSS_MASS, mission_gross_mass * 0.9, units='lbm'
@@ -1477,7 +1477,7 @@ def run_off_design_mission(
                         'Fallout problem type requested with no specified gross mass. Using design '
                         'takeoff gross mass for the off-design mission.'
                     )
-                mission_gross_mass = self.get_val(Mission.Design.GROSS_MASS, units='lbm')[0]
+                mission_gross_mass = self.get_val(Aircraft.Design.GROSS_MASS, units='lbm')[0]
 
             off_design_prob.aviary_inputs.set_val(
                 Mission.Summary.GROSS_MASS, mission_gross_mass, units='lbm'
@@ -1517,7 +1517,7 @@ def run_off_design_mission(
                         # We don't know enough about the aircraft to make any informed guesses. Use
                         # arbitrary values
                         control_var = Aircraft.CrewPayload.MISC_CARGO
-                        val = self.get_val(Mission.Design.GROSS_MASS)
+                        val = self.get_val(Aircraft.Design.GROSS_MASS)
                         tol = 0.05
                         inputs.set_val(Aircraft.CrewPayload.CARGO_MASS, 0, 'lbm')
                     else:
@@ -1540,8 +1540,10 @@ def run_off_design_mission(
             off_design_prob.model.add_design_var(
                 Mission.Summary.GROSS_MASS,
                 lower=0,
-                upper=off_design_prob.aviary_inputs.get_val(Mission.Design.GROSS_MASS, units='lbm'),
-                ref=off_design_prob.aviary_inputs.get_val(Mission.Design.GROSS_MASS, units='lbm'),
+                upper=off_design_prob.aviary_inputs.get_val(
+                    Aircraft.Design.GROSS_MASS, units='lbm'
+                ),
+                ref=off_design_prob.aviary_inputs.get_val(Aircraft.Design.GROSS_MASS, units='lbm'),
             )
 
         off_design_prob.add_objective(verbosity=verbosity)
@@ -1791,7 +1793,7 @@ def save_results(self, json_filename='sizing_results.json'):
                 type_value = type(value)
 
                 # Get the gross mass value from the sizing problem and add it to input list
-                if name == Mission.Summary.GROSS_MASS or name == Mission.Design.GROSS_MASS:
+                if name == Mission.Summary.GROSS_MASS or name == Aircraft.Design.GROSS_MASS:
                     Mission_Summary_GROSS_MASS_val = self.get_val(
                         Mission.Summary.GROSS_MASS, units=units
                     )
@@ -1824,11 +1826,11 @@ def save_results(self, json_filename='sizing_results.json'):
                 # Append the data to the list
                 aviary_input_list.append([name, value, units, str(type_value)])
 
-            if Mission.Design.GROSS_MASS not in self.model.aviary_inputs:
+            if Aircraft.Design.GROSS_MASS not in self.model.aviary_inputs:
                 aviary_input_list.append(
                     [
-                        Mission.Design.GROSS_MASS,
-                        self.get_val(Mission.Design.GROSS_MASS, 'lbm')[0],
+                        Aircraft.Design.GROSS_MASS,
+                        self.get_val(Aircraft.Design.GROSS_MASS, 'lbm')[0],
                         'lbm',
                         str(float),
                     ]
@@ -1847,7 +1849,7 @@ def save_results(self, json_filename='sizing_results.json'):
 
     def _add_hybrid_objective(self, phase_info):
         phases = list(phase_info.keys())
-        takeoff_mass = self.model.aviary_inputs.get_val(Mission.Design.GROSS_MASS, units='lbm')
+        takeoff_mass = self.model.aviary_inputs.get_val(Aircraft.Design.GROSS_MASS, units='lbm')
 
         obj_comp = om.ExecComp(
             f'obj = -final_mass / {takeoff_mass} + final_time / 5.',

aviary/docs/examples/modified_aircraft.csv

@@ -143,10 +143,10 @@ aircraft:wing:var_sweep_mass_penalty,0.0,unitless
 aircraft:wing:wetted_area_scaler,1.0,unitless
 aircraft:wing:wetted_area,2396.56,ft**2
 mission:constraints:max_mach,0.785,unitless
-mission:design:cruise_altitude,35000,ft
-mission:design:gross_mass,175400.0,lbm
-mission:design:range,3500,NM
-mission:design:thrust_takeoff_per_eng,28928.1,lbf
+aircraft:design:cruise_altitude,35000,ft
+aircraft:design:gross_mass,175400.0,lbm
+aircraft:design:range,3500,NM
+aircraft:design:thrust_takeoff_per_eng,28928.1,lbf
 mission:landing:lift_coefficient_max,2.0,unitless
 mission:summary:cruise_mach,0.785,unitless
 mission:summary:fuel_flow_scaler,1.0,unitless