Skip to content

Commit

Permalink
test fixes after cone updated
Browse files Browse the repository at this point in the history
  • Loading branch information
aditeyashukla committed Aug 2, 2024
1 parent 592a783 commit cb36835
Show file tree
Hide file tree
Showing 9 changed files with 910 additions and 909 deletions.
1 change: 1 addition & 0 deletions src/IO/save_model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,7 @@ function reset_regression_test(fname, ac)
@printf(io,"fuse.floor.weight.W = %20.20f \n", ac.fuselage.floor.weight.W)
@printf(io,"fuse.floor_W_per_area = %20.20f \n", ac.fuselage.floor_W_per_area)
@printf(io,"fuse.cone.weight = Weight(W = %20.20f ) \n", ac.fuselage.cone.weight.W)
@printf(io,"fuse.cone.weight.r = [ %20.20f ,0.0,0.0] \n", ac.fuselage.cone.weight.x)
@printf(io,"fuse.bendingmaterial_h.weight = Weight(W = %20.20f ) \n", ac.fuselage.bendingmaterial_h.weight.W)
@printf(io,"fuse.bendingmaterial_v.weight = Weight(W = %20.20f ) \n", ac.fuselage.bendingmaterial_v.weight.W)
@printf(io,"fuse.weight = %20.20f \n", ac.fuselage.weight)
Expand Down
4 changes: 2 additions & 2 deletions test/aero.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Aerodynamics:
--------------
Ref.Area= 139.79282
Ref.Area= 139.79287
L/D = 17.66611
CL = 0.57000
CD = 0.03227
Expand All @@ -14,7 +14,7 @@ CDBLIf = -0.00000
CDBLIw = -0.00000

