Skip to content

Commit

Permalink
Merge branch 'master' into interp
Browse files Browse the repository at this point in the history
  • Loading branch information
swryan committed Nov 15, 2024
2 parents 37a30dc + f05f58c commit 7c1372c
Showing 1 changed file with 0 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ def setup(self):

alt_data = USatm1976Data.alt * om.unit_conversion('ft', 'm')[0]
rho_data = USatm1976Data.rho * om.unit_conversion('slug/ft**3', 'kg/m**3')[0]

# self.rho_interp = InterpND(points=np.array(alt_data),
# values=np.array(rho_data),
# method='slinear', extrapolate=True)
self.rho_interp = make_interp_spline(alt_data, rho_data, k=1)

def compute(self, inputs, outputs):
Expand Down Expand Up @@ -150,7 +146,6 @@ def compute(self, inputs, outputs):
p = om.Problem(model=om.Group())

p.driver = om.ScipyOptimizeDriver()
# p.driver.options['optimizer'] = 'SLSQP'
p.driver.declare_coloring()

p.model.add_subsystem('size_comp', CannonballSizeComp(),
Expand Down

0 comments on commit 7c1372c

Please sign in to comment.