From d11094f0af8eb2754aca4b2fd147b8a506d5b020 Mon Sep 17 00:00:00 2001 From: mjburton Date: Thu, 26 Apr 2018 20:55:50 -0400 Subject: [PATCH] new formulation inside of outermodel --- gpkitmodels/GP/aircraft/wing/sparloading.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gpkitmodels/GP/aircraft/wing/sparloading.py b/gpkitmodels/GP/aircraft/wing/sparloading.py index 9ffad25e..27e0bc2c 100644 --- a/gpkitmodels/GP/aircraft/wing/sparloading.py +++ b/gpkitmodels/GP/aircraft/wing/sparloading.py @@ -69,10 +69,10 @@ def setup(self, wing, state, sp=False): if sp: with SignomialsEnabled(): constraints = [ - S[:-1] >= (S[1:] + 0.5*deta*(b/2.)*(q[:-1] + q[1:]) - - Sout), - S[-1] >= Soffset, - M[:-1] >= M[1:] + 0.5*deta*(b/2)*(S[:-1] + S[1:] - 2*Soffset), + # 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: