From 64a05f360589fd8b228128689b74bf0a35ab280d Mon Sep 17 00:00:00 2001
From: Fern Carrera <carrerafct@gmail.com>
Date: Mon, 3 Jun 2019 14:45:58 -0700
Subject: [PATCH] Final design

---
 .../__pycache__/cruise_comp.cpython-37.pyc    | Bin 1394 -> 1654 bytes
 Model/Propulsion/cruise_comp.py               |  14 ++++++-
 .../weight_buildup_comp.cpython-37.pyc        | Bin 2085 -> 2128 bytes
 Model/Weight/weight_buildup_comp.py           |   5 ++-
 .../__pycache__/cost_buildup.cpython-37.pyc   | Bin 1603 -> 1616 bytes
 .../__pycache__/tooling_cost.cpython-37.pyc   | Bin 1447 -> 1447 bytes
 .../costanalysis/cost_buildup.py              |   6 +--
 .../costanalysis/tooling_cost.py              |   6 +--
 n2.html                                       |   2 +-
 solver.py                                     |  39 +++++++++++++-----
 10 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/Model/Propulsion/__pycache__/cruise_comp.cpython-37.pyc b/Model/Propulsion/__pycache__/cruise_comp.cpython-37.pyc
index bf71d95b64c6b01e3203c3251acdf7b7791eaa24..839fb1c23a063fbd6f83372c865bde014435ed87 100644
GIT binary patch
delta 803
zcmZutJ&)5s5Z&3elaM&hCwKWkr?f#RX{b<iNSA^FbV8g&VV#6b#y~=1Tk8Zw<R}Gn
z=p=$$gh2cZS{fRDz*dydB1Fxsa~B$Rv~T9k?#`RpU->_leN-&w8LhXkf1e&_H+G|U
zjTkb7DVu=<pkqGejzHlUw-_2|zG7&4@KQJ?^39zCINnS~@P6~{&|{d#0*W&ZEM^lx
z3yT-*1EBqp%EgSL(k?3RqRKX+S5>TCyqa*VlU>HWGof2KVcq@YHry+LToytZgdOSP
zco8M<px-)D=4k4<a#`LcJ1KMhk(YdhyU<Kp{IsK|jT(Anu!Rk&k<Xu-oxI^!N;Nt*
zXb)*eHz4`UpBZss0!d%^_hUe_$yPRbn|vv@QM6fHsxz$B*s4tVJ<3<&vd&{QuGCqB
zZCRVGs&O^uxIdr_`Nm*7RWtb{a9tohX=x}D{1gO_Y18_CbNqv-)a}bl8cG^$f-YA=
zJ_(c|J$KrzNj;p(jQwyik5o2T%yl63I8xVF;3{~iV59&Y<K($FSMVs+Q)_s-RnO|n
z84X&%$;b!#ueXv-olc=ek;;yO83}j?M4}!61B-XSIJX9r$ucSCfQ(<)NIVA(+RN%t
zF2<2Jq$<7Si_u@Vsf4_$;h)k@PU<hw-9>tyoXFMFOgE#fAoTnhx<Stk$CA^jGX2FY
he4)4>$`0}L=KqSS++Y^qV(J|NV-}0_;1+dih`&%(p*H{k

delta 504
zcmY*VJx>Bb5Z&3mJMe(x!w5)FV`50KuroFU64BTg3hf9TOB4l;+=n5?*l0^Zwy{$y
zOMivG!Q^6LVId_J*3LjAVJGu4GrRA--TjUJnAUzQW-?qakCVomKC-e0Ti8h^p~JdR
z2Vj!d`4N*sYWGZPEw~ePA@x&MG{!_MLXbQh^gHcl+pF5$zTIo}yph|4!RWnQ0cpyJ
z6hjW|hCP9dKBMBaip?u)R$Xuz$4JQJP@pSAhm^X86ZHW*s=#ZIRz7d!meA8pkuzAr
z0t`fxLQQx+ZsCT8S;cg}n97SQ^&mRNR4=XSnmnfWIuU{>!dM`jVdDC%w7;=+$OGRc
zoO8QqIV;!&M!VPdJvRv1zDI>aCXT5#^wn*W3E*<3nWp&^GBge~@lSlOmBYqeSGRh`
zOh5v{6kNUPrM)Z>3Uk&X-=W(X#3jG52q&kLT2WJ*#`3PSMm#z*vs@$x;ZoO@ey3H2
Je}yR5#2<>VVC?_^

diff --git a/Model/Propulsion/cruise_comp.py b/Model/Propulsion/cruise_comp.py
index fe6d099..ffecdeb 100644
--- a/Model/Propulsion/cruise_comp.py
+++ b/Model/Propulsion/cruise_comp.py
@@ -1,4 +1,5 @@
 from openmdao.api import ExplicitComponent
+import numpy as np
 
 rho = 1.225 #density, [kg/m**3]
 
@@ -13,12 +14,15 @@ def setup(self):
         self.add_input('AR',desc='Aspect Ratio')
         self.add_input('S',desc='Refernce Area')
         self.add_input('V',desc='Airspeed')
+        self.add_input('r',desc='prop radius')
         #self.add_input('cd0',desc='zero lift drag')
 
         self.add_output('P_C',desc='Power required for cruise')
         self.add_output('cl')
         self.add_output('cd')
         self.add_output('cd0')
+        self.add_output('B')
+        self.add_output('clear',desc = 'radius clearance')
         self.declare_partials(of='*', wrt='*', method='cs')
 
       
@@ -34,10 +38,18 @@ def compute(self,inputs,outputs):
         Swet = (10**c)*(inputs['W']*2.2046)**d
         f = (10**a)*Swet**b
         cd0 = f/(inputs['S']*10.7639)
+        cd0 = cd0.real
         k = 1/(3.14*0.8*inputs['AR']) # e = 0.8
         cd = cd0 + k*cl**2
         outputs['cl'] = cl
         outputs['cd'] = cd
         outputs['cd0'] = cd0
         #outputs['P_C'] = (( (2*(W**3)*(inputs['Cd']**2))/(inputs['S']*rho*(inputs['Cl']**3)) )**.5)/1000
-        outputs['P_C'] = (( (2*(W**3)*(cd**2))/(inputs['S']*rho*(cl**3) ))**.5)/1000
\ No newline at end of file
+        outputs['P_C'] = (( (2*(W**3)*(cd**2))/(inputs['S']*rho*(cl**3) ))**.5)/1000
+        S = inputs['S']
+        AR = inputs['AR']
+        B = ((S/2)*AR)**0.5
+        r_prop = inputs['r']
+        clear = (B/2 - 3*r_prop)/(B/2)
+        outputs['clear'] = clear
+        outputs['B'] = B
\ No newline at end of file
diff --git a/Model/Weight/__pycache__/weight_buildup_comp.cpython-37.pyc b/Model/Weight/__pycache__/weight_buildup_comp.cpython-37.pyc
index 4fd7a2652561dc15cbcaa8d85e9934cd739ea3bd..ece79dce2d8efeb4292fec83005bf1367b598cb2 100644
GIT binary patch
delta 625
zcmYjOO>fgc5Z!g$I!$cHiS2y3DK4}?2qk>C(7>TL1h*cL5SPFURgoyjd<yNVM@~6Z
z`x`(UxgjAAaOObIocIy^0A?rR!<J{>yxI3O-gz4xM&VWvR0KWa>94zK^&tErUmSeD
zH5Bj>pfq))P~xFPNN)|%w8XW8IvTSs#J1?iW+eCg?bi!0clUPkaWNU2_wt@hP1TuH
zB5N;0CzR%uvo1fI56;bfMV1|bS|W5vI3ippTth=gs;28|4sj-Q1Bs52>I6*{q7{oo
zs1n+oeROO_SItw*n5!ys#G=JIMNb7-`j0=t*h3!gTca4uO!zp;f+misilQ;F!h9L4
znZR+2ae@q6IH@A^xwk-d8>f_q0oMsmbDj;bMv61G)*TG(NV<!&I>R}Y;k@NH^dc^(
z8ZNTP#U;)eE^}^R-DYf%u!k%BPgmPQFJaU4-L-f`H<PPeIk+|wynyRw*S!-Ic9T1w
zZurjN&8qq4e)a6t3-QyKxsQR}Ly=PGFBgfqJ^!xvmtneSQtyX%|M8<I&!0_F)Ae%c
pn@#V*uw|7if8?{n)`%5FiI7X*Qya=|IWULbAmaYN&@|O@_cveWcVPek

delta 605
zcmYjNJ#Q015Zygra)-Gu`_7J?i-S#o;DnIy8Au!oBpMQlf(}uDcs3{^1ev6pB@%sv
zqLugu(9$5$AOsC`K#i#R0Td~chTXA3*wxLOc{A^6Z+;}NljwRF7KJ%)_x{}dRosa_
z$wxciS6UK*xgnzMf)pfH9mGgb*mk6VxGmZxeN#TsU*tWR=}D*SN7h3|j(+9L%Xj*l
zv%G~!MI;f|1(Hmt7$ucZtV%S5axPREsY;Ql3>At{O+_ZCfDy(3HH)azu!*D09i`ah
zxy@AtV-%wCA3x5yhhvN>n(3A`4A5dh700PaC1Wtb13pgV0w-;bQ^s%vla$~z_l}sl
zhBkSa;yS}L<KO{jjAF*ts*bbvNoo|cD#sk<ILG`L&QpvFb1ZUkkuk?5#xgEj#JmwU
zaE1TrYE7tdEa+SAOuA?`)1)Rj=yV2~UeYh!JO0DH=c^w!zTVfn?q{#Z=ePbi^gfKu
z-usye?N&e4FNWVV{xMAVE2j6;d$7LtbaSJd=^I{Cy1M7}W~){?aUdTITO(HV3np{T
h_sj<0^#i@{O;2(EFtE4ZSzE{E<L)(iFdj(X`3v5OdGi1O

diff --git a/Model/Weight/weight_buildup_comp.py b/Model/Weight/weight_buildup_comp.py
index 2742522..b37c7ae 100644
--- a/Model/Weight/weight_buildup_comp.py
+++ b/Model/Weight/weight_buildup_comp.py
@@ -12,6 +12,7 @@ def setup(self):
         self.add_input('Neg',desc='number of engines')
         self.add_input('W0',desc='gross weight')
         self.add_input('Np',desc='number of people')
+        self.add_input('S',desc='wing area')
         
         self.declare_partials(of='*', wrt='*', method='cs')
         self.add_output('We',desc='empty weight')
@@ -31,7 +32,7 @@ def compute(self, inputs, outputs):
         Nz = 3.9            # ultimate load factor
         q = 0.5*0.002377*(V**2)  # dynamic pressure at cruise
         Sf = 362.744               # fuselage wetted area
-        Sw = 142.233               # trapezoidal wing area
+        Sw = inputs['S']*10.764                # trapezoidal wing area
         Wdg = inputs['W0']*2.2046              # gross weight
         Wen = 105              # engine weight each [lb]
         Wl = Wdg            # langing gross weight
@@ -45,7 +46,7 @@ def compute(self, inputs, outputs):
         # fuselage
         W_f = 0.052*(Sf**1.086)*((Nz*Wdg)**0.22)*(L_f**(-0.051))*((L_D)**(-0.072))*(q**0.241)
         # landing gear
-        W_lg = (0.095*((Nl*Wl)**0.768)*((Lm/12)**0.845))*0.70
+        W_lg = (0.095*((Nl*Wl)**0.768)*((Lm/12)**0.845))*0.5
         # installed engine
         W_ie = 2.575*(Wen**0.922)*(Neg)
         # flight controls
diff --git a/Model/costanalysis1/costanalysis/__pycache__/cost_buildup.cpython-37.pyc b/Model/costanalysis1/costanalysis/__pycache__/cost_buildup.cpython-37.pyc
index acde024395e5a9a0339af1775b44e1a1923b9462..3bf3498a406f48e46f33f73e422aa2b079be23ce 100644
GIT binary patch
delta 410
zcmX@ibAgA~iI<m)0SH7|zr?sq<ozbjZNpH)RKrulEWwb%Da}yBo5CZ)kit7zicwLT
z&ju)#!db#x!<WL5!q>_q$<WLw!T{v)O%7v>hU(?40qH>2dxBAu6{MGc@;63bQ+{cN
zX672f6o^gCHQXt@&CDsBKyw6BIKj5FqzC|cAQ?WWTE58@Os;}ponVzhAl*Ro&M~RF
za@TN30Nn}H!CS)$v>9T)a0&;iPf~EH1DPZ^*@9VLM944Q7z~&l(m{d3z#!!?xtLi|
z0mNir_+wwh2&7&z0g3c9FnDHP1mbO8&z#T5C@@)`^*p~2kgv&li#4w_x1h3!WAa~C
jaea_jkpL<o2;|=4u*uC&Da}c>;|KDJS%3rwBM%b*%ym+%

delta 415
zcmcb>bC`$MiI<m)0SNjRevGl7$ooy4(T1UfsfMS9S%M*jQ<|ZMH-%e-A%$nM6r-Xv
zuMJQvg|mdYhA)L9g}0SSlA)PVgaOFoogBs(4b{t8!voZTtoH<?CM!rU-{fzMzNUQA
z49(0nf+-N2m}|IGc$%40IDzH}rf`C7XG!4)@<1}YP_?|1E0|mb!8*Yzg+RK2=AC0w
zb!DvKkN~<9sDrnL6=*ZWeBl%hRG*~aQU@|gV6p|XK98VZ5fd;hUa|s-$<@q?(r3?r
zz!&=>MvyQ_E<Ftlp4o5S!<^5^C^%V%^?ax>P(qXS7HeK<Zb4-cCy*D#Q<9&blbM$u
rpPXM@Qp5}tDgvo05=140fZSUgHo5sJr8%i~{6JnY3y|Po<Y58;6lGf6

diff --git a/Model/costanalysis1/costanalysis/__pycache__/tooling_cost.cpython-37.pyc b/Model/costanalysis1/costanalysis/__pycache__/tooling_cost.cpython-37.pyc
index f1424590b7933e65a52c0dcabb3634bce05a5965..cce21f57a13f4e75afddec11261918479b408b87 100644
GIT binary patch
delta 22
ccmZ3^y_}oZiI<m)0SK~7zQi2b$UBP_06fG7CIA2c

