fix weight error

convexengineering · Apr 24, 2018 · b9f1da0 · b9f1da0
1 parent 7e3aa72
commit b9f1da0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/gpkitmodels/GP/aircraft/motor/motor.py b/gpkitmodels/GP/aircraft/motor/motor.py
@@ -41,7 +41,7 @@ class Motor(Model):
 
     Variables
     ---------
-    Qstar       .8          [kg/(N*m)]         motor specific torque
+    Qstar       .5          [kg/(N*m)]         motor specific torque
     W                       [lbf]              motor weight
     Qmax                    [N*m]              motor max. torque
     V_max       300         [V]                motor max voltage
@@ -100,4 +100,4 @@ def setup(self):
 
 
 
-    
+
diff --git a/gpkitmodels/GP/aircraft/wing/sparloading.py b/gpkitmodels/GP/aircraft/wing/sparloading.py
@@ -22,6 +22,7 @@ class SparLoading(Model):
     Mtip            1e-10          [N*m]   tip moment
     throot          1e-10          [-]     root deflection angle
     wroot           1e-10          [m]     root deflection
+    Soffset         1e5            [N]     offset shear
 
     Variables of length wing.N
     --------------------------
@@ -69,7 +70,7 @@ def setup(self, wing, state, sp=False):
             with SignomialsEnabled():
                 constraints = [
                     S[:-1] >= (S[1:] + 0.5*deta*(b/2.)*(q[:-1] + q[1:])
-                               - Sout + N*W),
+                               - Sout),
                     S[-1] >= N*W,
                     M[:-1] >= M[1:] + 0.5*deta*(b/2)*(S[:-1] + S[1:] - 2*N*W),
 ]