added uncertainty

convexengineering · Jul 6, 2018 · 9e26254 · 9e26254
1 parent 777f478
commit 9e26254
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/gpkitmodels/GP/aircraft/tail/horizontal_tail.py b/gpkitmodels/GP/aircraft/tail/horizontal_tail.py
@@ -42,8 +42,8 @@ class HorizontalTail(Wing):
 
     def setup(self, N=3):
         exec parse_variables(HorizontalTail.__doc__)
-        # Vh.key.descr['pr'] = 4
-        # lh.key.descr['fix'] = True
+        Vh.key.descr['pr'] = 4
+        lh.key.descr['fix'] = True
 
         self.ascs = Wing.setup(self, N)
         self.planform.substitutions.update(

diff --git a/gpkitmodels/GP/aircraft/tail/tail_boom.py b/gpkitmodels/GP/aircraft/tail/tail_boom.py
@@ -38,7 +38,7 @@ def setup(self, static, state):
         V = self.V = state.V
         mu = self.mu = state.mu
 
-        return [Re <= V*rho*l/mu,
+        return [Re == V*rho*l/mu,
                 Cf >= 0.455/Re**0.3,
                ]
 
@@ -84,7 +84,7 @@ class VerticalBoomTorsion(Model):
     """
     def setup(self, tailboom, vtail, state):
         exec parse_variables(VerticalBoomTorsion.__doc__)
-        # taucfrp.key.descr['pr'] = 1
+        taucfrp.key.descr['pr'] = 1
 
         J = self.J = tailboom.J
         d0 = self.d0 = tailboom.d
@@ -136,7 +136,7 @@ def setup(self, tailboom, htail, state):
         self.htail = htail
         self.tailboom = tailboom
         exec parse_variables(TailBoomBending.__doc__)
-        # kappa.key.descr['pr'] = 2
+        kappa.key.descr['pr'] = 2
 
         Beam.qbarFun = [1e-10]*N
         Beam.SbarFun = [1.]*N
@@ -192,7 +192,7 @@ class TailBoom(TubeSpar):
     def setup(self, N=5):
         self.N = N
         exec parse_variables(TailBoom.__doc__)
-        # rhoA.key.descr['pr'] = 10
+        rhoA.key.descr['pr'] = 10
         self.spar = super(TailBoom, self).setup(N, self)
 
         if self.secondaryWeight:

diff --git a/gpkitmodels/GP/aircraft/wing/wing.py b/gpkitmodels/GP/aircraft/wing/wing.py
@@ -83,15 +83,15 @@ def return_cmac(self, c):
     def setup(self, N):
         exec parse_variables(Planform.__doc__)
 
-        # CLmax.key.descr['pr'] = 10
-         #CM.key.descr['pr'] = 7
-        # lam.key.descr['pr'] = 12
-         #AR.key.descr['pr'] = 0
-        # S.key.descr['fix'] = True
-        # b.key.descr['fix'] = True
-         #croot.key.descr['fix'] = False  # True # <-----------------
-        # cmac.key.descr['fix'] = True
-        # cave.key.descr['fix'] = True
+        CLmax.key.descr['pr'] = 10
+        CM.key.descr['pr'] = 7
+        lam.key.descr['pr'] = 12
+        AR.key.descr['pr'] = 0
+        S.key.descr['fix'] = True
+        b.key.descr['fix'] = True
+        croot.key.descr['fix'] = False  # True # <-----------------
+        cmac.key.descr['fix'] = True
+        cave.key.descr['fix'] = True
 
         return [b**2 == S*AR,
                 cave == cbave*S/b,
@@ -132,8 +132,8 @@ def setup(self, static, state,
         self.state = state
         self.static = static
         exec parse_variables(WingAero.__doc__)
-        # CLstall.key.descr['pr'] = 3
-        # e.key.descr['pr'] = 6
+        CLstall.key.descr['pr'] = 3
+        e.key.descr['pr'] = 6
 
         df = pd.read_csv(fitdata)
         fd = df.to_dict(orient="records")[0]