make surface input to wing_skin

convexengineering · Oct 13, 2017 · 80f0691 · 80f0691
1 parent 7e92c2c
commit 80f0691
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/gpkitmodels/GP/aircraft/tail/horizontal_tail.py b/gpkitmodels/GP/aircraft/tail/horizontal_tail.py
@@ -31,7 +31,7 @@ def setup(self, N=3, lam=0.8):
         self.surf = AeroSurf(N=N)
         self.surf.substitutions.update(subdict)
 
-        self.skin = WingSkin()
+        self.skin = WingSkin(self.surf)
         self.skin.substitutions.update({"\\rho_{CFRP}": 0.049})
         self.foam = WingInterior()
         self.foam.substitutions.update({"\\bar{A}_{jh01}": 0.0548})
@@ -42,8 +42,6 @@ def setup(self, N=3, lam=0.8):
         constraints = [
             W/mfac >= sum([c["W"] for c in self.components]),
             mh*(1+2.0/self.surf["AR"]) <= 2*np.pi,
-            self.skin["W"] >= (self.skin["\\rho_{CFRP}"]*self.surf["S"]*2
-                               * self.skin["t"]*self.skin["g"]),
             self.foam["W"] >= 2*(
                 self.foam["g"]*self.foam["\\rho_{foam}"]
                 *self.foam["\\bar{A}_{jh01}"]*self.surf["c_{ave}"]**2

diff --git a/gpkitmodels/GP/aircraft/tail/vertical_tail.py b/gpkitmodels/GP/aircraft/tail/vertical_tail.py
@@ -27,7 +27,7 @@ def setup(self, N=3, lam=0.8):
         self.surf = AeroSurf(N=N)
         self.surf.substitutions.update(subdict)
 
-        self.skin = WingSkin()
+        self.skin = WingSkin(self.surf)
         self.skin.substitutions.update({"\\rho_{CFRP}": 0.049})
         self.foam = WingInterior()
         self.foam.substitutions.update({"\\bar{A}_{jh01}": 0.0548})
@@ -37,8 +37,6 @@ def setup(self, N=3, lam=0.8):
 
         constraints = [
             W/mfac >= sum([c["W"] for c in self.components]),
-            self.skin["W"] >= (self.skin["\\rho_{CFRP}"]*self.surf["S"]*2
-                               * self.skin["t"]*self.skin["g"]),
             self.foam["W"] >= 2*(
                 self.foam["g"]*self.foam["\\rho_{foam}"]
                 *self.foam["\\bar{A}_{jh01}"]*self.surf["c_{ave}"]**2

diff --git a/gpkitmodels/GP/aircraft/wing/wing.py b/gpkitmodels/GP/aircraft/wing/wing.py
@@ -36,14 +36,12 @@ def setup(self, N=5, lam=0.5, hollow=False):
         self.surf = AeroSurf(N)
         self.surf.substitutions.update(subdict)
         self.spar = CapSpar(N, self.surf)
-        self.skin = WingSkin()
+        self.skin = WingSkin(self.surf)
         self.components = [self.spar, self.skin]
 
 
         constraints = [
             W/mfac >= sum(c["W"] for c in self.components),
-            self.skin["W"] >= (self.skin["\\rho_{CFRP}"]*self.surf["S"]*2
-                               * self.skin["t"]*self.skin["g"]),
             ]
 
         if not hollow:

diff --git a/gpkitmodels/GP/aircraft/wing/wing_skin.py b/gpkitmodels/GP/aircraft/wing/wing_skin.py
@@ -3,7 +3,7 @@
 
 class WingSkin(Model):
     "wing skin model"
-    def setup(self):
+    def setup(self, surface):
 
         rhocfrp = Variable("\\rho_{CFRP}", 1.6, "g/cm^3", "density of CFRP")
         W = Variable("W", "lbf", "wing skin weight")
@@ -13,7 +13,8 @@ def setup(self):
         Jtbar = Variable("\\bar{J/t}", 0.01114, "1/mm",
                          "torsional moment of inertia")
 
-        constraints = [t >= tmin]
+        constraints = [W >= rhocfrp*surface["S"]*2*t*g,
+                       t >= tmin]
 
         self.loading = WingSkinL