Removed pyoptsparse and snopt from tests

OpenMDAO · Nov 15, 2023 · 540efde · 540efde
1 parent 064a3e7
commit 540efde
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/dymos/examples/brachistochrone/test/test_brachistochrone_birkhoff_constraints.py b/dymos/examples/brachistochrone/test/test_brachistochrone_birkhoff_constraints.py
@@ -15,8 +15,8 @@ def test_brachistochrone_control_prefix(self):
 
         p = om.Problem(model=om.Group())
 
-        p.driver = om.pyOptSparseDriver()
-        p.driver.options['optimizer'] = 'SNOPT'
+        p.driver = om.ScipyOptimizeDriver()
+        p.driver.options['optimizer'] = 'SLSQP'
         p.driver.declare_coloring(tol=1.0E-12)
 
         grid = dm.BirkhoffGrid(num_segments=1, nodes_per_seg=25, grid_type='lgl')
@@ -75,8 +75,8 @@ def test_brachistochrone_control_no_prefix(self):
 
         p = om.Problem(model=om.Group())
 
-        p.driver = om.pyOptSparseDriver()
-        p.driver.options['optimizer'] = 'SNOPT'
+        p.driver = om.ScipyOptimizeDriver()
+        p.driver.options['optimizer'] = 'SLSQP'
         p.driver.declare_coloring(tol=1.0E-12)
 
         grid = dm.BirkhoffGrid(num_segments=1, nodes_per_seg=25, grid_type='lgl')
@@ -135,8 +135,8 @@ def test_brachistochrone_ode_prefix(self):
 
         p = om.Problem(model=om.Group())
 
-        p.driver = om.pyOptSparseDriver()
-        p.driver.options['optimizer'] = 'SNOPT'
+        p.driver = om.ScipyOptimizeDriver()
+        p.driver.options['optimizer'] = 'SLSQP'
         p.driver.declare_coloring(tol=1.0E-12)
 
         grid = dm.BirkhoffGrid(num_segments=1, nodes_per_seg=25, grid_type='lgl')
@@ -159,13 +159,10 @@ def test_brachistochrone_ode_prefix(self):
 
         phase.add_control('theta',
                           continuity=True, rate_continuity=True,
-                          units='deg')
+                          units='deg', lower=0.01, upper=179.9)
 
         phase.add_parameter('g', targets=['g'], units='m/s**2')
 
-        phase.add_path_constraint('theta', lower=0.01, upper=179.9)
-        phase.add_boundary_constraint('theta', loc='final', lower=0.01, upper=179.9)
-
         phase.add_boundary_constraint('x', loc='final', equals=10)
         phase.add_boundary_constraint('y', loc='final', equals=5)
         phase.add_boundary_constraint('check', loc='final', lower=-50, upper=50)
@@ -197,8 +194,8 @@ def test_brachistochrone_ode_no_prefix(self):
 
         p = om.Problem(model=om.Group())
 
-        p.driver = om.pyOptSparseDriver()
-        p.driver.options['optimizer'] = 'SNOPT'
+        p.driver = om.ScipyOptimizeDriver()
+        p.driver.options['optimizer'] = 'SLSQP'
         p.driver.declare_coloring(tol=1.0E-12)
 
         grid = dm.BirkhoffGrid(num_segments=1, nodes_per_seg=25, grid_type='lgl')

diff --git a/dymos/utils/introspection.py b/dymos/utils/introspection.py
@@ -229,7 +229,6 @@ def _configure_constraint_introspection(phase):
                 con['units'] = control_units if con['units'] is None else con['units']
                 if birkhoff and constraint_type in ('initial', 'final'):
                     con['constraint_path'] = f'boundary_vals.{var}'
-                    con['constraint_path'] = f'timeseries.{prefix}{var}'
                 else:
                     con['constraint_path'] = f'timeseries.{prefix}{var}'