delta 22
ccmZ3^y_}oZiI<m)0SNjRevCP~k#`m=06%I5cK`qY

diff --git a/Model/costanalysis1/costanalysis/cost_buildup.py b/Model/costanalysis1/costanalysis/cost_buildup.py
index 5bf7527..ea03475 100644
--- a/Model/costanalysis1/costanalysis/cost_buildup.py
+++ b/Model/costanalysis1/costanalysis/cost_buildup.py
@@ -17,8 +17,8 @@
 
 def CostBuildup(r_prop,c_ref, b_ref):
     # Inputs
-    fuselage_width = 1
-    fuselage_length = 5
+    fuselage_width = 2.4
+    fuselage_length = 6.5
     toc = 0.15  # Wing / canard thickness
     prop_radius = r_prop
     prop_chord = 0.15 * prop_radius
@@ -27,7 +27,7 @@ def CostBuildup(r_prop,c_ref, b_ref):
 
     parts_per_tool = 1000
 
-    fuselage_height = 1.3 # Guess
+    fuselage_height = 1.75 # Guess
     span = b_ref
     chord = c_ref
 
diff --git a/Model/costanalysis1/costanalysis/tooling_cost.py b/Model/costanalysis1/costanalysis/tooling_cost.py
index 8fc7005..1deecce 100644
--- a/Model/costanalysis1/costanalysis/tooling_cost.py
+++ b/Model/costanalysis1/costanalysis/tooling_cost.py
@@ -51,9 +51,9 @@ def EllipsePerimeter(a, b):
         return p
 
     finish_bit_step = 0.8 * finish_bit_diam # Rougher step size
