Skip to content

Commit

Permalink
move the sp section to model
Browse files Browse the repository at this point in the history
  • Loading branch information
mjburton committed Apr 28, 2018
1 parent d11094f commit 326ea9c
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions gpkitmodels/GP/aircraft/wing/sparloading.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
" spar loading "
from gpkit import Model, parse_variables, SignomialsEnabled
from gpkitmodels.GP.beam.beam import Beam
from gpkitmodels.GP.aircraft.tail.tail_boom import TailBoomState
from gpkit import Model, parse_variables
from numpy import pi

#pylint: disable=no-member, unused-argument, exec-used, invalid-name
Expand Down Expand Up @@ -66,16 +64,7 @@ def setup(self, wing, state, sp=False):
sigma = self.wing.spar.material.sigma
deta = self.wing.planform.deta

if sp:
with SignomialsEnabled():
constraints = [
# S[:-1] >= (S[1:] + 0.5*deta*(b/2.)*(q[:-1] + q[1:])
# - Sout),
S[-1] >= Stip,
# M[:-1] >= M[1:] + 0.5*deta*(b/2)*(S[:-1] + S[1:]),
]

else:
if not sp:
constraints = [
S[:-1] >= S[1:] + 0.5*deta*(b/2.)*(q[:-1] + q[1:]),
M[:-1] >= M[1:] + 0.5*deta*(b/2)*(S[:-1] + S[1:])]
Expand Down

0 comments on commit 326ea9c

Please sign in to comment.