change name to wing; and fix SP wing model

convexengineering · Oct 14, 2017 · 1f55f19 · 1f55f19
1 parent b02def3
commit 1f55f19
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/gpkitmodels/GP/aircraft/tail/horizontal_tail.py b/gpkitmodels/GP/aircraft/tail/horizontal_tail.py
@@ -2,21 +2,21 @@
 import numpy as np
 from gpkit import Model, Variable
 from .tail_aero import TailAero
-from gpkitmodels.GP.aircraft.wing.wing import AeroSurf
+from gpkitmodels.GP.aircraft.wing.wing import Wing
 from gpkitmodels.GP.aircraft.wing.constant_taper_chord import c_bar
 from gpkitmodels.GP.aircraft.wing.wing_interior import WingInterior
 from gpkitmodels.GP.aircraft.wing.wing_skin import WingSkin
 
 #pylint: disable=invalid-name, too-many-locals, unused-variable
 #pylint: disable=attribute-defined-outside-init
 
-class HorizontalTail(AeroSurf):
+class HorizontalTail(Wing):
     "horizontal tail model"
     flight_model = TailAero
     sparModel = None
 
     def setup(self, N=3, lam=0.8):
-        self.ascs = AeroSurf.setup(self, N, lam)
+        self.ascs = Wing.setup(self, N, lam)
         self.planform.substitutions.update({"AR": 4, "\\tau": 0.08})
         self.skin.substitutions.update({"\\rho_{CFRP}": 0.049})
         self.foam.substitutions.update({"\\bar{A}_{jh01}": 0.0548,

diff --git a/gpkitmodels/GP/aircraft/tail/vertical_tail.py b/gpkitmodels/GP/aircraft/tail/vertical_tail.py
@@ -1,21 +1,21 @@
 " vertical tail "
 from gpkit import Model, Variable
 from .tail_aero import TailAero
-from gpkitmodels.GP.aircraft.wing.wing import AeroSurf
+from gpkitmodels.GP.aircraft.wing.wing import Wing
 from gpkitmodels.GP.aircraft.wing.constant_taper_chord import c_bar
 from gpkitmodels.GP.aircraft.wing.wing_interior import WingInterior
 from gpkitmodels.GP.aircraft.wing.wing_skin import WingSkin
 
 #pylint: disable=invalid-name, too-many-locals, unused-variable
 #pylint: disable=attribute-defined-outside-init
 
-class VerticalTail(AeroSurf):
+class VerticalTail(Wing):
     "vertical tail model"
     flight_model = TailAero
     sparModel = None
     def setup(self, N=3, lam=0.8):
 
-        self.ascs = AeroSurf.setup(self, N, lam)
+        self.ascs = Wing.setup(self, N, lam)
         self.planform.substitutions.update({"\\tau": 0.08})
         self.skin.substitutions.update({"\\rho_{CFRP}": 0.049})
         self.foam.substitutions.update({"\\bar{A}_{jh01}": 0.0548,

diff --git a/gpkitmodels/GP/aircraft/wing/wing.py b/gpkitmodels/GP/aircraft/wing/wing.py
@@ -85,7 +85,7 @@ def setup(self, static, state):
 
         return constraints
 
-class AeroSurf(Model):
+class Wing(Model):
     """
     Aicraft wing model for constant tapered wing
     INPUTS

diff --git a/gpkitmodels/SP/aircraft/wing/wing.py b/gpkitmodels/SP/aircraft/wing/wing.py
@@ -6,14 +6,13 @@
 
 #pylint: disable=attribute-defined-outside-init, invalid-name
 
-def Wing(N=5, lam=0.5, spar="CapSpar", hollow=False):
+class Wing(WingGP):
+    def setup(self, N=5, lam=0.5):
 
-    wing = WingGP(N=N, lam=lam, spar=spar, hollow=hollow)
-    mw = Variable("m_w", "-", "span wise effectiveness")
+        self.wing = WingGP.setup(self, N=N, lam=lam)
+        mw = Variable("m_w", "-", "span wise effectiveness")
 
-    with SignomialsEnabled():
-        constraints = [mw*(1 + 2/wing["AR"]) >= 2*np.pi]
+        with SignomialsEnabled():
+            constraints = [mw*(1 + 2/self.planform["AR"]) >= 2*np.pi]
 
-    wing.append(constraints[0])
-    wing.substitutions.update(constraints[0].substitutions)
-    return wing
+        return self.wing, constraints