covert wing to parsing notation

convexengineering · Nov 14, 2017 · 0a662cc · 0a662cc
1 parent 5dec13e
commit 0a662cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/gpkitmodels/GP/aircraft/tail/empennage.py b/gpkitmodels/GP/aircraft/tail/empennage.py
@@ -4,17 +4,17 @@
 from .vertical_tail import VerticalTail
 from .tail_boom import TailBoom, TailBoomState
 
-#pylint: disable=attribute-defined-outside-init
+#pylint: disable=attribute-defined-outside-init, no-member
 class Empennage(Model):
     "empennage model, consisting of vertical, horizontal and tailboom"
     def setup(self):
         mfac = Variable("m_{fac}", 1.0, "-", "Tail weight margin factor")
         W = Variable("W", "lbf", "empennage weight")
 
         self.htail = HorizontalTail()
-        self.htail.substitutions.update({"m_{fac}": 1.1})
+        self.htail.substitutions.update({self.htail.mfac: 1.1})
         self.vtail = VerticalTail()
-        self.vtail.substitutions.update({"m_{fac}": 1.1})
+        self.vtail.substitutions.update({self.vtail.mfac: 1.1})
         self.tailboom = TailBoom()
         self.components = [self.htail, self.vtail, self.tailboom]
 

diff --git a/gpkitmodels/GP/aircraft/wing/wing.py b/gpkitmodels/GP/aircraft/wing/wing.py
@@ -137,25 +137,23 @@ def setup(self, static, state,
 
 class Wing(Model):
     """
-    Aicraft wing model for constant tapered wing
-    INPUTS
-    ------
-    N : int             number of sections
-    lam : float         taper ratio
-    hollow: boolean     True if wing is not hollow (filled with foam)
+    Wing Model
+
+    Variables
+    ---------
+    W                   [lbf]       wing weight
+    mfac        1.2     [-]         wing weight margin factor
     """
 
     sparModel = CapSpar
     fillModel = WingInterior
     flight_model = WingAero
 
     def setup(self, N=5):
+        exec parse_variables(Wing.__doc__)
 
         self.N = N
 
-        W = Variable("W", "lbf", "wing weight")
-        mfac = Variable("m_{fac}", 1.2, "-", "wing weight margin factor")
-
         self.planform = Planform(N)
         self.skin = WingSkin(self.planform)
         self.components = [self.skin]