Drag Areas = CD × Sref:
CL × Sref = 79.68191
CL × Sref = 79.68194
CD × Sref = 4.51044 m²
CDfuse × Sref = 0.95001 m²
CDi × Sref = 1.56151 m²
Expand Down
116 changes: 59 additions & 57 deletions test/default_fuselage.jl
Original file line number Diff line number Diff line change
@@ -1,61 +1,63 @@
ac_test = load_default_model()
# ------------------------------
# Fuselage
# ------------------------------
ac_test = load_default_model()
fuse_test = ac_test.fuselage
Weight = TASOPT.structures.Weight
ac_test.fuselage.n_decks = 1.00000000000000000000
ac_test.fuselage.shell.weight = Weight(W = 20947.34834733798925299197 )
ac_test.fuselage.shell.weight.r = [16.970781139221838, 0.0, 0.0]
ac_test.fuselage.window.W = 11269.98000000000138243195
ac_test.fuselage.window_W_per_length = 435.00000000000000000000
ac_test.fuselage.insulation.W = 5018.72835762571048690006
ac_test.fuselage.insulation.r = [18.1356, 0.0, 0.0]
ac_test.fuselage.insulation_W_per_area = 22.00000000000000000000
ac_test.fuselage.floor.weight.W = 13415.76301200039961258881
ac_test.fuselage.floor_W_per_area = 60.00000000000000000000
ac_test.fuselage.window.r = [18.1356, 0.0, 0.0]
ac_test.fuselage.cone.weight = Weight(W = 5667.63293457306281197816 )
ac_test.fuselage.bendingmaterial_h.weight = Weight(W = 14314.44887410087903845124 )
ac_test.fuselage.bendingmaterial_v.weight = Weight(W = 7381.15962121803022455424 )
ac_test.fuselage.weight = 198042.54742835607612505555
ac_test.fuselage.moment = 3620266.69662951119244098663
ac_test.fuselage.volume = 422.77743761859198912134
ac_test.fuselage.weight_frac_stringers = 0.34999999999999997780
ac_test.fuselage.weight_frac_frame = 0.25000000000000000000
ac_test.fuselage.weight_frac_skin_addl = 0.20000000000000001110
ac_test.fuselage.layout.nose_radius = 1.64999999999999991118
ac_test.fuselage.layout.tail_radius = 2.00000000000000000000
ac_test.fuselage.layout.x_nose = 0.00000000000000000000
ac_test.fuselage.layout.x_end = 37.79520000000000123919
ac_test.fuselage.layout.x_start_cylinder = 6.09600000000000008527
ac_test.fuselage.layout.x_end_cylinder = 29.56559999999999988063
ac_test.fuselage.layout.x_pressure_shell_fwd = 5.18160000000000042775
ac_test.fuselage.layout.x_pressure_shell_aft = 31.08960000000000079012
ac_test.fuselage.layout.x_cone_end = 35.66159999999999996589
ac_test.fuselage.bendingmaterial_h.weight.r = [ 31.85596337599880811808 ,0.0,0.0]
ac_test.fuselage.bendingmaterial_v.weight.r = [ 31.09855913065120702754 ,0.0,0.0]
ac_test.fuselage.layout.cross_section.radius = 1.95579999999999998295
ac_test.fuselage.layout.cross_section.bubble_lower_downward_shift = 0.38100000000000000533
ac_test.fuselage.layout.floor_depth = 0.12700000000000000178
ac_test.fuselage.layout.taper_tailcone = 0.29999999999999998890
ac_test.fuselage.ratio_young_mod_fuse_bending = 1.00000000000000000000
ac_test.fuselage.skin.thickness = 0.00105929143021018645
ac_test.fuselage.cone.thickness = 0.00122356331103976230
ac_test.fuselage.layout.thickness_webs = 0.00000000000000000000
ac_test.fuselage.floor.thickness = 0.00090615659813192320
ac_test.fuselage.shell.EIh = 2361319618.16573047637939453125
ac_test.fuselage.bendingmaterial_h.EIh = 24686136598.98891830444335937500
ac_test.fuselage.bendingmaterial_v.EIh = 24686136598.98891830444335937500
ac_test.fuselage.shell.EIv = 2317349005.39677524566650390625
ac_test.fuselage.bendingmaterial_h.EIv = 16837917350.80952644348144531250
ac_test.fuselage.bendingmaterial_v.EIv = 16837917350.80952644348144531250
ac_test.fuselage.shell.GJ = 1570840175.14735412597656250000
ac_test.fuselage.cone.GJ = 1814441570.09389352798461914062
ac_test.fuselage.APU.W = 7698.76022650000140856719
ac_test.fuselage.APU.r = [36.57600000000000051159,0.0,0.0]
ac_test.fuselage.seat.W = 21996.45779000000038649887
ac_test.fuselage.fixed.W = 13344.66600000000107684173
ac_test.fuselage.fixed.r = [2.13359999999999994102,0.0,0.0]
ac_test.fuselage.HPE_sys.r = [18.89760000000000061959,0.0,0.0]
ac_test.fuselage.HPE_sys.W = 0.01000000000000000021
ac_test.fuselage.added_payload.W = 76987.60226500000862870365
fuse_test.n_decks = 1.00000000000000000000
fuse_test.shell.weight = Weight(W = 20947.34828228715196019039 )
fuse_test.shell.weight.r = [ 16.97078113922183462137 ,0.0,0.0]
fuse_test.window.W = 11269.98000000000138243195
fuse_test.window.r = [ 18.13560000000000016485 ,0.0,0.0]
fuse_test.window_W_per_length = 435.00000000000000000000
fuse_test.insulation.W = 5018.72835762571048690006
fuse_test.insulation.r = [ 18.13560000000000016485 ,0.0,0.0]
fuse_test.insulation_W_per_area = 22.00000000000000000000
fuse_test.floor.weight.W = 13415.76301200039961258881
fuse_test.floor_W_per_area = 60.00000000000000000000
fuse_test.cone.weight = Weight(W = 5667.72197228375807753764 )
fuse_test.cone.weight.r = [ 33.3756 ,0.0,0.0]
fuse_test.bendingmaterial_h.weight = Weight(W = 14314.45400479989075392950 )
fuse_test.bendingmaterial_v.weight = Weight(W = 7381.15991952439981105272 )
fuse_test.weight = 198042.64183002131176181138
fuse_test.moment = 3620269.85519108083099126816
fuse_test.volume = 422.77743761859198912134
fuse_test.weight_frac_stringers = 0.34999999999999997780
fuse_test.weight_frac_frame = 0.25000000000000000000
fuse_test.weight_frac_skin_addl = 0.20000000000000001110
fuse_test.layout.nose_radius = 1.64999999999999991118
fuse_test.layout.tail_radius = 2.00000000000000000000
fuse_test.layout.x_nose = 0.00000000000000000000
fuse_test.layout.x_end = 37.79520000000000123919
fuse_test.layout.x_start_cylinder = 6.09600000000000008527
fuse_test.layout.x_end_cylinder = 29.56559999999999988063
fuse_test.layout.x_pressure_shell_fwd = 5.18160000000000042775
fuse_test.layout.x_pressure_shell_aft = 31.08960000000000079012
fuse_test.layout.x_cone_end = 35.66159999999999996589
fuse_test.bendingmaterial_h.weight.r = [ 31.85596402453565900714 ,0.0,0.0]
fuse_test.bendingmaterial_v.weight.r = [ 31.09856247291204311978 ,0.0,0.0]
fuse_test.layout.cross_section.radius = 1.95579999999999998295
fuse_test.layout.cross_section.bubble_lower_downward_shift = 0.38100000000000000533
fuse_test.layout.floor_depth = 0.12700000000000000178
fuse_test.layout.taper_tailcone = 0.29999999999999998890
fuse_test.ratio_young_mod_fuse_bending = 1.00000000000000000000
fuse_test.skin.thickness = 0.00105929142692061514
fuse_test.cone.thickness = 0.00122358253304608554
fuse_test.layout.thickness_webs = 0.00000000000000000000
fuse_test.floor.thickness = 0.00090615659813192320
fuse_test.shell.EIh = 2361319610.83278226852416992188
fuse_test.bendingmaterial_h.EIh = 24686146267.78833389282226562500
fuse_test.bendingmaterial_v.EIh = 24686146267.78833389282226562500
fuse_test.shell.EIv = 2317348998.20037508010864257812
fuse_test.bendingmaterial_h.EIv = 16837922621.63796615600585937500
fuse_test.bendingmaterial_v.EIv = 16837922621.63796615600585937500
fuse_test.shell.GJ = 1570840170.26919627189636230469
fuse_test.cone.GJ = 1642159659.21472048759460449219
fuse_test.APU.W = 7698.76022650000140856719
fuse_test.APU.r = [36.57600000000000051159,0.0,0.0]
fuse_test.seat.W = 21996.45779000000038649887
fuse_test.fixed.W = 13344.66600000000107684173
fuse_test.fixed.r = [2.13359999999999994102,0.0,0.0]
fuse_test.HPE_sys.r = [18.89760000000000061959,0.0,0.0]
fuse_test.HPE_sys.W = 0.01000000000000000021
fuse_test.added_payload.W = 76987.60226500000862870365
Loading

0 comments on commit cb36835

Please sign in to comment.