Merge pull request #888 from Kenneth-T-Moore/bwb

A few fixes to #876.

Author: Kenneth-T-Moore

aviary/examples/multi_mission/run_multimission_example.py

@@ -103,7 +103,8 @@ def multi_mission_example():
     # TODO: MULTI_MISSION cannot handle RANGE objectives correctly at the moment.
 
     # optimizer and iteration limit are optional provided here
-    prob.add_driver('IPOPT', max_iter=50)
+    # Note: IPOPT needs more iters than SNOPT.
+    prob.add_driver('IPOPT', max_iter=70)
     prob.add_design_variables()
 
     prob.setup()

aviary/interface/methods_for_level2.py

@@ -502,15 +502,13 @@ def add_driver(self, optimizer=None, use_coloring=None, max_iter=50, verbosity=N
                 driver.options['print_opt_prob'] = True
 
         # optimizer agnostic settings
-        if verbosity >= Verbosity.VERBOSE:  # VERBOSE, DEBUG
-            driver.options['debug_print'] = ['desvars']
-            if verbosity == Verbosity.DEBUG:
-                driver.options['debug_print'] = [
-                    'desvars',
-                    'ln_cons',
-                    'nl_cons',
-                    'objs',
-                ]
+        if verbosity == Verbosity.DEBUG:
+            driver.options['debug_print'] = [
+                'desvars',
+                'ln_cons',
+                'nl_cons',
+                'objs',
+            ]
 
     def add_design_variables(self, verbosity=None):
         """

aviary/mission/two_dof_problem_configurator.py

@@ -465,6 +465,15 @@ def link_phases(self, aviary_group, phases, connect_directly=True):
                     phase1, phase2, 'mass', 'mass', connected=False, ref=1.0e5
                 )
 
+                # This isn't computed, but is instead set in the cruise phase_info.
+                # We still need altitude continuity.
+                # Note: if both sides are Breguet Range, the user is doing something odd like a
+                # step cruise, so don't enforce a constraint.
+                if not (analytic1 and analytic2):
+                    aviary_group.traj.add_linkage_constraint(
+                        phase1, phase2, 'altitude', 'altitude', connected=False, ref=1.0e4
+                    )
+
         # add all params and promote them to aviary_group level
         ParamPort.promote_params(
             aviary_group,

aviary/models/aircraft/blended_wing_body/generic_BWB_phase_info.py

@@ -122,7 +122,9 @@ def _do_run(self, driver: Driver, optimizer, *args):
         takeoff_trajectory_builder.apply_initial_guesses(takeoff, 'traj')
 
         # run the problem
-        dm.run_problem(takeoff, run_driver=True, simulate=True, make_plots=False)
+        takeoff.result = dm.run_problem(takeoff, run_driver=True, simulate=True, make_plots=False)
+
+        self.assertTrue(takeoff.result.success)
 
         # takeoff.model.traj.phases.brake_release_to_decision_speed.list_inputs(print_arrays=True)
         # takeoff.model.list_outputs(print_arrays=True)

aviary/validation_cases/benchmark_tests/test_FLOPS_balanced_field_length.py

@@ -82,6 +82,8 @@ class ProblemPhaseTestCase(unittest.TestCase):
     def bench_test_sizing_N3CC(self):
         prob = run_trajectory(sim=False)
 
+        # self.assertTrue(prob.result.success)
+
         times_climb = prob.get_val('traj.climb.timeseries.time', units='s')
         thrusts_climb = prob.get_val('traj.climb.timeseries.thrust_net_total', units='N')
         times_cruise = prob.get_val('traj.cruise.timeseries.time', units='s')

aviary/validation_cases/benchmark_tests/test_FLOPS_based_sizing_N3CC.py

@@ -116,7 +116,9 @@ def _do_run(self, driver: Driver, optimizer, *args):
         landing_trajectory_builder.apply_initial_guesses(landing, 'traj')
 
         # run the problem
-        dm.run_problem(landing, run_driver=True, simulate=True, make_plots=False)
+        landing.result = dm.run_problem(landing, run_driver=True, simulate=True, make_plots=False)
+
+        # self.assertTrue(landing.result.success)
 
         # Field length
         # N3CC FLOPS output line 1773

aviary/validation_cases/benchmark_tests/test_FLOPS_detailed_landing.py

@@ -139,7 +139,9 @@ def _do_run(self, driver: Driver, optimizer, *args):
         takeoff_trajectory_builder.apply_initial_guesses(takeoff, 'traj')
 
         # run the problem
-        dm.run_problem(takeoff, run_driver=True, simulate=True, make_plots=False)
+        takeoff.result = dm.run_problem(takeoff, run_driver=True, simulate=True, make_plots=False)
+
+        self.assertTrue(takeoff.result.success)
 
         # liftoff.rhs_all.list_inputs(print_arrays=True)
         # takeoff.model.list_outputs(print_arrays=True)

aviary/validation_cases/benchmark_tests/test_FLOPS_detailed_takeoff.py

@@ -92,6 +92,7 @@ def test_subsystems_in_a_mission(self):
         prob.set_val(av.Aircraft.Battery.ADDITIONAL_MASS, 115, units='lbm')
 
         prob.run_aviary_problem()
+        self.assertTrue(prob.result.success)
 
         electric_energy_used_cruise2 = prob.get_val(
             f'traj.cruise2.timeseries.{av.Dynamic.Vehicle.CUMULATIVE_ELECTRIC_ENERGY_USED}',

aviary/validation_cases/benchmark_tests/test_battery_in_a_mission.py

@@ -202,6 +202,7 @@ def test_bench_FwFm_IPOPT(self):
             optimizer='IPOPT',
         )
 
+        # self.assertTrue(prob.result.success)
         compare_against_expected_values(prob, self.expected_dict)
 
     @require_pyoptsparse(optimizer='SNOPT')
@@ -214,6 +215,7 @@ def test_bench_FwFm_SNOPT(self):
             optimizer='SNOPT',
         )
 
+        # self.assertTrue(prob.result.success)
         compare_against_expected_values(prob, self.expected_dict)
 
         # This is one of the few places we test Height Energy + simple takeoff.
@@ -238,7 +240,7 @@ def test_bench_FwFm_SNOPT_MPI(self):
             max_iter=50,
             optimizer='SNOPT',
         )
-
+        # self.assertTrue(prob.result.success)
         compare_against_expected_values(prob, self.expected_dict)