Initial Implementation of Height Energy in SGM

.gitignore

@@ -109,6 +109,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.github/*_environment.yml
 
 # Spyder project settings
 .spyderproject

aviary/interface/default_phase_info/two_dof_fiti.py

@@ -54,6 +54,7 @@ def create_2dof_based_ascent_phases(
     )
     accel_vals = {}
 
+    # need to set trigger units
     climb1_kwargs = dict(
         input_speed_type=SpeedType.EAS,
         input_speed_units='kn',

aviary/interface/methods_for_level2.py

@@ -302,7 +302,7 @@ def load_inputs(self, aviary_inputs, phase_info=None, engine_builder=None):
                 elif self.mission_method is SOLVED:
                     from aviary.interface.default_phase_info.solved import phase_info
 
-                print('Loaded default phase_info for'
+                print('Loaded default phase_info for '
                       f'{self.mission_method.value.lower()} equations of motion')
 
         # create a new dictionary that only contains the phases from phase_info

aviary/mission/flops_based/ode/landing_ode.py

@@ -12,10 +12,12 @@
 from aviary.mission.flops_based.ode.landing_eom import FlareEOM, StallSpeed
 from aviary.mission.flops_based.ode.takeoff_ode import TakeoffODE as _TakeoffODE
 from aviary.mission.gasp_based.flight_conditions import FlightConditions
+from aviary.mission.gasp_based.ode.time_integration_base_classes import add_SGM_required_inputs
 from aviary.utils.aviary_values import AviaryValues
 from aviary.utils.functions import set_aviary_initial_values, promote_aircraft_and_mission_vars
 from aviary.variable_info.variables import Aircraft, Dynamic, Mission
 from aviary.variable_info.variables_in import VariablesIn
+from aviary.variable_info.enums import AnalysisScheme
 
 
 class ExternalSubsystemGroup(om.Group):
@@ -60,14 +62,29 @@ def initialize(self):
             'external_subsystems', default=[],
             desc='list of external subsystem builder instances to be added to the ODE')
 
+        self.options.declare(
+            "analysis_scheme",
+            default=AnalysisScheme.COLLOCATION,
+            types=AnalysisScheme,
+            desc="The analysis method that will be used to close the trajectory; for example collocation or time integration",
+        )
+
     def setup(self):
         options = self.options
 
         nn = options["num_nodes"]
+        analysis_scheme = options['analysis_scheme']
         aviary_options = options['aviary_options']
         subsystem_options = options['subsystem_options']
         core_subsystems = options['core_subsystems']
 
+        if analysis_scheme is AnalysisScheme.SHOOTING:
+            SGM_required_inputs = {
+                't_curr': {'units': 's'},
+                Dynamic.Mission.DISTANCE: {'units': 'm'},
+            }
+            add_SGM_required_inputs(self, SGM_required_inputs)
+
         self.add_subsystem(
             'input_port', VariablesIn(aviary_options=aviary_options),
             promotes_inputs=['*'], promotes_outputs=['*'])

aviary/mission/flops_based/ode/mission_ODE.py

@@ -3,11 +3,13 @@
 from dymos.models.atmosphere import USatm1976Comp
 
 from aviary.mission.flops_based.ode.mission_EOM import MissionEOM
+from aviary.mission.gasp_based.ode.time_integration_base_classes import add_SGM_required_inputs, add_SGM_required_outputs
 from aviary.utils.aviary_values import AviaryValues
 from aviary.utils.functions import promote_aircraft_and_mission_vars
 from aviary.variable_info.variable_meta_data import _MetaData
-from aviary.variable_info.variables import Dynamic, Mission
+from aviary.variable_info.variables import Dynamic, Mission, Aircraft
 from aviary.variable_info.variables_in import VariablesIn
+from aviary.variable_info.enums import AnalysisScheme
 
 
 class ExternalSubsystemGroup(om.Group):
@@ -44,15 +46,29 @@ def initialize(self):
             values=['path_constraint', 'boundary_constraint', 'bounded', None],
             desc='flag to enforce throttle constraints on the path or at the segment boundaries or using solver bounds'
         )
+        self.options.declare(
+            "analysis_scheme",
+            default=AnalysisScheme.COLLOCATION,
+            types=AnalysisScheme,
+            desc="The analysis method that will be used to close the trajectory; for example collocation or time integration",
+        )
 
     def setup(self):
         options = self.options
         nn = options['num_nodes']
+        analysis_scheme = options['analysis_scheme']
         aviary_options = options['aviary_options']
         core_subsystems = options['core_subsystems']
         subsystem_options = options['subsystem_options']
         engine_count = len(aviary_options.get_val('engine_models'))
 
+        if analysis_scheme is AnalysisScheme.SHOOTING:
+            SGM_required_inputs = {
+                't_curr': {'units': 's'},
+                Dynamic.Mission.DISTANCE: {'units': 'm'},
+            }
+            add_SGM_required_inputs(self, SGM_required_inputs)
+
         self.add_subsystem(
             'input_port',
             VariablesIn(aviary_options=aviary_options,
@@ -169,9 +185,42 @@ def setup(self):
                            promotes_inputs=['*'],
                            promotes_outputs=['*'])
 
+        self.set_input_defaults(Mission.Design.GROSS_MASS, val=1, units='kg')
+        self.set_input_defaults(
+            Aircraft.Fuselage.CHARACTERISTIC_LENGTH, val=1, units='ft')
+        self.set_input_defaults(Aircraft.Fuselage.FINENESS, val=1, units='unitless')
+        self.set_input_defaults(Aircraft.Fuselage.WETTED_AREA, val=1, units='ft**2')
+        self.set_input_defaults(
+            Aircraft.VerticalTail.CHARACTERISTIC_LENGTH, val=1, units='ft')
+        self.set_input_defaults(Aircraft.VerticalTail.FINENESS, val=1, units='unitless')
+        self.set_input_defaults(Aircraft.VerticalTail.WETTED_AREA, val=1, units='ft**2')
+        self.set_input_defaults(
+            Aircraft.HorizontalTail.CHARACTERISTIC_LENGTH, val=1, units='ft')
+        self.set_input_defaults(Aircraft.HorizontalTail.FINENESS,
+                                val=1, units='unitless')
+        self.set_input_defaults(
+            Aircraft.HorizontalTail.WETTED_AREA, val=1, units='ft**2')
+        self.set_input_defaults(Aircraft.Wing.CHARACTERISTIC_LENGTH, val=1, units='ft')
+        self.set_input_defaults(Aircraft.Wing.FINENESS, val=1, units='unitless')
+        self.set_input_defaults(Aircraft.Wing.WETTED_AREA, val=1, units='ft**2')
+        self.set_input_defaults(
+            Aircraft.Wing.SPAN_EFFICIENCY_FACTOR, val=1, units='unitless')
+        self.set_input_defaults(Aircraft.Wing.TAPER_RATIO, val=1, units='unitless')
+        self.set_input_defaults(Aircraft.Wing.THICKNESS_TO_CHORD,
+                                val=1, units='unitless')
+        self.set_input_defaults(Aircraft.Wing.SWEEP, val=1, units='deg')
+        self.set_input_defaults(Aircraft.Wing.ASPECT_RATIO, val=1, units='unitless')
+        self.set_input_defaults(
+            Aircraft.Design.LIFT_DEPENDENT_DRAG_COEFF_FACTOR, val=1, units='unitless')
+        self.set_input_defaults(
+            Aircraft.Design.ZERO_LIFT_DRAG_COEFF_FACTOR, val=1, units='unitless')
+
+        self.set_input_defaults(Dynamic.Mission.MACH, val=np.ones(nn), units='unitless')
         self.set_input_defaults(Dynamic.Mission.MASS, val=np.ones(nn), units='kg')
         self.set_input_defaults(Dynamic.Mission.VELOCITY, val=np.ones(nn), units='m/s')
         self.set_input_defaults(Dynamic.Mission.ALTITUDE, val=np.ones(nn), units='m')
+        self.set_input_defaults(Dynamic.Mission.ALTITUDE_RATE,
+                                val=np.ones(nn), units='m/s')
         self.set_input_defaults(
             Dynamic.Mission.THROTTLE, val=np.ones((nn, engine_count)),
             units='unitless')
@@ -198,11 +247,43 @@ def setup(self):
                            ],
                            promotes_outputs=['initial_mass_residual'])
 
+        if analysis_scheme is AnalysisScheme.SHOOTING:
+            SGM_required_outputs = {
+                Dynamic.Mission.ALTITUDE_RATE: {'units': 'm/s'},
+            }
+            add_SGM_required_outputs(self, SGM_required_outputs)
+
+        print_level = 0 if analysis_scheme is AnalysisScheme.SHOOTING else 2
+
+        if analysis_scheme is AnalysisScheme.SHOOTING and False:
+            from aviary.utils.functions import create_printcomp
+            dummy_comp = create_printcomp(
+                all_inputs=[
+                    't_curr',
+                    Mission.Design.RESERVE_FUEL,
+                    Dynamic.Mission.MASS,
+                    Dynamic.Mission.DISTANCE,
+                    Dynamic.Mission.ALTITUDE,
+                    Dynamic.Mission.FLIGHT_PATH_ANGLE,
+                ],
+                input_units={
+                    't_curr': 's',
+                    Dynamic.Mission.FLIGHT_PATH_ANGLE: 'deg',
+                    Dynamic.Mission.DISTANCE: 'NM',
+                })
+            self.add_subsystem(
+                "dummy_comp",
+                dummy_comp(),
+                promotes_inputs=["*"],)
+            self.set_input_defaults(
+                Dynamic.Mission.DISTANCE, val=0, units='NM')
+            self.set_input_defaults('t_curr', val=0, units='s')
+
         self.nonlinear_solver = om.NewtonSolver(solve_subsystems=True,
                                                 atol=1.0e-10,
                                                 rtol=1.0e-10,
                                                 )
         self.nonlinear_solver.linesearch = om.BoundsEnforceLS()
         self.linear_solver = om.DirectSolver(assemble_jac=True)
         self.nonlinear_solver.options['err_on_non_converge'] = True
-        self.nonlinear_solver.options['iprint'] = 2
+        self.nonlinear_solver.options['iprint'] = print_level

aviary/mission/flops_based/ode/takeoff_ode.py

@@ -7,10 +7,12 @@
 
 from aviary.mission.flops_based.ode.takeoff_eom import StallSpeed, TakeoffEOM
 from aviary.mission.gasp_based.flight_conditions import FlightConditions
+from aviary.mission.gasp_based.ode.time_integration_base_classes import add_SGM_required_inputs
 from aviary.utils.aviary_values import AviaryValues
 from aviary.utils.functions import set_aviary_initial_values, promote_aircraft_and_mission_vars
 from aviary.variable_info.variables import Aircraft, Dynamic, Mission
 from aviary.variable_info.variables_in import VariablesIn
+from aviary.variable_info.enums import AnalysisScheme
 
 
 class ExternalSubsystemGroup(om.Group):
@@ -58,14 +60,29 @@ def initialize(self):
             'climbing', default=False, types=bool,
             desc='mode of operation (ground roll or flight)')
 
+        self.options.declare(
+            "analysis_scheme",
+            default=AnalysisScheme.COLLOCATION,
+            types=AnalysisScheme,
+            desc="The analysis method that will be used to close the trajectory; for example collocation or time integration",
+        )
+
     def setup(self):
         options = self.options
 
         nn = options["num_nodes"]
+        analysis_scheme = options['analysis_scheme']
         aviary_options = options['aviary_options']
         subsystem_options = options['subsystem_options']
         core_subsystems = options['core_subsystems']
 
+        if analysis_scheme is AnalysisScheme.SHOOTING:
+            SGM_required_inputs = {
+                't_curr': {'units': 's'},
+                Dynamic.Mission.DISTANCE: {'units': 'm'},
+            }
+            add_SGM_required_inputs(self, SGM_required_inputs)
+
         self.add_subsystem(
             'input_port', VariablesIn(aviary_options=aviary_options),
             promotes_inputs=['*'], promotes_outputs=['*'])