-    cut_area = length * EllipsePerimeter(width/2,depth)/2; # Amount of material to rough out
-    finish_time = cut_area / (finish_feed * finish_bit_step) * finish_passes; # Time for roughing
-    finish_cost = finish_time * finish_cost_rate; # Roughing cost
+    cut_area = length * EllipsePerimeter(width/2,depth)/2 # Amount of material to rough out
+    finish_time = cut_area / (finish_feed * finish_bit_step) * finish_passes # Time for roughing
+    finish_cost = finish_time * finish_cost_rate # Roughing cost
 
     # Total Cost
     cost = material_cost + rough_cost + finish_cost
diff --git a/n2.html b/n2.html
index 470c133..cb3143d 100644
--- a/n2.html
+++ b/n2.html
@@ -1129,7 +1129,7 @@ <h1>OpenMDAO Partition Tree and N<sup>2</sup> diagram.</h1>
 </script>
 
     <script type="text/javascript">
-var modelData = {"tree": {"name": "root", "type": "root", "subsystem_type": "group", "linear_solver": "LN: RUNONCE", "nonlinear_solver": "NL: RUNONCE", "children": [{"name": "ivc", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "Wb", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Wp", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "m", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "r", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "TS", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "cd0", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "rho", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "V", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Cd", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Cl", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "S", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "AR", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "G", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "n", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "e", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "W_S", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Neg", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Np", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "weight", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "Wp", "type": "param", "dtype": "ndarray"}, {"name": "Wb", "type": "param", "dtype": "ndarray"}, {"name": "We", "type": "param", "dtype": "ndarray"}, {"name": "W0", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "We_W0", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "FOM", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "W", "type": "param", "dtype": "ndarray"}, {"name": "cd0", "type": "param", "dtype": "ndarray"}, {"name": "rho", "type": "param", "dtype": "ndarray"}, {"name": "TS", "type": "param", "dtype": "ndarray"}, {"name": "r", "type": "param", "dtype": "ndarray"}, {"name": "FM", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "PH", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "range", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "B_W", "type": "param", "dtype": "ndarray"}, {"name": "P_L", "type": "param", "dtype": "ndarray"}, {"name": "P_C", "type": "param", "dtype": "ndarray"}, {"name": "V", "type": "param", "dtype": "ndarray"}, {"name": "R", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "t", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "cruiseP", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "W", "type": "param", "dtype": "ndarray"}, {"name": "Cd", "type": "param", "dtype": "ndarray"}, {"name": "Cl", "type": "param", "dtype": "ndarray"}, {"name": "AR", "type": "param", "dtype": "ndarray"}, {"name": "S", "type": "param", "dtype": "ndarray"}, {"name": "V", "type": "param", "dtype": "ndarray"}, {"name": "cd0", "type": "param", "dtype": "ndarray"}, {"name": "P_C", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "emptyW", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "AR", "type": "param", "dtype": "ndarray"}, {"name": "Wb", "type": "param", "dtype": "ndarray"}, {"name": "V", "type": "param", "dtype": "ndarray"}, {"name": "Neg", "type": "param", "dtype": "ndarray"}, {"name": "W0", "type": "param", "dtype": "ndarray"}, {"name": "Np", "type": "param", "dtype": "ndarray"}, {"name": "We", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}]}, "connections_list": [{"src": "ivc.TS", "tgt": "FOM.TS"}, {"src": "weight.W0", "tgt": "FOM.W"}, {"src": "ivc.cd0", "tgt": "FOM.cd0"}, {"src": "ivc.r", "tgt": "FOM.r"}, {"src": "ivc.rho", "tgt": "FOM.rho"}, {"src": "ivc.AR", "tgt": "cruiseP.AR"}, {"src": "ivc.Cd", "tgt": "cruiseP.Cd"}, {"src": "ivc.Cl", "tgt": "cruiseP.Cl"}, {"src": "ivc.S", "tgt": "cruiseP.S"}, {"src": "ivc.V", "tgt": "cruiseP.V"}, {"src": "weight.W0", "tgt": "cruiseP.W"}, {"src": "ivc.cd0", "tgt": "cruiseP.cd0"}, {"src": "ivc.AR", "tgt": "emptyW.AR"}, {"src": "ivc.Neg", "tgt": "emptyW.Neg"}, {"src": "ivc.Np", "tgt": "emptyW.Np"}, {"src": "ivc.V", "tgt": "emptyW.V"}, {"src": "weight.W0", "tgt": "emptyW.W0", "cycle_arrows": ["emptyW weight"]}, {"src": "ivc.Wb", "tgt": "emptyW.Wb"}, {"src": "ivc.Wb", "tgt": "range.B_W"}, {"src": "cruiseP.P_C", "tgt": "range.P_C"}, {"src": "FOM.PH", "tgt": "range.P_L"}, {"src": "ivc.V", "tgt": "range.V"}, {"src": "ivc.Wb", "tgt": "weight.Wb"}, {"src": "emptyW.We", "tgt": "weight.We", "cycle_arrows": ["weight emptyW"]}, {"src": "ivc.Wp", "tgt": "weight.Wp"}], "abs2prom": {"input": {"weight.Wp": "weight.Wp", "weight.Wb": "weight.Wb", "weight.We": "weight.We", "FOM.W": "FOM.W", "FOM.cd0": "FOM.cd0", "FOM.rho": "FOM.rho", "FOM.TS": "FOM.TS", "FOM.r": "FOM.r", "range.B_W": "range.B_W", "range.P_L": "range.P_L", "range.P_C": "range.P_C", "range.V": "range.V", "cruiseP.W": "cruiseP.W", "cruiseP.Cd": "cruiseP.Cd", "cruiseP.Cl": "cruiseP.Cl", "cruiseP.AR": "cruiseP.AR", "cruiseP.S": "cruiseP.S", "cruiseP.V": "cruiseP.V", "cruiseP.cd0": "cruiseP.cd0", "emptyW.AR": "emptyW.AR", "emptyW.Wb": "emptyW.Wb", "emptyW.V": "emptyW.V", "emptyW.Neg": "emptyW.Neg", "emptyW.W0": "emptyW.W0", "emptyW.Np": "emptyW.Np"}, "output": {"ivc.Wb": "Wb", "ivc.Wp": "Wp", "ivc.m": "m", "ivc.r": "r", "ivc.TS": "TS", "ivc.cd0": "cd0", "ivc.rho": "rho", "ivc.V": "V", "ivc.Cd": "Cd", "ivc.Cl": "Cl", "ivc.S": "S", "ivc.AR": "AR", "ivc.G": "G", "ivc.n": "n", "ivc.e": "e", "ivc.W_S": "W_S", "ivc.Neg": "Neg", "ivc.Np": "Np", "weight.W0": "weight.W0", "weight.We_W0": "weight.We_W0", "FOM.FM": "FOM.FM", "FOM.PH": "FOM.PH", "range.R": "range.R", "range.t": "range.t", "cruiseP.P_C": "cruiseP.P_C", "emptyW.We": "emptyW.We"}}}
+var modelData = {"tree": {"name": "root", "type": "root", "subsystem_type": "group", "linear_solver": "LN: RUNONCE", "nonlinear_solver": "NL: RUNONCE", "children": [{"name": "ivc", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "Wb", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Wp", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Wm", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "m", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "r", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "TS", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "rho", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "V", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "S", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "AR", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "G", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "n", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "e", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "W_S", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Neg", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Np", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "weight", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "Wp", "type": "param", "dtype": "ndarray"}, {"name": "Wb", "type": "param", "dtype": "ndarray"}, {"name": "S", "type": "param", "dtype": "ndarray"}, {"name": "We", "type": "param", "dtype": "ndarray"}, {"name": "W0", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "We_W0", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "Wb_W0", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "W_S", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "FOM", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "W", "type": "param", "dtype": "ndarray"}, {"name": "cd0", "type": "param", "dtype": "ndarray"}, {"name": "rho", "type": "param", "dtype": "ndarray"}, {"name": "TS", "type": "param", "dtype": "ndarray"}, {"name": "r", "type": "param", "dtype": "ndarray"}, {"name": "FM", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "PH", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "range", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "B_W", "type": "param", "dtype": "ndarray"}, {"name": "P_L", "type": "param", "dtype": "ndarray"}, {"name": "P_C", "type": "param", "dtype": "ndarray"}, {"name": "V", "type": "param", "dtype": "ndarray"}, {"name": "R", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "t", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "cruiseP", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "W", "type": "param", "dtype": "ndarray"}, {"name": "AR", "type": "param", "dtype": "ndarray"}, {"name": "S", "type": "param", "dtype": "ndarray"}, {"name": "V", "type": "param", "dtype": "ndarray"}, {"name": "r", "type": "param", "dtype": "ndarray"}, {"name": "P_C", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "cl", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "cd", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "cd0", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "B", "type": "unknown", "implicit": false, "dtype": "ndarray"}, {"name": "clear", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "emptyW", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "AR", "type": "param", "dtype": "ndarray"}, {"name": "V", "type": "param", "dtype": "ndarray"}, {"name": "Neg", "type": "param", "dtype": "ndarray"}, {"name": "W0", "type": "param", "dtype": "ndarray"}, {"name": "Np", "type": "param", "dtype": "ndarray"}, {"name": "S", "type": "param", "dtype": "ndarray"}, {"name": "We", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}, {"name": "cost", "type": "subsystem", "subsystem_type": "component", "linear_solver": "", "nonlinear_solver": "", "children": [{"name": "r_prop", "type": "param", "dtype": "ndarray"}, {"name": "cruise_speed", "type": "param", "dtype": "ndarray"}, {"name": "avg_dist", "type": "param", "dtype": "ndarray"}, {"name": "shaft_power", "type": "param", "dtype": "ndarray"}, {"name": "We/W0", "type": "param", "dtype": "ndarray"}, {"name": "W0", "type": "param", "dtype": "ndarray"}, {"name": "mass_batt", "type": "param", "dtype": "ndarray"}, {"name": "mass_motor", "type": "param", "dtype": "ndarray"}, {"name": "Neg", "type": "param", "dtype": "ndarray"}, {"name": "S", "type": "param", "dtype": "ndarray"}, {"name": "AR", "type": "param", "dtype": "ndarray"}, {"name": "P_C", "type": "param", "dtype": "ndarray"}, {"name": "Cost", "type": "unknown", "implicit": false, "dtype": "ndarray"}]}]}, "connections_list": [{"src": "ivc.TS", "tgt": "FOM.TS"}, {"src": "weight.W0", "tgt": "FOM.W"}, {"src": "cruiseP.cd0", "tgt": "FOM.cd0"}, {"src": "ivc.r", "tgt": "FOM.r"}, {"src": "ivc.rho", "tgt": "FOM.rho"}, {"src": "ivc.AR", "tgt": "cost.AR"}, {"src": "ivc.Neg", "tgt": "cost.Neg"}, {"src": "cruiseP.P_C", "tgt": "cost.P_C"}, {"src": "ivc.S", "tgt": "cost.S"}, {"src": "weight.W0", "tgt": "cost.W0"}, {"src": "weight.We_W0", "tgt": "cost.We/W0"}, {"src": "range.R", "tgt": "cost.avg_dist"}, {"src": "ivc.V", "tgt": "cost.cruise_speed"}, {"src": "ivc.Wb", "tgt": "cost.mass_batt"}, {"src": "ivc.Wm", "tgt": "cost.mass_motor"}, {"src": "ivc.r", "tgt": "cost.r_prop"}, {"src": "FOM.PH", "tgt": "cost.shaft_power"}, {"src": "ivc.AR", "tgt": "cruiseP.AR"}, {"src": "ivc.S", "tgt": "cruiseP.S"}, {"src": "ivc.V", "tgt": "cruiseP.V"}, {"src": "weight.W0", "tgt": "cruiseP.W"}, {"src": "ivc.r", "tgt": "cruiseP.r"}, {"src": "ivc.AR", "tgt": "emptyW.AR"}, {"src": "ivc.Neg", "tgt": "emptyW.Neg"}, {"src": "ivc.Np", "tgt": "emptyW.Np"}, {"src": "ivc.S", "tgt": "emptyW.S"}, {"src": "ivc.V", "tgt": "emptyW.V"}, {"src": "weight.W0", "tgt": "emptyW.W0", "cycle_arrows": ["emptyW weight"]}, {"src": "ivc.Wb", "tgt": "range.B_W"}, {"src": "cruiseP.P_C", "tgt": "range.P_C"}, {"src": "FOM.PH", "tgt": "range.P_L"}, {"src": "ivc.V", "tgt": "range.V"}, {"src": "ivc.S", "tgt": "weight.S"}, {"src": "ivc.Wb", "tgt": "weight.Wb"}, {"src": "emptyW.We", "tgt": "weight.We", "cycle_arrows": ["weight emptyW"]}, {"src": "ivc.Wp", "tgt": "weight.Wp"}], "abs2prom": {"input": {"weight.Wp": "weight.Wp", "weight.Wb": "weight.Wb", "weight.S": "weight.S", "weight.We": "weight.We", "FOM.W": "FOM.W", "FOM.cd0": "FOM.cd0", "FOM.rho": "FOM.rho", "FOM.TS": "FOM.TS", "FOM.r": "FOM.r", "range.B_W": "range.B_W", "range.P_L": "range.P_L", "range.P_C": "range.P_C", "range.V": "range.V", "cruiseP.W": "cruiseP.W", "cruiseP.AR": "cruiseP.AR", "cruiseP.S": "cruiseP.S", "cruiseP.V": "cruiseP.V", "cruiseP.r": "cruiseP.r", "emptyW.AR": "emptyW.AR", "emptyW.V": "emptyW.V", "emptyW.Neg": "emptyW.Neg", "emptyW.W0": "emptyW.W0", "emptyW.Np": "emptyW.Np", "emptyW.S": "emptyW.S", "cost.r_prop": "cost.r_prop", "cost.cruise_speed": "cost.cruise_speed", "cost.avg_dist": "cost.avg_dist", "cost.shaft_power": "cost.shaft_power", "cost.We/W0": "cost.We/W0", "cost.W0": "cost.W0", "cost.mass_batt": "cost.mass_batt", "cost.mass_motor": "cost.mass_motor", "cost.Neg": "cost.Neg", "cost.S": "cost.S", "cost.AR": "cost.AR", "cost.P_C": "cost.P_C"}, "output": {"ivc.Wb": "Wb", "ivc.Wp": "Wp", "ivc.Wm": "Wm", "ivc.m": "m", "ivc.r": "r", "ivc.TS": "TS", "ivc.rho": "rho", "ivc.V": "V", "ivc.S": "S", "ivc.AR": "AR", "ivc.G": "G", "ivc.n": "n", "ivc.e": "e", "ivc.W_S": "W_S", "ivc.Neg": "Neg", "ivc.Np": "Np", "weight.W0": "weight.W0", "weight.We_W0": "weight.We_W0", "weight.Wb_W0": "weight.Wb_W0", "weight.W_S": "weight.W_S", "FOM.FM": "FOM.FM", "FOM.PH": "FOM.PH", "range.R": "range.R", "range.t": "range.t", "cruiseP.P_C": "cruiseP.P_C", "cruiseP.cl": "cruiseP.cl", "cruiseP.cd": "cruiseP.cd", "cruiseP.cd0": "cruiseP.cd0", "cruiseP.B": "cruiseP.B", "cruiseP.clear": "cruiseP.clear", "emptyW.We": "emptyW.We", "cost.Cost": "cost.Cost"}}}
 </script>
 
     <script type="text/javascript">
diff --git a/solver.py b/solver.py
index 89de439..06374b6 100644
--- a/solver.py
+++ b/solver.py
@@ -28,8 +28,8 @@
 ivc.add_output('V') 
 #ivc.add_output('Cd',val=0.03)
 #ivc.add_output('Cl',val=0.32)
-ivc.add_output('S',val=13.2)
-ivc.add_output('AR',val=7)
+ivc.add_output('S')
+ivc.add_output('AR')
 
 ivc.add_output('G',val=5)   #climb gradient
 ivc.add_output('n',val=1)   # load factor
@@ -56,6 +56,7 @@
 # connecting to empty weight comp
 model.connect('AR','emptyW.AR')
 #model.connect('Wb','emptyW.Wb')
+model.connect('S','emptyW.S')
 model.connect('V','emptyW.V')
 model.connect('Neg','emptyW.Neg')
 model.connect('weight.W0','emptyW.W0')
@@ -86,7 +87,7 @@
 model.connect('AR','cruiseP.AR')
 model.connect('S','cruiseP.S')
 model.connect('V','cruiseP.V')
-#model.connect('cd0','cruiseP.cd0')
+model.connect('r','cruiseP.r')
 
 # connecting to range comp
 model.connect('Wb','range.B_W')
@@ -121,16 +122,20 @@
 
 
 model.add_design_var('r',lower=0.7,upper=1.2)
-model.add_design_var('V',lower=67,upper=103)
+model.add_design_var('V',lower=67)
 model.add_design_var('Wb') # proff sees typical of 20-25% gross weight
-#model.add_design_var('S',lower=10,upper=20)
+model.add_design_var('S',lower=10,upper=20)
+model.add_design_var('AR',lower=7,upper=10)
 
-model.add_constraint('FOM.FM',lower=0.70,upper=0.80)
-model.add_constraint('range.R',equals=245)
-model.add_constraint('weight.Wb_W0',lower=0.20,upper=0.30) # batt to gross
+
+#model.add_constraint('FOM.FM',lower=0.70,upper=0.80)
+model.add_constraint('range.R',equals=340)
+model.add_constraint('weight.Wb_W0',lower=0.15,upper=0.30) # batt to gross
+model.add_constraint('cruiseP.clear',lower=0.25)
+model.add_constraint('FOM.PH',upper=700)
 #model.add_constraint('cruiseP.cl',upper=0.5)
 #model.add_constraint('weight.W_S',upper = 1327)
-#model.add_constraint('cruiseP.P_C',upper=110)
+model.add_constraint('cruiseP.P_C',upper=150)
 model.add_objective('cost.Cost',scaler=-1)
 
 
@@ -147,21 +152,33 @@
 #prob.run_model()
 prob.set_solver_print(level=0)
 prob.run_driver()
+print(' ')
+print('Geometry')
 print('S',prob['S'])
+print('AR',prob['AR'])
+print('Span',prob['cruiseP.B'])
 print('W_S',prob['weight.W_S'])
+print('clear',prob['cruiseP.clear'])
+print(' ')
+print('Weights')
 print('Batt Weight',prob['Wb'])
-print('Tip Speed',prob['TS'],'[m/s]')
 print('Empty Weight Fraction:',prob['weight.We_W0'])
 print('Battery Weight Fraction:',prob['weight.Wb_W0'])
 print('Empty Weight',prob['emptyW.We'])
 print('Gross Weight:',prob['weight.W0'],'[kg]')
+print(' ')
+print('Power')
 print('Figure of Merit:',prob['FOM.FM'])
 print('Required Radius:',prob['FOM.r'],'[m]')
 print('Required Power for Hover:',prob['FOM.PH'],'[kW]')
 print('Required Power for Cruise:',prob['cruiseP.P_C'],'[kW]')
 print('Max Trip Range @',prob['V'],'[m/s]:',prob['range.R'],'[km]','Time',prob['range.t'],'[hr]')
-print('Cost per trip (2025?): $',prob['cost.Cost']*1.146)
+print(' ')
+print('Aero')
 print('cl',prob['cruiseP.cl'])
 print('cd',prob['cruiseP.cd'])
 print('cd0',prob['cruiseP.cd0'])
+print(' ')
+print('Cost')
+print('Cost per trip (2025?): $',prob['cost.Cost']*1.146)