new formulation inside of outermodel

convexengineering · Apr 27, 2018 · d11094f · d11094f
1 parent 18f0574
commit d11094f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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: