diff --git a/.DS_Store b/.DS_Store index 31123b2..d7d2634 100755 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 7859987..a70df49 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ XFLR Outputs/Trade Study planform/Thumbs.db Planforms/Temp/Thumbs.db Matlab code/strut/Thumbs.db Matlab code/Excel Files/Thumbs.db +.idea/ \ No newline at end of file diff --git a/Excel Files/FDR020.xlsx b/Excel Files/FDR020.xlsx deleted file mode 100755 index 1957ae1..0000000 Binary files a/Excel Files/FDR020.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR001.xlsx b/Matlab code/Excel Files/FDR001.xlsx deleted file mode 100755 index 53b967b..0000000 Binary files a/Matlab code/Excel Files/FDR001.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR002.xlsx b/Matlab code/Excel Files/FDR002.xlsx deleted file mode 100755 index 745ccd4..0000000 Binary files a/Matlab code/Excel Files/FDR002.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR003.xlsx b/Matlab code/Excel Files/FDR003.xlsx deleted file mode 100755 index a57b2cf..0000000 Binary files a/Matlab code/Excel Files/FDR003.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR004.xlsx b/Matlab code/Excel Files/FDR004.xlsx deleted file mode 100755 index 4a2b6cf..0000000 Binary files a/Matlab code/Excel Files/FDR004.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR005.xlsx b/Matlab code/Excel Files/FDR005.xlsx deleted file mode 100755 index 4d3cbd8..0000000 Binary files a/Matlab code/Excel Files/FDR005.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR006.xlsx b/Matlab code/Excel Files/FDR006.xlsx deleted file mode 100755 index 789b4a9..0000000 Binary files a/Matlab code/Excel Files/FDR006.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR007.xlsx b/Matlab code/Excel Files/FDR007.xlsx deleted file mode 100755 index b659cb3..0000000 Binary files a/Matlab code/Excel Files/FDR007.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR008.xlsx b/Matlab code/Excel Files/FDR008.xlsx deleted file mode 100755 index b4f36da..0000000 Binary files a/Matlab code/Excel Files/FDR008.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR009.xlsx b/Matlab code/Excel Files/FDR009.xlsx deleted file mode 100755 index 55ad3ad..0000000 Binary files a/Matlab code/Excel Files/FDR009.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR010.xlsx b/Matlab code/Excel Files/FDR010.xlsx deleted file mode 100755 index 690b1bd..0000000 Binary files a/Matlab code/Excel Files/FDR010.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR012.txt b/Matlab code/Excel Files/FDR012.txt deleted file mode 100755 index 7651dd8..0000000 --- a/Matlab code/Excel Files/FDR012.txt +++ /dev/null @@ -1,7 +0,0 @@ -0 85 0 CB600155a.dat -2.32 82.73 2.27 CB600165a.dat -6.38 73.67 11.33 CB600175a.dat -14.2 52.13 30.6 CB600175a.dat -28.98 20 45 nasasc0718.dat -34.77 15 50 nasasc0714.dat -80 5 89 nasasc0714.dat \ No newline at end of file diff --git a/Matlab code/Excel Files/FDR012.xlsx b/Matlab code/Excel Files/FDR012.xlsx deleted file mode 100755 index e67ecb5..0000000 Binary files a/Matlab code/Excel Files/FDR012.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR013.txt b/Matlab code/Excel Files/FDR013.txt deleted file mode 100755 index 4cdef96..0000000 --- a/Matlab code/Excel Files/FDR013.txt +++ /dev/null @@ -1,16 +0,0 @@ -wingspan 160 -M_cruise 0.8 -M_landing 0.2 - -cLalpha_cruise 0.0567 -cL0 0.1422 -cMalpha_cruise -0.06 -cM0 -0.1919 - -efficiency 0.8872 - -alt_cruise 35000 -weight_cruise 160000 - -cd_correction 0 -c_f 0.003 \ No newline at end of file diff --git a/Matlab code/Excel Files/FDR013b.txt b/Matlab code/Excel Files/FDR013b.txt deleted file mode 100755 index 8510d43..0000000 --- a/Matlab code/Excel Files/FDR013b.txt +++ /dev/null @@ -1,14 +0,0 @@ -QFLR5 v0.04 Beta - -Wing name : sFD R013 -Wing polar name : T1- 105.0 ft/ s-VLM2- 0. 00ft-Invisc id -Freestream speed : 104 .990 ft/s - -alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP -_________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ -0 0.197841 0.002619 0 0.002619 0 -0.267136 0 0 0 32.001 0.1217 -1 0.254737 0.00402 0 0.00402 0 -0.327464 0 0 0 32.001 0.1159 -2 0.311422 0.005817 0 0.005817 0 -0.387557 0 0 0 32.001 0.1123 -3 0.367837 0.008003 0 0.008003 0 -0.447341 0 0 0 32.001 0.1098 -4 0.423924 0.010575 0 0.010575 0 -0.506744 0 0 0 32.001 0.108 -5 0.479626 0.013523 0 0.013523 0 -0.565693 0 0 0 32.001 0.1067 \ No newline at end of file diff --git a/Matlab code/Excel Files/FDR013b.xlsx b/Matlab code/Excel Files/FDR013b.xlsx deleted file mode 100755 index 15e313f..0000000 Binary files a/Matlab code/Excel Files/FDR013b.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/FDR020points.xlsx b/Matlab code/Excel Files/FDR020points.xlsx deleted file mode 100755 index 17fc2c3..0000000 Binary files a/Matlab code/Excel Files/FDR020points.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/PDR001.xlsx b/Matlab code/Excel Files/PDR001.xlsx deleted file mode 100755 index 9242435..0000000 Binary files a/Matlab code/Excel Files/PDR001.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/lift dist.xlsx b/Matlab code/Excel Files/lift dist.xlsx deleted file mode 100755 index ea5bd01..0000000 Binary files a/Matlab code/Excel Files/lift dist.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/points.xlsx b/Matlab code/Excel Files/points.xlsx deleted file mode 100755 index b2dd672..0000000 Binary files a/Matlab code/Excel Files/points.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/points14c.xlsx b/Matlab code/Excel Files/points14c.xlsx deleted file mode 100755 index d92057c..0000000 Binary files a/Matlab code/Excel Files/points14c.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/silent aircraft airfoil.xlsx b/Matlab code/Excel Files/silent aircraft airfoil.xlsx deleted file mode 100755 index c51b8a3..0000000 Binary files a/Matlab code/Excel Files/silent aircraft airfoil.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/tradeapalooza.xlsx b/Matlab code/Excel Files/tradeapalooza.xlsx deleted file mode 100755 index e53f0de..0000000 Binary files a/Matlab code/Excel Files/tradeapalooza.xlsx and /dev/null differ diff --git a/Matlab code/Excel Files/xflrdater.xlsx b/Matlab code/Excel Files/xflrdater.xlsx deleted file mode 100755 index 76de4f4..0000000 Binary files a/Matlab code/Excel Files/xflrdater.xlsx and /dev/null differ diff --git a/Matlab code/Legacy/.DS_Store b/airfoil/Airfoils/.DS_Store similarity index 94% rename from Matlab code/Legacy/.DS_Store rename to airfoil/Airfoils/.DS_Store index 4dc7686..8ca981e 100644 Binary files a/Matlab code/Legacy/.DS_Store and b/airfoil/Airfoils/.DS_Store differ diff --git a/Airfoils/Airfoil Images/CB600165a.tif b/airfoil/Airfoils/Airfoil Images/CB600165a.tif similarity index 100% rename from Airfoils/Airfoil Images/CB600165a.tif rename to airfoil/Airfoils/Airfoil Images/CB600165a.tif diff --git a/Airfoils/Airfoil Images/CB600175a.tif b/airfoil/Airfoils/Airfoil Images/CB600175a.tif similarity index 100% rename from Airfoils/Airfoil Images/CB600175a.tif rename to airfoil/Airfoils/Airfoil Images/CB600175a.tif diff --git a/Airfoils/Airfoil Images/CB600185d.tif b/airfoil/Airfoils/Airfoil Images/CB600185d.tif similarity index 100% rename from Airfoils/Airfoil Images/CB600185d.tif rename to airfoil/Airfoils/Airfoil Images/CB600185d.tif diff --git a/Airfoils/Airfoil Images/n0012.tif b/airfoil/Airfoils/Airfoil Images/n0012.tif similarity index 100% rename from Airfoils/Airfoil Images/n0012.tif rename to airfoil/Airfoils/Airfoil Images/n0012.tif diff --git a/Airfoils/Airfoil Images/nasasc0714.tif b/airfoil/Airfoils/Airfoil Images/nasasc0714.tif similarity index 100% rename from Airfoils/Airfoil Images/nasasc0714.tif rename to airfoil/Airfoils/Airfoil Images/nasasc0714.tif diff --git a/Airfoils/CB3.dat b/airfoil/Airfoils/CB3.dat similarity index 100% rename from Airfoils/CB3.dat rename to airfoil/Airfoils/CB3.dat diff --git a/Airfoils/CB30015.dat b/airfoil/Airfoils/CB30015.dat similarity index 100% rename from Airfoils/CB30015.dat rename to airfoil/Airfoils/CB30015.dat diff --git a/Airfoils/CB4.dat b/airfoil/Airfoils/CB4.dat similarity index 100% rename from Airfoils/CB4.dat rename to airfoil/Airfoils/CB4.dat diff --git a/Airfoils/CB40015.dat b/airfoil/Airfoils/CB40015.dat similarity index 100% rename from Airfoils/CB40015.dat rename to airfoil/Airfoils/CB40015.dat diff --git a/Airfoils/CB40018.dat b/airfoil/Airfoils/CB40018.dat similarity index 100% rename from Airfoils/CB40018.dat rename to airfoil/Airfoils/CB40018.dat diff --git a/Airfoils/CB50015.dat b/airfoil/Airfoils/CB50015.dat similarity index 100% rename from Airfoils/CB50015.dat rename to airfoil/Airfoils/CB50015.dat diff --git a/Airfoils/CB600155a.dat b/airfoil/Airfoils/CB600155a.dat similarity index 100% rename from Airfoils/CB600155a.dat rename to airfoil/Airfoils/CB600155a.dat diff --git a/Airfoils/CB600155b.dat b/airfoil/Airfoils/CB600155b.dat similarity index 100% rename from Airfoils/CB600155b.dat rename to airfoil/Airfoils/CB600155b.dat diff --git a/Airfoils/CB600165a.dat b/airfoil/Airfoils/CB600165a.dat similarity index 100% rename from Airfoils/CB600165a.dat rename to airfoil/Airfoils/CB600165a.dat diff --git a/Airfoils/CB600165b.dat b/airfoil/Airfoils/CB600165b.dat similarity index 100% rename from Airfoils/CB600165b.dat rename to airfoil/Airfoils/CB600165b.dat diff --git a/Airfoils/CB600175a.dat b/airfoil/Airfoils/CB600175a.dat similarity index 100% rename from Airfoils/CB600175a.dat rename to airfoil/Airfoils/CB600175a.dat diff --git a/Airfoils/CB600175b.dat b/airfoil/Airfoils/CB600175b.dat similarity index 100% rename from Airfoils/CB600175b.dat rename to airfoil/Airfoils/CB600175b.dat diff --git a/Airfoils/CB600185b.dat b/airfoil/Airfoils/CB600185b.dat similarity index 100% rename from Airfoils/CB600185b.dat rename to airfoil/Airfoils/CB600185b.dat diff --git a/Airfoils/CB600185c.dat b/airfoil/Airfoils/CB600185c.dat similarity index 100% rename from Airfoils/CB600185c.dat rename to airfoil/Airfoils/CB600185c.dat diff --git a/Airfoils/CB600185d.dat b/airfoil/Airfoils/CB600185d.dat similarity index 100% rename from Airfoils/CB600185d.dat rename to airfoil/Airfoils/CB600185d.dat diff --git a/Airfoils/CB60019c.dat b/airfoil/Airfoils/CB60019c.dat similarity index 100% rename from Airfoils/CB60019c.dat rename to airfoil/Airfoils/CB60019c.dat diff --git a/Airfoils/SAX.dat b/airfoil/Airfoils/SAX.dat similarity index 100% rename from Airfoils/SAX.dat rename to airfoil/Airfoils/SAX.dat diff --git a/Airfoils/SAX2.dat b/airfoil/Airfoils/SAX2.dat similarity index 100% rename from Airfoils/SAX2.dat rename to airfoil/Airfoils/SAX2.dat diff --git a/Airfoils/SAX3.dat b/airfoil/Airfoils/SAX3.dat similarity index 100% rename from Airfoils/SAX3.dat rename to airfoil/Airfoils/SAX3.dat diff --git a/Airfoils/SAX4.dat b/airfoil/Airfoils/SAX4.dat similarity index 100% rename from Airfoils/SAX4.dat rename to airfoil/Airfoils/SAX4.dat diff --git a/Airfoils/SAX4A.dat b/airfoil/Airfoils/SAX4A.dat similarity index 100% rename from Airfoils/SAX4A.dat rename to airfoil/Airfoils/SAX4A.dat diff --git a/Airfoils/dsma523a.dat b/airfoil/Airfoils/dsma523a.dat similarity index 100% rename from Airfoils/dsma523a.dat rename to airfoil/Airfoils/dsma523a.dat diff --git a/Airfoils/n0011sc.dat b/airfoil/Airfoils/n0011sc.dat similarity index 100% rename from Airfoils/n0011sc.dat rename to airfoil/Airfoils/n0011sc.dat diff --git a/Airfoils/n0012.dat b/airfoil/Airfoils/n0012.dat similarity index 100% rename from Airfoils/n0012.dat rename to airfoil/Airfoils/n0012.dat diff --git a/Airfoils/n001264.dat b/airfoil/Airfoils/n001264.dat similarity index 100% rename from Airfoils/n001264.dat rename to airfoil/Airfoils/n001264.dat diff --git a/Airfoils/n00155sc.dat b/airfoil/Airfoils/n00155sc.dat similarity index 100% rename from Airfoils/n00155sc.dat rename to airfoil/Airfoils/n00155sc.dat diff --git a/Airfoils/n00165sc.dat b/airfoil/Airfoils/n00165sc.dat similarity index 100% rename from Airfoils/n00165sc.dat rename to airfoil/Airfoils/n00165sc.dat diff --git a/Airfoils/n00175sc.dat b/airfoil/Airfoils/n00175sc.dat similarity index 100% rename from Airfoils/n00175sc.dat rename to airfoil/Airfoils/n00175sc.dat diff --git a/Airfoils/n00185sc.dat b/airfoil/Airfoils/n00185sc.dat similarity index 100% rename from Airfoils/n00185sc.dat rename to airfoil/Airfoils/n00185sc.dat diff --git a/Airfoils/n2410.dat b/airfoil/Airfoils/n2410.dat similarity index 100% rename from Airfoils/n2410.dat rename to airfoil/Airfoils/n2410.dat diff --git a/Airfoils/n2612.dat b/airfoil/Airfoils/n2612.dat similarity index 100% rename from Airfoils/n2612.dat rename to airfoil/Airfoils/n2612.dat diff --git a/Airfoils/n2616.dat b/airfoil/Airfoils/n2616.dat similarity index 100% rename from Airfoils/n2616.dat rename to airfoil/Airfoils/n2616.dat diff --git a/Airfoils/nasasc0714.dat b/airfoil/Airfoils/nasasc0714.dat similarity index 100% rename from Airfoils/nasasc0714.dat rename to airfoil/Airfoils/nasasc0714.dat diff --git a/Airfoils/nasasc0716.dat b/airfoil/Airfoils/nasasc0716.dat similarity index 100% rename from Airfoils/nasasc0716.dat rename to airfoil/Airfoils/nasasc0716.dat diff --git a/Airfoils/nasasc0718.dat b/airfoil/Airfoils/nasasc0718.dat similarity index 100% rename from Airfoils/nasasc0718.dat rename to airfoil/Airfoils/nasasc0718.dat diff --git a/Airfoils/nasasc0721.dat b/airfoil/Airfoils/nasasc0721.dat similarity index 100% rename from Airfoils/nasasc0721.dat rename to airfoil/Airfoils/nasasc0721.dat diff --git a/Airfoils/transairfoilsc714cb175a.dat b/airfoil/Airfoils/transairfoilsc714cb175a.dat similarity index 100% rename from Airfoils/transairfoilsc714cb175a.dat rename to airfoil/Airfoils/transairfoilsc714cb175a.dat diff --git a/Matlab code/airfoil.m b/airfoil/airfoil.m similarity index 100% rename from Matlab code/airfoil.m rename to airfoil/airfoil.m diff --git a/Matlab code/Legacy/Jacobi/Airfoils/CB30015.dat b/archive/Jacobi/Airfoils/CB30015.dat similarity index 100% rename from Matlab code/Legacy/Jacobi/Airfoils/CB30015.dat rename to archive/Jacobi/Airfoils/CB30015.dat diff --git a/Matlab code/Legacy/Jacobi/Planforms/AirData.dat b/archive/Jacobi/Planforms/AirData.dat similarity index 100% rename from Matlab code/Legacy/Jacobi/Planforms/AirData.dat rename to archive/Jacobi/Planforms/AirData.dat diff --git a/Matlab code/Legacy/Jacobi/Planforms/AirData.mat b/archive/Jacobi/Planforms/AirData.mat similarity index 100% rename from Matlab code/Legacy/Jacobi/Planforms/AirData.mat rename to archive/Jacobi/Planforms/AirData.mat diff --git a/Matlab code/Legacy/Jacobi/Planforms/FDR001.avl b/archive/Jacobi/Planforms/FDR001.avl similarity index 100% rename from Matlab code/Legacy/Jacobi/Planforms/FDR001.avl rename to archive/Jacobi/Planforms/FDR001.avl diff --git a/Matlab code/Legacy/Jacobi/Planforms/olddater.dat b/archive/Jacobi/Planforms/olddater.dat similarity index 100% rename from Matlab code/Legacy/Jacobi/Planforms/olddater.dat rename to archive/Jacobi/Planforms/olddater.dat diff --git a/Matlab code/Legacy/Jacobi/WhettedArea.m b/archive/Jacobi/WhettedArea.m similarity index 100% rename from Matlab code/Legacy/Jacobi/WhettedArea.m rename to archive/Jacobi/WhettedArea.m diff --git a/Matlab code/Legacy/Jacobi/WhettedAreaflubbed.m b/archive/Jacobi/WhettedAreaflubbed.m similarity index 100% rename from Matlab code/Legacy/Jacobi/WhettedAreaflubbed.m rename to archive/Jacobi/WhettedAreaflubbed.m diff --git a/Matlab code/Legacy/MASTER441.bak2m b/archive/MASTER441.bak2m similarity index 100% rename from Matlab code/Legacy/MASTER441.bak2m rename to archive/MASTER441.bak2m diff --git a/Matlab code/Legacy/MASTER441.m b/archive/MASTER441.m similarity index 100% rename from Matlab code/Legacy/MASTER441.m rename to archive/MASTER441.m diff --git a/Matlab code/Legacy/clreqcalc.m b/archive/clreqcalc.m similarity index 100% rename from Matlab code/Legacy/clreqcalc.m rename to archive/clreqcalc.m diff --git a/Matlab code/Legacy/dragbuildup.m b/archive/dragbuildup.m similarity index 100% rename from Matlab code/Legacy/dragbuildup.m rename to archive/dragbuildup.m diff --git a/Matlab code/Legacy/dragpolarpop.m b/archive/dragpolarpop.m similarity index 100% rename from Matlab code/Legacy/dragpolarpop.m rename to archive/dragpolarpop.m diff --git a/Matlab code/Legacy/dragpolarpop2.m b/archive/dragpolarpop2.m similarity index 100% rename from Matlab code/Legacy/dragpolarpop2.m rename to archive/dragpolarpop2.m diff --git a/Matlab code/Legacy/findcLalpha.m b/archive/findcLalpha.m similarity index 100% rename from Matlab code/Legacy/findcLalpha.m rename to archive/findcLalpha.m diff --git a/Matlab code/Legacy/induceddrag.m b/archive/induceddrag.m similarity index 100% rename from Matlab code/Legacy/induceddrag.m rename to archive/induceddrag.m diff --git a/Matlab code/Legacy/omkarshitty.m b/archive/omkarshitty.m similarity index 100% rename from Matlab code/Legacy/omkarshitty.m rename to archive/omkarshitty.m diff --git a/Matlab code/Legacy/penis.m b/archive/penis.m similarity index 100% rename from Matlab code/Legacy/penis.m rename to archive/penis.m diff --git a/fail.bmp b/fail.bmp deleted file mode 100755 index 7ae688b..0000000 Binary files a/fail.bmp and /dev/null differ diff --git a/grimace/Grimace Outputs/.DS_Store b/grimace/Grimace Outputs/.DS_Store new file mode 100755 index 0000000..978e426 Binary files /dev/null and b/grimace/Grimace Outputs/.DS_Store differ diff --git a/Grimace Outputs/FDR013grim.tiff b/grimace/Grimace Outputs/FDR013grim.tiff similarity index 100% rename from Grimace Outputs/FDR013grim.tiff rename to grimace/Grimace Outputs/FDR013grim.tiff diff --git a/Grimace Outputs/FDR014grim.tiff b/grimace/Grimace Outputs/FDR014grim.tiff similarity index 100% rename from Grimace Outputs/FDR014grim.tiff rename to grimace/Grimace Outputs/FDR014grim.tiff diff --git a/Grimace Outputs/FDR015grim.tiff b/grimace/Grimace Outputs/FDR015grim.tiff similarity index 100% rename from Grimace Outputs/FDR015grim.tiff rename to grimace/Grimace Outputs/FDR015grim.tiff diff --git a/Grimace Outputs/FDR016grim.tiff b/grimace/Grimace Outputs/FDR016grim.tiff similarity index 100% rename from Grimace Outputs/FDR016grim.tiff rename to grimace/Grimace Outputs/FDR016grim.tiff diff --git a/Grimace Outputs/FDR017grim.tiff b/grimace/Grimace Outputs/FDR017grim.tiff similarity index 100% rename from Grimace Outputs/FDR017grim.tiff rename to grimace/Grimace Outputs/FDR017grim.tiff diff --git a/Grimace Outputs/FDR018grim.tiff b/grimace/Grimace Outputs/FDR018grim.tiff similarity index 100% rename from Grimace Outputs/FDR018grim.tiff rename to grimace/Grimace Outputs/FDR018grim.tiff diff --git a/Grimace Outputs/FDR019grim.tiff b/grimace/Grimace Outputs/FDR019grim.tiff similarity index 100% rename from Grimace Outputs/FDR019grim.tiff rename to grimace/Grimace Outputs/FDR019grim.tiff diff --git a/Grimace Outputs/FDR020grim.tiff b/grimace/Grimace Outputs/FDR020grim.tiff similarity index 100% rename from Grimace Outputs/FDR020grim.tiff rename to grimace/Grimace Outputs/FDR020grim.tiff diff --git a/Grimace Outputs/Old Outputs/FDR005.jpg b/grimace/Grimace Outputs/Old Outputs/FDR005.jpg similarity index 100% rename from Grimace Outputs/Old Outputs/FDR005.jpg rename to grimace/Grimace Outputs/Old Outputs/FDR005.jpg diff --git a/Grimace Outputs/Old Outputs/FDR010.jpg b/grimace/Grimace Outputs/Old Outputs/FDR010.jpg similarity index 100% rename from Grimace Outputs/Old Outputs/FDR010.jpg rename to grimace/Grimace Outputs/Old Outputs/FDR010.jpg diff --git a/Grimace Outputs/Old Outputs/FDR012.jpg b/grimace/Grimace Outputs/Old Outputs/FDR012.jpg similarity index 100% rename from Grimace Outputs/Old Outputs/FDR012.jpg rename to grimace/Grimace Outputs/Old Outputs/FDR012.jpg diff --git a/Grimace Outputs/Old Outputs/FDR012b.jpg b/grimace/Grimace Outputs/Old Outputs/FDR012b.jpg similarity index 100% rename from Grimace Outputs/Old Outputs/FDR012b.jpg rename to grimace/Grimace Outputs/Old Outputs/FDR012b.jpg diff --git a/Grimace Outputs/Old Outputs/FDR013.tiff b/grimace/Grimace Outputs/Old Outputs/FDR013.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR013.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR013.tiff diff --git a/Grimace Outputs/Old Outputs/FDR014.tiff b/grimace/Grimace Outputs/Old Outputs/FDR014.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR014.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR014.tiff diff --git a/Grimace Outputs/Old Outputs/FDR015.tiff b/grimace/Grimace Outputs/Old Outputs/FDR015.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR015.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR015.tiff diff --git a/Grimace Outputs/Old Outputs/FDR016.tiff b/grimace/Grimace Outputs/Old Outputs/FDR016.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR016.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR016.tiff diff --git a/Grimace Outputs/Old Outputs/FDR017.tiff b/grimace/Grimace Outputs/Old Outputs/FDR017.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR017.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR017.tiff diff --git a/Grimace Outputs/Old Outputs/FDR018.tiff b/grimace/Grimace Outputs/Old Outputs/FDR018.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR018.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR018.tiff diff --git a/Grimace Outputs/Old Outputs/FDR019.tiff b/grimace/Grimace Outputs/Old Outputs/FDR019.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR019.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR019.tiff diff --git a/Grimace Outputs/Old Outputs/FDR020.tiff b/grimace/Grimace Outputs/Old Outputs/FDR020.tiff similarity index 100% rename from Grimace Outputs/Old Outputs/FDR020.tiff rename to grimace/Grimace Outputs/Old Outputs/FDR020.tiff diff --git a/Matlab code/Grimace.m b/grimace/Grimace.m similarity index 100% rename from Matlab code/Grimace.m rename to grimace/Grimace.m diff --git a/Matlab code/Grimacelite.m b/grimace/Grimacelite.m similarity index 100% rename from Matlab code/Grimacelite.m rename to grimace/Grimacelite.m diff --git a/inputs/Parameter/.DS_Store b/inputs/Parameter/.DS_Store new file mode 100644 index 0000000..f8df962 Binary files /dev/null and b/inputs/Parameter/.DS_Store differ diff --git a/Parameter Files/FDR001.param b/inputs/Parameter/FDR001.param similarity index 100% rename from Parameter Files/FDR001.param rename to inputs/Parameter/FDR001.param diff --git a/Parameter Files/FDR002.param b/inputs/Parameter/FDR002.param similarity index 100% rename from Parameter Files/FDR002.param rename to inputs/Parameter/FDR002.param diff --git a/Parameter Files/FDR003.param b/inputs/Parameter/FDR003.param similarity index 100% rename from Parameter Files/FDR003.param rename to inputs/Parameter/FDR003.param diff --git a/Parameter Files/FDR004.param b/inputs/Parameter/FDR004.param similarity index 100% rename from Parameter Files/FDR004.param rename to inputs/Parameter/FDR004.param diff --git a/Parameter Files/FDR005.param b/inputs/Parameter/FDR005.param similarity index 100% rename from Parameter Files/FDR005.param rename to inputs/Parameter/FDR005.param diff --git a/Parameter Files/FDR006.param b/inputs/Parameter/FDR006.param similarity index 100% rename from Parameter Files/FDR006.param rename to inputs/Parameter/FDR006.param diff --git a/Parameter Files/FDR007.param b/inputs/Parameter/FDR007.param similarity index 100% rename from Parameter Files/FDR007.param rename to inputs/Parameter/FDR007.param diff --git a/Parameter Files/FDR008.param b/inputs/Parameter/FDR008.param similarity index 100% rename from Parameter Files/FDR008.param rename to inputs/Parameter/FDR008.param diff --git a/Parameter Files/FDR009.param b/inputs/Parameter/FDR009.param similarity index 100% rename from Parameter Files/FDR009.param rename to inputs/Parameter/FDR009.param diff --git a/Parameter Files/FDR010.param b/inputs/Parameter/FDR010.param similarity index 100% rename from Parameter Files/FDR010.param rename to inputs/Parameter/FDR010.param diff --git a/Parameter Files/FDR013.param b/inputs/Parameter/FDR013.param similarity index 100% rename from Parameter Files/FDR013.param rename to inputs/Parameter/FDR013.param diff --git a/Parameter Files/FDR020.param b/inputs/Parameter/FDR020.param similarity index 100% rename from Parameter Files/FDR020.param rename to inputs/Parameter/FDR020.param diff --git a/Parameter Files/FDR020b.param b/inputs/Parameter/FDR020b.param similarity index 100% rename from Parameter Files/FDR020b.param rename to inputs/Parameter/FDR020b.param diff --git a/Parameter Files/Old Datars/FDR001.param b/inputs/Parameter/Old Datars/FDR001.param similarity index 100% rename from Parameter Files/Old Datars/FDR001.param rename to inputs/Parameter/Old Datars/FDR001.param diff --git a/Parameter Files/Old Datars/FDR001.txt b/inputs/Parameter/Old Datars/FDR001.txt similarity index 100% rename from Parameter Files/Old Datars/FDR001.txt rename to inputs/Parameter/Old Datars/FDR001.txt diff --git a/Parameter Files/Old Datars/FDR002.param b/inputs/Parameter/Old Datars/FDR002.param similarity index 100% rename from Parameter Files/Old Datars/FDR002.param rename to inputs/Parameter/Old Datars/FDR002.param diff --git a/Parameter Files/Old Datars/FDR002.txt b/inputs/Parameter/Old Datars/FDR002.txt similarity index 100% rename from Parameter Files/Old Datars/FDR002.txt rename to inputs/Parameter/Old Datars/FDR002.txt diff --git a/Parameter Files/Old Datars/FDR003.param b/inputs/Parameter/Old Datars/FDR003.param similarity index 100% rename from Parameter Files/Old Datars/FDR003.param rename to inputs/Parameter/Old Datars/FDR003.param diff --git a/Parameter Files/Old Datars/FDR003.txt b/inputs/Parameter/Old Datars/FDR003.txt similarity index 100% rename from Parameter Files/Old Datars/FDR003.txt rename to inputs/Parameter/Old Datars/FDR003.txt diff --git a/Parameter Files/Old Datars/FDR004.param b/inputs/Parameter/Old Datars/FDR004.param similarity index 100% rename from Parameter Files/Old Datars/FDR004.param rename to inputs/Parameter/Old Datars/FDR004.param diff --git a/Parameter Files/Old Datars/FDR004.txt b/inputs/Parameter/Old Datars/FDR004.txt similarity index 100% rename from Parameter Files/Old Datars/FDR004.txt rename to inputs/Parameter/Old Datars/FDR004.txt diff --git a/Parameter Files/Old Datars/FDR005.param b/inputs/Parameter/Old Datars/FDR005.param similarity index 100% rename from Parameter Files/Old Datars/FDR005.param rename to inputs/Parameter/Old Datars/FDR005.param diff --git a/Parameter Files/Old Datars/FDR005.txt b/inputs/Parameter/Old Datars/FDR005.txt similarity index 100% rename from Parameter Files/Old Datars/FDR005.txt rename to inputs/Parameter/Old Datars/FDR005.txt diff --git a/Parameter Files/Old Datars/FDR006.param b/inputs/Parameter/Old Datars/FDR006.param similarity index 100% rename from Parameter Files/Old Datars/FDR006.param rename to inputs/Parameter/Old Datars/FDR006.param diff --git a/Parameter Files/Old Datars/FDR006.txt b/inputs/Parameter/Old Datars/FDR006.txt similarity index 100% rename from Parameter Files/Old Datars/FDR006.txt rename to inputs/Parameter/Old Datars/FDR006.txt diff --git a/Parameter Files/Old Datars/FDR007.param b/inputs/Parameter/Old Datars/FDR007.param similarity index 100% rename from Parameter Files/Old Datars/FDR007.param rename to inputs/Parameter/Old Datars/FDR007.param diff --git a/Parameter Files/Old Datars/FDR007.txt b/inputs/Parameter/Old Datars/FDR007.txt similarity index 100% rename from Parameter Files/Old Datars/FDR007.txt rename to inputs/Parameter/Old Datars/FDR007.txt diff --git a/Parameter Files/Old Datars/FDR008.param b/inputs/Parameter/Old Datars/FDR008.param similarity index 100% rename from Parameter Files/Old Datars/FDR008.param rename to inputs/Parameter/Old Datars/FDR008.param diff --git a/Parameter Files/Old Datars/FDR008.txt b/inputs/Parameter/Old Datars/FDR008.txt similarity index 100% rename from Parameter Files/Old Datars/FDR008.txt rename to inputs/Parameter/Old Datars/FDR008.txt diff --git a/Parameter Files/Old Datars/FDR009.param b/inputs/Parameter/Old Datars/FDR009.param similarity index 100% rename from Parameter Files/Old Datars/FDR009.param rename to inputs/Parameter/Old Datars/FDR009.param diff --git a/Parameter Files/Old Datars/FDR009.txt b/inputs/Parameter/Old Datars/FDR009.txt similarity index 100% rename from Parameter Files/Old Datars/FDR009.txt rename to inputs/Parameter/Old Datars/FDR009.txt diff --git a/Parameter Files/Old Datars/FDR010.param b/inputs/Parameter/Old Datars/FDR010.param similarity index 100% rename from Parameter Files/Old Datars/FDR010.param rename to inputs/Parameter/Old Datars/FDR010.param diff --git a/Parameter Files/Old Datars/FDR010.txt b/inputs/Parameter/Old Datars/FDR010.txt similarity index 100% rename from Parameter Files/Old Datars/FDR010.txt rename to inputs/Parameter/Old Datars/FDR010.txt diff --git a/Parameter Files/Old Datars/FDR012.param b/inputs/Parameter/Old Datars/FDR012.param similarity index 100% rename from Parameter Files/Old Datars/FDR012.param rename to inputs/Parameter/Old Datars/FDR012.param diff --git a/Parameter Files/Old Datars/FDR012.txt b/inputs/Parameter/Old Datars/FDR012.txt similarity index 100% rename from Parameter Files/Old Datars/FDR012.txt rename to inputs/Parameter/Old Datars/FDR012.txt diff --git a/Parameter Files/Old Datars/FDR013.asv b/inputs/Parameter/Old Datars/FDR013.asv similarity index 100% rename from Parameter Files/Old Datars/FDR013.asv rename to inputs/Parameter/Old Datars/FDR013.asv diff --git a/Parameter Files/Old Datars/FDR013.param b/inputs/Parameter/Old Datars/FDR013.param similarity index 100% rename from Parameter Files/Old Datars/FDR013.param rename to inputs/Parameter/Old Datars/FDR013.param diff --git a/Parameter Files/Old Datars/FDR013.txt b/inputs/Parameter/Old Datars/FDR013.txt similarity index 100% rename from Parameter Files/Old Datars/FDR013.txt rename to inputs/Parameter/Old Datars/FDR013.txt diff --git a/Parameter Files/Old Datars/FDR013b.txt b/inputs/Parameter/Old Datars/FDR013b.txt similarity index 100% rename from Parameter Files/Old Datars/FDR013b.txt rename to inputs/Parameter/Old Datars/FDR013b.txt diff --git a/Parameter Files/Old Datars/FDR020.txt b/inputs/Parameter/Old Datars/FDR020.txt similarity index 100% rename from Parameter Files/Old Datars/FDR020.txt rename to inputs/Parameter/Old Datars/FDR020.txt diff --git a/Parameter Files/Old Datars/PDR001.param b/inputs/Parameter/Old Datars/PDR001.param similarity index 100% rename from Parameter Files/Old Datars/PDR001.param rename to inputs/Parameter/Old Datars/PDR001.param diff --git a/Parameter Files/Old Datars/PDR001.txt b/inputs/Parameter/Old Datars/PDR001.txt similarity index 100% rename from Parameter Files/Old Datars/PDR001.txt rename to inputs/Parameter/Old Datars/PDR001.txt diff --git a/Planform Constraints/FDR002.dat b/inputs/Planform Constraints/FDR002.dat similarity index 100% rename from Planform Constraints/FDR002.dat rename to inputs/Planform Constraints/FDR002.dat diff --git a/inputs/Planform Constraints/Thumbs.db b/inputs/Planform Constraints/Thumbs.db new file mode 100755 index 0000000..b966913 Binary files /dev/null and b/inputs/Planform Constraints/Thumbs.db differ diff --git a/Planform Constraints/constraint.dat b/inputs/Planform Constraints/constraint.dat similarity index 100% rename from Planform Constraints/constraint.dat rename to inputs/Planform Constraints/constraint.dat diff --git a/Planform Constraints/constraint10 b/inputs/Planform Constraints/constraint10 similarity index 100% rename from Planform Constraints/constraint10 rename to inputs/Planform Constraints/constraint10 diff --git a/Planform Constraints/constraint2.dat b/inputs/Planform Constraints/constraint2.dat similarity index 100% rename from Planform Constraints/constraint2.dat rename to inputs/Planform Constraints/constraint2.dat diff --git a/Planform Constraints/constraint2.dat~ b/inputs/Planform Constraints/constraint2.dat~ similarity index 100% rename from Planform Constraints/constraint2.dat~ rename to inputs/Planform Constraints/constraint2.dat~ diff --git a/Planform Constraints/constraint3.dat b/inputs/Planform Constraints/constraint3.dat similarity index 100% rename from Planform Constraints/constraint3.dat rename to inputs/Planform Constraints/constraint3.dat diff --git a/Planform Constraints/constraint4.dat b/inputs/Planform Constraints/constraint4.dat similarity index 100% rename from Planform Constraints/constraint4.dat rename to inputs/Planform Constraints/constraint4.dat diff --git a/Planform Constraints/constraint5.dat b/inputs/Planform Constraints/constraint5.dat similarity index 100% rename from Planform Constraints/constraint5.dat rename to inputs/Planform Constraints/constraint5.dat diff --git a/Planform Constraints/constraint6.dat b/inputs/Planform Constraints/constraint6.dat similarity index 100% rename from Planform Constraints/constraint6.dat rename to inputs/Planform Constraints/constraint6.dat diff --git a/Planform Constraints/constraint7.asv b/inputs/Planform Constraints/constraint7.asv similarity index 100% rename from Planform Constraints/constraint7.asv rename to inputs/Planform Constraints/constraint7.asv diff --git a/Planform Constraints/constraint7.dat b/inputs/Planform Constraints/constraint7.dat similarity index 100% rename from Planform Constraints/constraint7.dat rename to inputs/Planform Constraints/constraint7.dat diff --git a/Planform Constraints/constraint8 b/inputs/Planform Constraints/constraint8 similarity index 100% rename from Planform Constraints/constraint8 rename to inputs/Planform Constraints/constraint8 diff --git a/Planform Constraints/constraint8.asv b/inputs/Planform Constraints/constraint8.asv similarity index 100% rename from Planform Constraints/constraint8.asv rename to inputs/Planform Constraints/constraint8.asv diff --git a/Planform Constraints/constraint8.dat b/inputs/Planform Constraints/constraint8.dat similarity index 100% rename from Planform Constraints/constraint8.dat rename to inputs/Planform Constraints/constraint8.dat diff --git a/Planform Constraints/constraint9 b/inputs/Planform Constraints/constraint9 similarity index 100% rename from Planform Constraints/constraint9 rename to inputs/Planform Constraints/constraint9 diff --git a/Planform Constraints/constraint9.dat b/inputs/Planform Constraints/constraint9.dat similarity index 100% rename from Planform Constraints/constraint9.dat rename to inputs/Planform Constraints/constraint9.dat diff --git a/Planform Constraints/cruise.tif b/inputs/Planform Constraints/cruise.tif similarity index 100% rename from Planform Constraints/cruise.tif rename to inputs/Planform Constraints/cruise.tif diff --git a/inputs/Planforms/.DS_Store b/inputs/Planforms/.DS_Store new file mode 100644 index 0000000..af734e0 Binary files /dev/null and b/inputs/Planforms/.DS_Store differ diff --git a/Planforms/1996 yankees.csv b/inputs/Planforms/1996 yankees.csv similarity index 100% rename from Planforms/1996 yankees.csv rename to inputs/Planforms/1996 yankees.csv diff --git a/Planforms/2009 yankees.csv b/inputs/Planforms/2009 yankees.csv similarity index 100% rename from Planforms/2009 yankees.csv rename to inputs/Planforms/2009 yankees.csv diff --git a/Planforms/27 yankees.csv b/inputs/Planforms/27 yankees.csv similarity index 100% rename from Planforms/27 yankees.csv rename to inputs/Planforms/27 yankees.csv diff --git a/Planforms/61 yankees.csv b/inputs/Planforms/61 yankees.csv similarity index 100% rename from Planforms/61 yankees.csv rename to inputs/Planforms/61 yankees.csv diff --git a/Planforms/78 yankees.csv b/inputs/Planforms/78 yankees.csv similarity index 100% rename from Planforms/78 yankees.csv rename to inputs/Planforms/78 yankees.csv diff --git a/Planforms/FDR001.plan b/inputs/Planforms/FDR001.plan similarity index 100% rename from Planforms/FDR001.plan rename to inputs/Planforms/FDR001.plan diff --git a/Planforms/FDR002.plan b/inputs/Planforms/FDR002.plan similarity index 100% rename from Planforms/FDR002.plan rename to inputs/Planforms/FDR002.plan diff --git a/Planforms/FDR003.plan b/inputs/Planforms/FDR003.plan similarity index 100% rename from Planforms/FDR003.plan rename to inputs/Planforms/FDR003.plan diff --git a/Planforms/FDR004.plan b/inputs/Planforms/FDR004.plan similarity index 100% rename from Planforms/FDR004.plan rename to inputs/Planforms/FDR004.plan diff --git a/Planforms/FDR005.plan b/inputs/Planforms/FDR005.plan similarity index 100% rename from Planforms/FDR005.plan rename to inputs/Planforms/FDR005.plan diff --git a/Planforms/FDR006.plan b/inputs/Planforms/FDR006.plan similarity index 100% rename from Planforms/FDR006.plan rename to inputs/Planforms/FDR006.plan diff --git a/Planforms/FDR007.plan b/inputs/Planforms/FDR007.plan similarity index 100% rename from Planforms/FDR007.plan rename to inputs/Planforms/FDR007.plan diff --git a/Planforms/FDR008.plan b/inputs/Planforms/FDR008.plan similarity index 100% rename from Planforms/FDR008.plan rename to inputs/Planforms/FDR008.plan diff --git a/Planforms/FDR009.plan b/inputs/Planforms/FDR009.plan similarity index 100% rename from Planforms/FDR009.plan rename to inputs/Planforms/FDR009.plan diff --git a/Planforms/FDR010.dat~ b/inputs/Planforms/FDR010.dat~ similarity index 100% rename from Planforms/FDR010.dat~ rename to inputs/Planforms/FDR010.dat~ diff --git a/Planforms/FDR010.plan b/inputs/Planforms/FDR010.plan similarity index 100% rename from Planforms/FDR010.plan rename to inputs/Planforms/FDR010.plan diff --git a/Planforms/FDR010.plan~ b/inputs/Planforms/FDR010.plan~ similarity index 100% rename from Planforms/FDR010.plan~ rename to inputs/Planforms/FDR010.plan~ diff --git a/Planforms/FDR011.plan b/inputs/Planforms/FDR011.plan similarity index 100% rename from Planforms/FDR011.plan rename to inputs/Planforms/FDR011.plan diff --git a/Planforms/FDR012.dat~ b/inputs/Planforms/FDR012.dat~ similarity index 100% rename from Planforms/FDR012.dat~ rename to inputs/Planforms/FDR012.dat~ diff --git a/Planforms/FDR012.plan b/inputs/Planforms/FDR012.plan similarity index 100% rename from Planforms/FDR012.plan rename to inputs/Planforms/FDR012.plan diff --git a/Planforms/FDR012.plan~ b/inputs/Planforms/FDR012.plan~ similarity index 100% rename from Planforms/FDR012.plan~ rename to inputs/Planforms/FDR012.plan~ diff --git a/Planforms/FDR012.txt b/inputs/Planforms/FDR012.txt similarity index 100% rename from Planforms/FDR012.txt rename to inputs/Planforms/FDR012.txt diff --git a/Planforms/FDR012helpme.plan b/inputs/Planforms/FDR012helpme.plan similarity index 100% rename from Planforms/FDR012helpme.plan rename to inputs/Planforms/FDR012helpme.plan diff --git a/Planforms/FDR013.plan b/inputs/Planforms/FDR013.plan similarity index 100% rename from Planforms/FDR013.plan rename to inputs/Planforms/FDR013.plan diff --git a/Planforms/FDR014.plan b/inputs/Planforms/FDR014.plan similarity index 100% rename from Planforms/FDR014.plan rename to inputs/Planforms/FDR014.plan diff --git a/Planforms/FDR014b.plan b/inputs/Planforms/FDR014b.plan similarity index 100% rename from Planforms/FDR014b.plan rename to inputs/Planforms/FDR014b.plan diff --git a/Planforms/FDR014c.plan b/inputs/Planforms/FDR014c.plan similarity index 100% rename from Planforms/FDR014c.plan rename to inputs/Planforms/FDR014c.plan diff --git a/Planforms/FDR015.plan b/inputs/Planforms/FDR015.plan similarity index 100% rename from Planforms/FDR015.plan rename to inputs/Planforms/FDR015.plan diff --git a/Planforms/FDR016.plan b/inputs/Planforms/FDR016.plan similarity index 100% rename from Planforms/FDR016.plan rename to inputs/Planforms/FDR016.plan diff --git a/Planforms/FDR017.plan b/inputs/Planforms/FDR017.plan similarity index 100% rename from Planforms/FDR017.plan rename to inputs/Planforms/FDR017.plan diff --git a/Planforms/FDR018.plan b/inputs/Planforms/FDR018.plan similarity index 100% rename from Planforms/FDR018.plan rename to inputs/Planforms/FDR018.plan diff --git a/Planforms/FDR019.plan b/inputs/Planforms/FDR019.plan similarity index 100% rename from Planforms/FDR019.plan rename to inputs/Planforms/FDR019.plan diff --git a/Planforms/FDR020.plan b/inputs/Planforms/FDR020.plan similarity index 100% rename from Planforms/FDR020.plan rename to inputs/Planforms/FDR020.plan diff --git a/Planforms/FDR020ronaldplus.txt b/inputs/Planforms/FDR020ronaldplus.txt similarity index 100% rename from Planforms/FDR020ronaldplus.txt rename to inputs/Planforms/FDR020ronaldplus.txt diff --git a/Planforms/PDR001.plan b/inputs/Planforms/PDR001.plan similarity index 100% rename from Planforms/PDR001.plan rename to inputs/Planforms/PDR001.plan diff --git a/Planforms/PDR003.plan b/inputs/Planforms/PDR003.plan similarity index 100% rename from Planforms/PDR003.plan rename to inputs/Planforms/PDR003.plan diff --git a/Planforms/Temp/FDR013.tiff b/inputs/Planforms/Temp/FDR013.tiff similarity index 100% rename from Planforms/Temp/FDR013.tiff rename to inputs/Planforms/Temp/FDR013.tiff diff --git a/Planforms/Temp/FDR013grim.tiff b/inputs/Planforms/Temp/FDR013grim.tiff similarity index 100% rename from Planforms/Temp/FDR013grim.tiff rename to inputs/Planforms/Temp/FDR013grim.tiff diff --git a/Planforms/Temp/FDR014.tiff b/inputs/Planforms/Temp/FDR014.tiff similarity index 100% rename from Planforms/Temp/FDR014.tiff rename to inputs/Planforms/Temp/FDR014.tiff diff --git a/Planforms/Temp/FDR014grim.tiff b/inputs/Planforms/Temp/FDR014grim.tiff similarity index 100% rename from Planforms/Temp/FDR014grim.tiff rename to inputs/Planforms/Temp/FDR014grim.tiff diff --git a/Planforms/Temp/FDR015.tiff b/inputs/Planforms/Temp/FDR015.tiff similarity index 100% rename from Planforms/Temp/FDR015.tiff rename to inputs/Planforms/Temp/FDR015.tiff diff --git a/Planforms/Temp/FDR015grim.tiff b/inputs/Planforms/Temp/FDR015grim.tiff similarity index 100% rename from Planforms/Temp/FDR015grim.tiff rename to inputs/Planforms/Temp/FDR015grim.tiff diff --git a/Planforms/Temp/FDR016.tiff b/inputs/Planforms/Temp/FDR016.tiff similarity index 100% rename from Planforms/Temp/FDR016.tiff rename to inputs/Planforms/Temp/FDR016.tiff diff --git a/Planforms/Temp/FDR016grim.tiff b/inputs/Planforms/Temp/FDR016grim.tiff similarity index 100% rename from Planforms/Temp/FDR016grim.tiff rename to inputs/Planforms/Temp/FDR016grim.tiff diff --git a/Planforms/Temp/FDR017.tiff b/inputs/Planforms/Temp/FDR017.tiff similarity index 100% rename from Planforms/Temp/FDR017.tiff rename to inputs/Planforms/Temp/FDR017.tiff diff --git a/Planforms/Temp/FDR017grim.tiff b/inputs/Planforms/Temp/FDR017grim.tiff similarity index 100% rename from Planforms/Temp/FDR017grim.tiff rename to inputs/Planforms/Temp/FDR017grim.tiff diff --git a/Planforms/Temp/FDR018.tiff b/inputs/Planforms/Temp/FDR018.tiff similarity index 100% rename from Planforms/Temp/FDR018.tiff rename to inputs/Planforms/Temp/FDR018.tiff diff --git a/Planforms/Temp/FDR018grim.tiff b/inputs/Planforms/Temp/FDR018grim.tiff similarity index 100% rename from Planforms/Temp/FDR018grim.tiff rename to inputs/Planforms/Temp/FDR018grim.tiff diff --git a/Planforms/Temp/FDR019.tiff b/inputs/Planforms/Temp/FDR019.tiff similarity index 100% rename from Planforms/Temp/FDR019.tiff rename to inputs/Planforms/Temp/FDR019.tiff diff --git a/Planforms/Temp/FDR019grim.tiff b/inputs/Planforms/Temp/FDR019grim.tiff similarity index 100% rename from Planforms/Temp/FDR019grim.tiff rename to inputs/Planforms/Temp/FDR019grim.tiff diff --git a/Planforms/Temp/FDR020.tiff b/inputs/Planforms/Temp/FDR020.tiff similarity index 100% rename from Planforms/Temp/FDR020.tiff rename to inputs/Planforms/Temp/FDR020.tiff diff --git a/Planforms/Temp/FDR020grim.tiff b/inputs/Planforms/Temp/FDR020grim.tiff similarity index 100% rename from Planforms/Temp/FDR020grim.tiff rename to inputs/Planforms/Temp/FDR020grim.tiff diff --git a/Planforms/Temp/FDR020ronaldplus.tiff b/inputs/Planforms/Temp/FDR020ronaldplus.tiff similarity index 100% rename from Planforms/Temp/FDR020ronaldplus.tiff rename to inputs/Planforms/Temp/FDR020ronaldplus.tiff diff --git a/inputs/Planforms/Temp/Thumbs.db b/inputs/Planforms/Temp/Thumbs.db new file mode 100755 index 0000000..ca60b48 Binary files /dev/null and b/inputs/Planforms/Temp/Thumbs.db differ diff --git a/inputs/Planforms/Thumbs.db b/inputs/Planforms/Thumbs.db new file mode 100755 index 0000000..0e11a0c Binary files /dev/null and b/inputs/Planforms/Thumbs.db differ diff --git a/Planforms/old daters/FDR001.dat b/inputs/Planforms/old daters/FDR001.dat similarity index 100% rename from Planforms/old daters/FDR001.dat rename to inputs/Planforms/old daters/FDR001.dat diff --git a/Planforms/old daters/FDR002.dat b/inputs/Planforms/old daters/FDR002.dat similarity index 100% rename from Planforms/old daters/FDR002.dat rename to inputs/Planforms/old daters/FDR002.dat diff --git a/Planforms/old daters/FDR003.dat b/inputs/Planforms/old daters/FDR003.dat similarity index 100% rename from Planforms/old daters/FDR003.dat rename to inputs/Planforms/old daters/FDR003.dat diff --git a/Planforms/old daters/FDR004.dat b/inputs/Planforms/old daters/FDR004.dat similarity index 100% rename from Planforms/old daters/FDR004.dat rename to inputs/Planforms/old daters/FDR004.dat diff --git a/Planforms/old daters/FDR005.dat b/inputs/Planforms/old daters/FDR005.dat similarity index 100% rename from Planforms/old daters/FDR005.dat rename to inputs/Planforms/old daters/FDR005.dat diff --git a/Planforms/old daters/FDR006.dat b/inputs/Planforms/old daters/FDR006.dat similarity index 100% rename from Planforms/old daters/FDR006.dat rename to inputs/Planforms/old daters/FDR006.dat diff --git a/Planforms/old daters/FDR007.dat b/inputs/Planforms/old daters/FDR007.dat similarity index 100% rename from Planforms/old daters/FDR007.dat rename to inputs/Planforms/old daters/FDR007.dat diff --git a/Planforms/old daters/FDR008.dat b/inputs/Planforms/old daters/FDR008.dat similarity index 100% rename from Planforms/old daters/FDR008.dat rename to inputs/Planforms/old daters/FDR008.dat diff --git a/Planforms/old daters/FDR009.dat b/inputs/Planforms/old daters/FDR009.dat similarity index 100% rename from Planforms/old daters/FDR009.dat rename to inputs/Planforms/old daters/FDR009.dat diff --git a/Planforms/old daters/FDR010.dat b/inputs/Planforms/old daters/FDR010.dat similarity index 100% rename from Planforms/old daters/FDR010.dat rename to inputs/Planforms/old daters/FDR010.dat diff --git a/Planforms/old daters/FDR011.dat b/inputs/Planforms/old daters/FDR011.dat similarity index 100% rename from Planforms/old daters/FDR011.dat rename to inputs/Planforms/old daters/FDR011.dat diff --git a/Planforms/old daters/FDR012.dat b/inputs/Planforms/old daters/FDR012.dat similarity index 100% rename from Planforms/old daters/FDR012.dat rename to inputs/Planforms/old daters/FDR012.dat diff --git a/Planforms/old daters/FDR012helpme.dat b/inputs/Planforms/old daters/FDR012helpme.dat similarity index 100% rename from Planforms/old daters/FDR012helpme.dat rename to inputs/Planforms/old daters/FDR012helpme.dat diff --git a/Planforms/old daters/FDR013.dat b/inputs/Planforms/old daters/FDR013.dat similarity index 100% rename from Planforms/old daters/FDR013.dat rename to inputs/Planforms/old daters/FDR013.dat diff --git a/Planforms/old daters/FDR014.dat b/inputs/Planforms/old daters/FDR014.dat similarity index 100% rename from Planforms/old daters/FDR014.dat rename to inputs/Planforms/old daters/FDR014.dat diff --git a/Planforms/old daters/FDR014b.dat b/inputs/Planforms/old daters/FDR014b.dat similarity index 100% rename from Planforms/old daters/FDR014b.dat rename to inputs/Planforms/old daters/FDR014b.dat diff --git a/Planforms/old daters/FDR014c.dat b/inputs/Planforms/old daters/FDR014c.dat similarity index 100% rename from Planforms/old daters/FDR014c.dat rename to inputs/Planforms/old daters/FDR014c.dat diff --git a/Planforms/old daters/FDR015.dat b/inputs/Planforms/old daters/FDR015.dat similarity index 100% rename from Planforms/old daters/FDR015.dat rename to inputs/Planforms/old daters/FDR015.dat diff --git a/Planforms/old daters/FDR016.dat b/inputs/Planforms/old daters/FDR016.dat similarity index 100% rename from Planforms/old daters/FDR016.dat rename to inputs/Planforms/old daters/FDR016.dat diff --git a/Planforms/old daters/FDR017.dat b/inputs/Planforms/old daters/FDR017.dat similarity index 100% rename from Planforms/old daters/FDR017.dat rename to inputs/Planforms/old daters/FDR017.dat diff --git a/Planforms/old daters/FDR018.dat b/inputs/Planforms/old daters/FDR018.dat similarity index 100% rename from Planforms/old daters/FDR018.dat rename to inputs/Planforms/old daters/FDR018.dat diff --git a/Planforms/old daters/FDR019.dat b/inputs/Planforms/old daters/FDR019.dat similarity index 100% rename from Planforms/old daters/FDR019.dat rename to inputs/Planforms/old daters/FDR019.dat diff --git a/Planforms/old daters/FDR020.dat b/inputs/Planforms/old daters/FDR020.dat similarity index 100% rename from Planforms/old daters/FDR020.dat rename to inputs/Planforms/old daters/FDR020.dat diff --git a/Planforms/old daters/PDR001.dat b/inputs/Planforms/old daters/PDR001.dat similarity index 100% rename from Planforms/old daters/PDR001.dat rename to inputs/Planforms/old daters/PDR001.dat diff --git a/Planforms/old daters/PDR003.dat b/inputs/Planforms/old daters/PDR003.dat similarity index 100% rename from Planforms/old daters/PDR003.dat rename to inputs/Planforms/old daters/PDR003.dat diff --git a/Planforms/old daters/olddater.dat b/inputs/Planforms/old daters/olddater.dat similarity index 100% rename from Planforms/old daters/olddater.dat rename to inputs/Planforms/old daters/olddater.dat diff --git a/Planforms/olddater.plan b/inputs/Planforms/olddater.plan similarity index 100% rename from Planforms/olddater.plan rename to inputs/Planforms/olddater.plan diff --git a/Planforms/pranform.bmp b/inputs/Planforms/pranform.bmp similarity index 100% rename from Planforms/pranform.bmp rename to inputs/Planforms/pranform.bmp diff --git a/Planforms/pranformhalf.bmp b/inputs/Planforms/pranformhalf.bmp similarity index 100% rename from Planforms/pranformhalf.bmp rename to inputs/Planforms/pranformhalf.bmp diff --git a/Excel Files/FDR001.xlsx b/outputs/Excel Files/FDR001.xlsx similarity index 100% rename from Excel Files/FDR001.xlsx rename to outputs/Excel Files/FDR001.xlsx diff --git a/Excel Files/FDR002.xlsx b/outputs/Excel Files/FDR002.xlsx similarity index 100% rename from Excel Files/FDR002.xlsx rename to outputs/Excel Files/FDR002.xlsx diff --git a/Excel Files/FDR003.xlsx b/outputs/Excel Files/FDR003.xlsx similarity index 100% rename from Excel Files/FDR003.xlsx rename to outputs/Excel Files/FDR003.xlsx diff --git a/Excel Files/FDR004.xlsx b/outputs/Excel Files/FDR004.xlsx similarity index 100% rename from Excel Files/FDR004.xlsx rename to outputs/Excel Files/FDR004.xlsx diff --git a/Excel Files/FDR005.xlsx b/outputs/Excel Files/FDR005.xlsx similarity index 100% rename from Excel Files/FDR005.xlsx rename to outputs/Excel Files/FDR005.xlsx diff --git a/Excel Files/FDR006.xlsx b/outputs/Excel Files/FDR006.xlsx similarity index 100% rename from Excel Files/FDR006.xlsx rename to outputs/Excel Files/FDR006.xlsx diff --git a/Excel Files/FDR007.xlsx b/outputs/Excel Files/FDR007.xlsx similarity index 100% rename from Excel Files/FDR007.xlsx rename to outputs/Excel Files/FDR007.xlsx diff --git a/Excel Files/FDR008.xlsx b/outputs/Excel Files/FDR008.xlsx similarity index 100% rename from Excel Files/FDR008.xlsx rename to outputs/Excel Files/FDR008.xlsx diff --git a/Excel Files/FDR009.xlsx b/outputs/Excel Files/FDR009.xlsx similarity index 100% rename from Excel Files/FDR009.xlsx rename to outputs/Excel Files/FDR009.xlsx diff --git a/Excel Files/FDR010.xlsx b/outputs/Excel Files/FDR010.xlsx similarity index 100% rename from Excel Files/FDR010.xlsx rename to outputs/Excel Files/FDR010.xlsx diff --git a/Excel Files/FDR012.txt b/outputs/Excel Files/FDR012.txt similarity index 100% rename from Excel Files/FDR012.txt rename to outputs/Excel Files/FDR012.txt diff --git a/Excel Files/FDR012.xlsx b/outputs/Excel Files/FDR012.xlsx similarity index 100% rename from Excel Files/FDR012.xlsx rename to outputs/Excel Files/FDR012.xlsx diff --git a/Excel Files/FDR013.txt b/outputs/Excel Files/FDR013.txt similarity index 100% rename from Excel Files/FDR013.txt rename to outputs/Excel Files/FDR013.txt diff --git a/Excel Files/FDR013b.txt b/outputs/Excel Files/FDR013b.txt similarity index 100% rename from Excel Files/FDR013b.txt rename to outputs/Excel Files/FDR013b.txt diff --git a/Excel Files/FDR013b.xlsx b/outputs/Excel Files/FDR013b.xlsx similarity index 100% rename from Excel Files/FDR013b.xlsx rename to outputs/Excel Files/FDR013b.xlsx diff --git a/Matlab code/Excel Files/FDR020.xlsx b/outputs/Excel Files/FDR020.xlsx similarity index 100% rename from Matlab code/Excel Files/FDR020.xlsx rename to outputs/Excel Files/FDR020.xlsx diff --git a/Excel Files/FDR020points.xlsx b/outputs/Excel Files/FDR020points.xlsx similarity index 100% rename from Excel Files/FDR020points.xlsx rename to outputs/Excel Files/FDR020points.xlsx diff --git a/Excel Files/PDR001.xlsx b/outputs/Excel Files/PDR001.xlsx similarity index 100% rename from Excel Files/PDR001.xlsx rename to outputs/Excel Files/PDR001.xlsx diff --git a/outputs/Excel Files/Thumbs.db b/outputs/Excel Files/Thumbs.db new file mode 100755 index 0000000..9626dd1 Binary files /dev/null and b/outputs/Excel Files/Thumbs.db differ diff --git a/Excel Files/lift dist.xlsx b/outputs/Excel Files/lift dist.xlsx similarity index 100% rename from Excel Files/lift dist.xlsx rename to outputs/Excel Files/lift dist.xlsx diff --git a/Excel Files/points.xlsx b/outputs/Excel Files/points.xlsx similarity index 100% rename from Excel Files/points.xlsx rename to outputs/Excel Files/points.xlsx diff --git a/Excel Files/points14c.xlsx b/outputs/Excel Files/points14c.xlsx similarity index 100% rename from Excel Files/points14c.xlsx rename to outputs/Excel Files/points14c.xlsx diff --git a/Excel Files/silent aircraft airfoil.xlsx b/outputs/Excel Files/silent aircraft airfoil.xlsx similarity index 100% rename from Excel Files/silent aircraft airfoil.xlsx rename to outputs/Excel Files/silent aircraft airfoil.xlsx diff --git a/Excel Files/tradeapalooza.xlsx b/outputs/Excel Files/tradeapalooza.xlsx similarity index 100% rename from Excel Files/tradeapalooza.xlsx rename to outputs/Excel Files/tradeapalooza.xlsx diff --git a/Excel Files/trader joe.xlsx b/outputs/Excel Files/trader joe.xlsx similarity index 100% rename from Excel Files/trader joe.xlsx rename to outputs/Excel Files/trader joe.xlsx diff --git a/Excel Files/xflrdater.xlsx b/outputs/Excel Files/xflrdater.xlsx similarity index 100% rename from Excel Files/xflrdater.xlsx rename to outputs/Excel Files/xflrdater.xlsx diff --git a/iso height contour.jpg b/outputs/iso height contour.jpg similarity index 100% rename from iso height contour.jpg rename to outputs/iso height contour.jpg diff --git a/lamier boundary layer thickness.jpg b/outputs/lamier boundary layer thickness.jpg similarity index 100% rename from lamier boundary layer thickness.jpg rename to outputs/lamier boundary layer thickness.jpg diff --git a/lamier height contour.jpg b/outputs/lamier height contour.jpg similarity index 100% rename from lamier height contour.jpg rename to outputs/lamier height contour.jpg diff --git a/lamier.jpg b/outputs/lamier.jpg similarity index 100% rename from lamier.jpg rename to outputs/lamier.jpg diff --git a/Ronaldplus Outputs/FDR001.txt b/ronald-plus/Ronaldplus Outputs/FDR001.txt similarity index 100% rename from Ronaldplus Outputs/FDR001.txt rename to ronald-plus/Ronaldplus Outputs/FDR001.txt diff --git a/Ronaldplus Outputs/FDR002.txt b/ronald-plus/Ronaldplus Outputs/FDR002.txt similarity index 100% rename from Ronaldplus Outputs/FDR002.txt rename to ronald-plus/Ronaldplus Outputs/FDR002.txt diff --git a/Ronaldplus Outputs/FDR003.txt b/ronald-plus/Ronaldplus Outputs/FDR003.txt similarity index 100% rename from Ronaldplus Outputs/FDR003.txt rename to ronald-plus/Ronaldplus Outputs/FDR003.txt diff --git a/Ronaldplus Outputs/FDR004.txt b/ronald-plus/Ronaldplus Outputs/FDR004.txt similarity index 100% rename from Ronaldplus Outputs/FDR004.txt rename to ronald-plus/Ronaldplus Outputs/FDR004.txt diff --git a/Ronaldplus Outputs/FDR005.txt b/ronald-plus/Ronaldplus Outputs/FDR005.txt similarity index 100% rename from Ronaldplus Outputs/FDR005.txt rename to ronald-plus/Ronaldplus Outputs/FDR005.txt diff --git a/Ronaldplus Outputs/FDR006.txt b/ronald-plus/Ronaldplus Outputs/FDR006.txt similarity index 100% rename from Ronaldplus Outputs/FDR006.txt rename to ronald-plus/Ronaldplus Outputs/FDR006.txt diff --git a/Ronaldplus Outputs/FDR007.txt b/ronald-plus/Ronaldplus Outputs/FDR007.txt similarity index 100% rename from Ronaldplus Outputs/FDR007.txt rename to ronald-plus/Ronaldplus Outputs/FDR007.txt diff --git a/Ronaldplus Outputs/FDR008.txt b/ronald-plus/Ronaldplus Outputs/FDR008.txt similarity index 100% rename from Ronaldplus Outputs/FDR008.txt rename to ronald-plus/Ronaldplus Outputs/FDR008.txt diff --git a/Ronaldplus Outputs/FDR009.txt b/ronald-plus/Ronaldplus Outputs/FDR009.txt similarity index 100% rename from Ronaldplus Outputs/FDR009.txt rename to ronald-plus/Ronaldplus Outputs/FDR009.txt diff --git a/Ronaldplus Outputs/FDR010.txt b/ronald-plus/Ronaldplus Outputs/FDR010.txt similarity index 100% rename from Ronaldplus Outputs/FDR010.txt rename to ronald-plus/Ronaldplus Outputs/FDR010.txt diff --git a/Ronaldplus Outputs/FDR020.txt b/ronald-plus/Ronaldplus Outputs/FDR020.txt similarity index 100% rename from Ronaldplus Outputs/FDR020.txt rename to ronald-plus/Ronaldplus Outputs/FDR020.txt diff --git a/Matlab code/Ronaldplus.m b/ronald-plus/Ronaldplus.m similarity index 100% rename from Matlab code/Ronaldplus.m rename to ronald-plus/Ronaldplus.m diff --git a/Matlab code/Ronald.m b/ronald/Ronald 2.m similarity index 100% rename from Matlab code/Ronald.m rename to ronald/Ronald 2.m diff --git a/Ronald Outputs/Cruise.tif b/ronald/Ronald Outputs/Cruise.tif similarity index 100% rename from Ronald Outputs/Cruise.tif rename to ronald/Ronald Outputs/Cruise.tif diff --git a/ronald/Ronald.m b/ronald/Ronald.m new file mode 100755 index 0000000..76d54a9 --- /dev/null +++ b/ronald/Ronald.m @@ -0,0 +1,520 @@ +%Ronald +%all alfas in DEGREES! +%by ascorrea, with help from Jacob Huffman +%"filler" variable just makes it easier to switch between Ronald and Grimace + +function Ronald(paramfile, pranformfile, filler) + +%DIRECTORY LOCATIONS--------------------------------------------------------------] +rootLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Matlab Code'; +airfoilLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Airfoils'; +pranformLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Planforms'; +pranformConstraintLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Planform Constraints'; +paramLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Parameter Files'; +outputsLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/superGrimace Outputs'; +%-----------------------------------------------------------------------] + +n=50; +cd(paramLOCATION); +[variablenames, variablevalues]=textread(paramfile, '%s %f'); +cd(pranformLOCATION) +[spans, chords, offsets, airfoil]=textread(pranformfile, '%f %f %f %s'); +cd(airfoilLOCATION) +[sref swet]=WhettedArea(spans, chords, offsets, airfoil, n); + + + +for k = 1:length(variablenames) +eval([variablenames{k} '= variablevalues(k);']); +end + +Dragredux_BLI=(1-Dragredux_BLI/100); + +wingspan=2*spans(end); +AR=wingspan^2/sref; +wakeplot=findwake(airfoil, chords, spans, offsets, n, alt_cruise, M_cruise, laminarflow_cruise, fuse_width); + +%TAKEOFF------------------------------------------------------------------] +% cd0_to=findcd0(c_f, M_to, sref, swet); +cd0_to=findcd0(spans, chords, offsets, airfoil, n, laminarflow_to, alt_to, M_to, sref, c_f, D_engine, cd_landinggear, sfront_landinggear, fuse_width); +% finddragpolar(cd0_to, cLalpha_to, cL0, efficiency_to, AR, cd_correction, 'Takeoff') +% cLreq_to=findcLrequired(alt_to, sref, M_to, weight_to); +cLreq_to=.48; +alphareq_to=findalpharequired(cLalpha, cL0, cLreq_to); +cD_to=findcD(AR, efficiency_to, cd0_to, cLreq_to, cd_correction); +eloverdee_to=cLreq_to/cD_to; +cM_to=cMalpha*alphareq_to+cM0; +q_to=finddynpress(alt_to, M_to); +cD_to=cD_to*Dragredux_BLI; +cd0_to=cd0_to*Dragredux_BLI; +D_to=cD_to*q_to*sref; + +%CRUISE------------------------------------------------------------------] +cd0_cruise=findcd0(spans, chords, offsets, airfoil, n, laminarflow_cruise, alt_cruise, M_cruise, sref, c_f, D_engine, 0, 0, fuse_width); +% finddragpolar(cd0_cruise, cLalpha, cL0, efficiency_cruise, AR, cd_correction, 'Cruise') +cLreq_cruise=findcLrequired(alt_cruise, sref, M_cruise, weight_cruise); +alphareq_cruise=findalpharequired(cLalpha, cL0, cLreq_cruise); +cD_cruise=findcD(AR, efficiency_cruise, cd0_cruise, cLreq_cruise, cd_correction); +cM_cruise=cMalpha*alphareq_cruise+cM0; +q_cruise=finddynpress(alt_cruise, M_cruise); +cD_cruise=cD_cruise*Dragredux_BLI; +cd0_cruise=cd0_cruise*Dragredux_BLI; +D_cruise=cD_cruise*q_cruise*sref; +eloverdee_cruise=cLreq_cruise/cD_cruise; + +%LOITER------------------------------------------------------------------] +cd0_loiter=findcd0(spans, chords, offsets, airfoil, n, laminarflow_loiter, alt_loiter, M_loiter, sref, c_f, D_engine, 0, 0, fuse_width); +% finddragpolar(cd0_loiter, cLalpha_loiter, cL0, efficiency_loiter, AR, cd_correction, 'Loiter') +cLreq_loiter=findcLrequired(alt_loiter, sref, M_loiter, weight_loiter); +alphareq_loiter=findalpharequired(cLalpha, cL0, cLreq_loiter); +cD_loiter=findcD(AR, efficiency_loiter, cd0_loiter, cLreq_loiter, cd_correction); +cM_loiter=cMalpha*alphareq_loiter+cM0; +q_loiter=finddynpress(alt_loiter, M_loiter); +cD_loiter=cD_loiter*Dragredux_BLI; +cd0_loiter=cd0_loiter*Dragredux_BLI; +D_loiter=cD_loiter*q_loiter*sref; +eloverdee_loiter=cLreq_loiter/cD_loiter; + +%LANDING------------------------------------------------------------------] +cd0_landing=findcd0(spans, chords, offsets, airfoil, n, laminarflow_landing, alt_landing, M_landing, sref, c_f, D_engine, cd_landinggear, sfront_landinggear, fuse_width); +% finddragpolar(cd0_landing, cLalpha_landing, cL0, efficiency_landing, AR, cd_correction, 'Landing') +% cLreq_landing=findcLrequired(alt_landing, sref, M_landing, weight_landing); +cLreq_landing=.401; +alphareq_landing=findalpharequired(cLalpha, cL0, cLreq_landing); +cD_landing=findcD(AR, efficiency_landing, cd0_landing, cLreq_landing, cd_correction); +cM_landing=cMalpha*alphareq_landing+cM0; +q_landing=finddynpress(alt_landing, M_landing); +cD_landing=cD_landing*Dragredux_BLI; +cd0_landing=cd0_landing*Dragredux_BLI; +D_landing=cD_landing*q_landing*sref; +eloverdee_landing=cLreq_landing/cD_landing; + +cd(pranformLOCATION) +filenameplan=regexprep(pranformfile, '.plan', 'ronaldplus.tiff'); +filenameoutput=regexprep(pranformfile, '.plan', 'ronaldplus.txt'); +plottitle=regexprep(pranformfile, '.plan', ''); + +fid = fopen(filenameoutput, 'w'); +fprintf(plottitle); +fprintf('---------------------------------------------------\n'); +fprintf(fid, plottitle); +fprintf(fid,'---------------------------------------------------\n'); + +fprintf('Wingspan: %f, AR: %f, Planform Area: %f, Wetted Area: %f \n', wingspan, AR, sref, swet); +fprintf(fid, 'Wingspan: %f, AR: %f, Planform Area: %f, Wetted Area: %f \n', wingspan, AR, sref, swet); + +fprintf('\n----------Takeoff--------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_to, cd0_to, cLreq_to, cD_to, D_to, cM_to, eloverdee_to); +fprintf(fid, '\n----------Takeoff--------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_to, cd0_to, cLreq_to, cD_to, D_to, cM_to, eloverdee_to); + +fprintf('\n----------Cruise---------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_cruise, cd0_cruise, cLreq_cruise, cD_cruise, D_cruise, cM_cruise, eloverdee_cruise); +fprintf(fid, '\n----------Cruise---------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_cruise, cd0_cruise, cLreq_cruise, cD_cruise, D_cruise, cM_cruise, eloverdee_cruise); + +fprintf('\n----------Loiter---------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_loiter, cd0_loiter, cLreq_loiter, cD_loiter, D_loiter, cM_loiter, eloverdee_loiter); +fprintf(fid, '\n----------Loiter---------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_loiter, cd0_loiter, cLreq_loiter, cD_loiter, D_loiter, cM_loiter, eloverdee_loiter); + +fprintf('\n----------Landing--------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_landing, cd0_landing, cLreq_landing, cD_landing, D_landing, cM_landing, eloverdee_landing); +fprintf(fid, '\n----------Landing--------------------------------\n alfa: %f, Cd0: %f, CL: %f, CD: %f, D: %f, CM: %f, L/D: %f \n', alphareq_landing, cd0_landing, cLreq_landing, cD_landing, D_landing, cM_landing, eloverdee_landing); + + +fclose(fid); +cd(rootLOCATION) +end + +% function cd0=findcd0(c_f, M, sref, swet) +% if M>.7 +% c_f=c_f*(1-.09*M^2); +% end +% cd0=c_f*(swet/sref); +% end +function cd0=findcd0(spans, chords, offsets, airfoil, n, laminarflow, alt, v_mach, sref, c_f, D_engine, cd_lg, Sfront_lg, width) +wingSpan = 1; +% n = 50; +width=width/2; + +[q v_fps dynvisc]=findconstants(alt, v_mach); +drag=0; +drag_fuse=0; +drag_wing=0; + +Chords = findChords(n, chords, spans); +for i = 1:(size(chords)-1) + for j = 1:n + dist = wingSpan*(spans(i+1)-spans(i))./n; + chordloc=linspace(0, Chords(i,j)); + delta_x = Chords(i,j)/100; + + if spans(i)>width + for k = 1:100 + x(k)= k * Chords(i,j)/100; + Re_x(k)= v_fps * x(k)/dynvisc; + if (k <= 100*laminarflow ) + cf_x(k) = 0.664 /(sqrt(Re_x(k))); + else % Turbulent + cf_x(k) = 0.455 /(log(0.06 * Re_x(k))^2); + end + xcf_x(k)=x(k)*cf_x(k); + end + t = trapz(cf_x); + Cf = 2 * delta_x * t /Chords(i,j); + drag_section = q*Cf*findPerim(airfoil{i}, Chords(i,j), wingSpan).*dist; + drag_wing=drag_wing+drag_section; + else + for k = 1:100 + x(k)= k * Chords(i,j)/100; + Re_x(k)= v_fps * x(k)/dynvisc; + if (k <= 100*laminarflow -10) + cf_x(k) = 0.664 /(sqrt(Re_x(k))); + else % Turbulent + cf_x(k) = 0.455 /(log(0.06 * Re_x(k))^2); + end + xcf_x(k)=x(k)*cf_x(k); + end + t = trapz(cf_x); + Cf = 2 * delta_x * t /Chords(i,j); + drag_section = q*Cf*findPerim(airfoil{i}, Chords(i,j), wingSpan).*dist; + drag_fuse=drag_fuse+drag_section; + end + t = trapz(cf_x); + Cf = 2 * delta_x * t /Chords(i,j); + drag_section = q*Cf*findPerim(airfoil{i}, Chords(i,j), wingSpan).*dist; + drag=drag+drag_section; + + end +end + +if v_mach>.7 +c_f=c_f*(1-.09*v_mach)^2; +end +% cd0engine=c_f*(s_engine/sref); +D_lg=Sfront_lg*q*cd_lg; +D_wing=drag_wing*2; +D_fuse=drag_fuse*2; +drag_tot=D_wing+D_engine+D_lg+D_fuse; +cd0=drag_tot/(q*sref); +cD_lg=D_lg/(q*sref); +cD_engine=D_engine/(q*sref); +cD_wing=D_wing/(q*sref); +cD_fuse=D_fuse/(q*sref); +end +function finddragpolar(cd0, cl_alfa, cL0, e, ar, cd_correction, filename) +alphadeg=[-12:10]; +% alpha=(pi/180)*(alphadeg); +alpha=alphadeg; +cL_alfa=cl_alfa*(ar/(ar+(2*(ar+4)/(ar+2)))); + + for i=1:length(alpha) + C_L(i)=cL_alfa*(alpha(i))+cL0; + cd_i(i)=C_L(i)^2/(pi*ar*e); + C_d(i)=cd0+cd_i(i)+cd_correction; + end + + graphname='Drag Polar'; + +hold on +grid on +axisX0=linspace(0,max(cd)); +axisY0=zeros(1,length(axisX0)); +plot(axisX0, axisY0,'k--'); +plot(C_d, C_L, 'k', 'LineWidth', 2); +plot(C_d, C_L, 'k.'); +title(graphname); +xlabel('C_d', 'FontSize', 16); +ylabel('C_L', 'FontSize', 16); +axis([0, .02, -.3, .4]); +set(gca, 'FontSize',16) + +% for i=1:length(alphadeg) +% alphalabel=num2str(alphadeg(i)); +% label=[' \alpha =' alphalabel]; +% text(C_d(i), C_L(i), label) +% end + +print ('-dtiff', filename) +grid off +close(1) +end +function q=finddynpress(alt, v_mach) +if alt < 36152 +temp=59-.00356*alt; +press=2116*((temp+459.7)/518.6)^5.256; + +elseif alt < 82345 + temp=-70; + press=473.1*exp(1.73-.000048*alt); + +else + print('Program Not Valid for given altitude') +end + +%slpcuft: clugs ber cubic foot +density_slpcuft=press/(1718*(temp+459.7)); +v_fps=v_mach*sqrt(1.4*1718*(temp+459.7)); +q=.5*density_slpcuft*v_fps^2; +end +function [q v_fps dynvisc]=findconstants(alt, v_mach) +if alt < 36152 +temp=59-.00356*alt; +press=2116*((temp+459.7)/518.6)^5.256; + +elseif alt < 82345 + temp=-70; + press=473.1*exp(1.73-.000048*alt); + +else + print('Program Not Valid for given altitude') +end + +%slpcuft: clugs ber cubic foot +density_slpcuft=press/(1718*(temp+459.7)); +v_fps=v_mach*sqrt(1.4*1718*(temp+459.7)); +q=finddynpress(alt, v_mach); + +S = 110.4; +beta = 1.458e-6; +temp_k=[(temp-32) / (1.8)] + 273 ; +viscosity_pascalseconds = (beta*temp_k^(1.5))/(temp_k+S); +%kgpmcu:kilograms per meter cubed +%msqpse:meters squared per second +%sqftpsec:square feet per second +density_kgpmcu=density_slpcuft*515.4; +dynamic_viscosity_msqpsec=viscosity_pascalseconds/density_kgpmcu; +dynamic_viscosity_sqftpsec=dynamic_viscosity_msqpsec*10.76; +dynvisc=dynamic_viscosity_sqftpsec; +density=density_slpcuft; +end +function cLreq=findcLrequired(alt, s, v_mach, lift) +q=finddynpress(alt, v_mach); + +cLreq=lift/(q*s); + +end +function alpha=findalpharequired(cLalpha, cL0, cLrequired) +alpha=(cLrequired-cL0)/cLalpha; +end +function cD=findcD(ar, e, cd0, C_L, cd_correction) + +% e=4.61*(1-.045*ar^.68)*cosd(sweep_LE)^.15-3.1; + cd_i=C_L^2/(pi*ar*e); + cd_i=C_L^2/(pi*ar*e); + cD=cd0+cd_i+cd_correction; +end +function [pranformArea WetArea]=WhettedArea(spans, chords, offsets, airfoil, n) +% fileName = 'AirData.mat'; +wingSpan = 1; +% n = 50; + +engineArea=0; +Area = 0; +pranformArea = 0; + +Chords = findChords(n, chords, spans); +for i = 1:(size(chords)-1) + for j = 1:n + Chords(i,j); + dist = wingSpan*(spans(i+1)-spans(i))./n; + Area = Area+findPerim( airfoil{i}, Chords(i,j), wingSpan).*dist; + end +end + +for i = 1:(size(chords)-1) + for j = 1:n + dist = wingSpan*(spans(i+1)-spans(i))./n; + pranformArea = pranformArea+Chords(i,j).*dist; +% fprintf('Chord: %f pranformArea: %f \n', Chords(i,j), pranformArea) + end +end + +Area = Area *2+engineArea; + +WetArea = Area; +pranformArea = pranformArea*2; +end +function Chords = findChords( n, Chord, X ) +for( i = 1:(length(Chord)-1) ) + Xtemp = linspace(X(i),X(i+1),n); + Chords(i,:) = (Chord(i+1)-Chord(i))./(X(i+1)-X(i)).*(Xtemp-X(i))+Chord(i); + +end +end +function peri = findPerim(airFile, chord, span) +peri = 0; +Airfoil = load(airFile); +Airfoil = Airfoil*chord*span; +for i = 1:(size(Airfoil,1)-1) + peri = peri + sqrt((Airfoil(i+1,1)-Airfoil(i,1))^2+(Airfoil(i+1,2)-Airfoil(i,2))^2); +end +end +function [plotLE plotTE]=plotpranform(spans, chords, offsets, n) +Chords = findChords(n, chords, spans); + +%plot planform +for i = 1:(size(chords)-1) + dist=0; + for j = 1:n + Chords(i,j); + dist = (spans(i+1)-spans(i))./n; + + if i==1 + xplotLE(i,j+1)=spans(1)+dist*(j); + else + xplotLE(i,1)=xplotLE(i-1,end); + xplotLE(i,j+1)=xplotLE(i-1,end)+dist*(j); + end + + fitX(1)=spans(i); + fitX(2)=spans(i+1); + fitY(1)=offsets(i); + fitY(2)=offsets(i+1); + a = polyfit(fitX, fitY,1); + yplotLE(i,j) = a(1)*xplotLE(i,j)+a(2); + + + + end +end + + +plotLE=zeros(1,2); +plotTE=zeros(1,2); + +for i=1:(size(chords)-1) + for j=1:n + plotLE=[plotLE; xplotLE(i,j) -yplotLE(i,j)]; + plotTE=[plotTE; xplotLE(i,j) -(yplotLE(i,j)+Chords(i,j))]; + end +end +plotTE(1,:)=[]; +plotLE(1,:)=[]; +end +function [wakeplot]=findwake(airfoil, chords, spans, offsets, n, alt, v_mach, laminarflow, width) +[q v_fps dynvisc]=findconstants(alt, v_mach); +Chords = findChords(n, chords, spans); +wakeplot=zeros(100,1); +wakeplotX=zeros(100,1); +wakeplotY=zeros(100,1); +width=width/2; +% for i = 1:(size(chords)-1) +for i=1:1:(size(chords)-1) + for j = 1:n +% wakecoord(j,:)=linspace(0, Chords(i,j), n); +dist = (spans(i+1)-spans(i))./n; +y(j)=spans(i)+j*dist; + + if i==1 + xplotLE(i,j+1)=spans(1)+dist*(j); + else + xplotLE(i,1)=xplotLE(i-1,end); + xplotLE(i,j+1)=xplotLE(i-1,end)+dist*(j); + end + + fitX(1)=spans(i); + fitX(2)=spans(i+1); + fitY(1)=offsets(i); + fitY(2)=offsets(i+1); + a = polyfit(fitX, fitY,1); + yplotLE(i,j) = a(1)*xplotLE(i,j)+a(2); + + if spans(i)>width + lam=laminarflow; + else + lam=laminarflow-.15; + end + x=linspace(0, Chords(i,j)); + for k = 1:length(x) + if (k <= 100*lam) + delta_x=( 5.2 * x(k) )*(v_fps*x(k)/dynvisc)^-0.5; + wake(k,j)= delta_x; + else %if turbulent + x_tr=x(100*lam); + Re_xtr = v_fps * x_tr / dynvisc; + delta_xtr=(5.2*x_tr)*(v_fps*x(k)/dynvisc)^-(0.5); + delta_l = ((delta_xtr*((v_fps)^0.2))/(0.37*((dynvisc)^0.2)))^(1/0.8); + lt = x(k) - x_tr + delta_l; + Re_lt = v_fps * lt / dynvisc; + delta = 0.37 * lt /(Re_lt)^0.2; + wake(k,j) = delta; + end + +wakeX(k,j)=x(k)+yplotLE(i,j); +wakeY(k,j)=y(j); + end + + for k = 1:100 + + wakeX(k,j)=x(k)+yplotLE(i,j); + wakeY(k,j)=y(j); + end + + + +wakeplot=[wakeplot, wake]; +wakeplotX=[wakeplotX, wakeX]; +wakeplotY=[wakeplotY, wakeY]; + end + +end +wakeplot(:,1)=[ ]; +wakeplotX(:,1)=[ ]; +wakeplotY(:,1)=[ ]; +wakeplot(1,:)=[0]; +flipud(wakeplot); +end +function thickness=findthickness(airfoil, Chord, xLoc) +Airfoil = load(airfoil); +Airfoil = Airfoil*Chord; +% blah....goodnight + + AirfoilX=Airfoil(:,1); + [min_diff, k]=min(abs(AirfoilX)); + + for j=1:k + AirfoilYupper(j)=Airfoil(j,2); + AirfoilXupper(j)=Airfoil(j,1); + end + + for j=1:length(Airfoil)-k + AirfoilYlower(j)=Airfoil(length(Airfoil)-(j-1), 2); + AirfoilXlower(j)=Airfoil(length(Airfoil)-(j-1), 1); + end + + AirfoilYupper=fliplr(AirfoilYupper); + AirfoilXupper=fliplr(AirfoilXupper); + AirfoilYlower=fliplr(AirfoilYlower); + AirfoilXlower=fliplr(AirfoilXlower); + AirfoilYlower=[0 AirfoilYlower]; + AirfoilXlower=[0 AirfoilXlower]; + + [min_diff, k]=min(abs(AirfoilX)); + + [min_diff, kU]=min(abs(AirfoilXupper-xLoc)); + [min_diff, kL]=min(abs(AirfoilXlower-xLoc)); + + if xLoctmax-x1) + tsave=t; + t=tmax-x1; + flag=2; + +elseif (t0); +thetaTE=reversefit(P,t/2,theta(roots(1))); +rTE=ppval(P,thetaTE); +xTE=rTE*cos(thetaTE); +thetaLE=reversefit(P,t/2,theta(roots(2))); +rLE=ppval(P,thetaLE); +xLE=rLE*cos(thetaLE); +l=abs(xTE-xLE); +AR=l/t; + +if flag==1 + x3=2*x1; + y1=AR; + y2=1.1*AR; + a = (y1-y2)/(-2*x3*x1+x1^2); + b=(y1-a*x1^2-y2)/x1; + AR=a*tsave^2+b*tsave+y2; +elseif flag==2 + x3=tmax-x1*.001; + x2=tmax; + x1=tmax-2*x1; + a=-AR/((x2^2-x3^2)-2*x1*(x2-x3)); + b=-2*a*x1; + c=-a*x2^2-b*x2; + AR=a*tsave^2+b*tsave+c; +end; diff --git a/Matlab code/strut/CB3.dat b/strut/CB3.dat similarity index 100% rename from Matlab code/strut/CB3.dat rename to strut/CB3.dat diff --git a/Matlab code/strut/CB4.dat b/strut/CB4.dat similarity index 100% rename from Matlab code/strut/CB4.dat rename to strut/CB4.dat diff --git a/Matlab code/strut/CB40015.dat b/strut/CB40015.dat similarity index 100% rename from Matlab code/strut/CB40015.dat rename to strut/CB40015.dat diff --git a/Matlab code/strut/CB40018.dat b/strut/CB40018.dat similarity index 100% rename from Matlab code/strut/CB40018.dat rename to strut/CB40018.dat diff --git a/Matlab code/strut/CB600185b.dat b/strut/CB600185b.dat similarity index 100% rename from Matlab code/strut/CB600185b.dat rename to strut/CB600185b.dat diff --git a/Matlab code/strut/FFunc1.m b/strut/FFunc1.m similarity index 100% rename from Matlab code/strut/FFunc1.m rename to strut/FFunc1.m diff --git a/Matlab code/strut/Func1.m b/strut/Func1.m similarity index 100% rename from Matlab code/strut/Func1.m rename to strut/Func1.m diff --git a/Matlab code/strut/GB30015.dat b/strut/GB30015.dat similarity index 100% rename from Matlab code/strut/GB30015.dat rename to strut/GB30015.dat diff --git a/Matlab code/strut/Newton.m b/strut/Newton 2.m similarity index 100% rename from Matlab code/strut/Newton.m rename to strut/Newton 2.m diff --git a/strut/Newton.m b/strut/Newton.m new file mode 100755 index 0000000..ecc75fd --- /dev/null +++ b/strut/Newton.m @@ -0,0 +1,61 @@ +function x=newton(Fs,FPs,P0,y,P,TOL); + % NEWTON-RAPHSON ALGORITHM 2.3 + % + % To find a solution to f(x) = 0 given an + % initial approximation p0: + % + % y,P can be used for additional info if the function + % requires it. + % + % Initially written by Burden and Faires, revised by + % B.A. Broughton, 10/01/1999 + % + % INPUT: initial approximation p0; tolerance TOL; + % maximum number of iterations NO. + % + % OUTPUT: approximate solution p or a message of failure + + TRUE = 1; + FALSE = 0; + F = inline(Fs,'x','P','y'); + FP = inline(FPs,'x','P'); + NO=150; + OUP = 1; + F0 = F(P0,P,y); + % STEP 1 + I = 1; + OK = TRUE; +% STEP 2 + while I <= NO & OK == TRUE + % STEP 3 + % compute P(I) + FP0 = FP(P0,P); + D = F0/FP0; + % STEP 6 + P0 = P0 - D; + F0 = F(P0,P,y); + % STEP 4 + if abs(D) < TOL + % procedure completed successfully + % fprintf(OUP,'\nApproximate solution = %.10e\n',P0); + % fprintf(OUP,'with F(P) = %.10e\n',F0); + % fprintf(OUP,'Number of iterations = %d\n',I); + % fprintf(OUP,'Tolerance = %.10e\n',TOL); + OK = FALSE; + % STEP 5 + else + I = I+1; + end + end + if OK == TRUE +% STEP 7 +% procedure completed unsuccessfully + fprintf(OUP,'\nIteration number %d',NO); + fprintf(OUP,' gave approximation %.10e\n',P0); + fprintf(OUP,'with F(P) = %.10e not within tolerance %.10e\n',F0,TOL); + end + x = P0; + + + + \ No newline at end of file diff --git a/Matlab code/strut/default.dat b/strut/default.dat similarity index 100% rename from Matlab code/strut/default.dat rename to strut/default.dat diff --git a/Matlab code/strut/derppval.m b/strut/derppval 2.m similarity index 100% rename from Matlab code/strut/derppval.m rename to strut/derppval 2.m diff --git a/strut/derppval.m b/strut/derppval.m new file mode 100755 index 0000000..6be35ab --- /dev/null +++ b/strut/derppval.m @@ -0,0 +1,48 @@ +function v=derppval(pp,xx) +%PPVAL Evaluate piecewise polynomial. +% V = PPVAL(PP,XX) returns the value at the points XX of the +% piecewise polynomial contained in PP, as constructed by SPLINE +% (or MKPP). +% +% Revised by B.A. Broughton on 10/01/1999 to calculate the derivative +% for a pre-fitted cubic spline in the points xx +% +% See also SPLINE. + +% Carl de Boor 7-2-86 +% Revised 10-14-97 CB to speed up locating points in mesh (as in +% PPUAL) and to handle vector-valued functions. +% Copyright (c) 1984-98 by The MathWorks, Inc. +% $Revision: 5.8 $ $Date: 1997/11/21 23:41:00 $ + +[mx,nx] = size(xx); lx = mx*nx; xs = reshape(xx,1,lx); +% if necessary, sort xx +tosort=0; +if any(diff(xs)<0) + tosort=1;[xs,ix]=sort(xs); +end + +% take apart pp +[x,c,l,k,d]=unmkpp(pp); + +% for each data point, compute its breakpoint interval +[ignored,index] = sort([x(1:l) xs]); +index = max([find(index>l)-(1:lx);ones(1,lx)]); + +% now go to local coordinates ... +xs = xs-x(index); + +if d>1 % ... replicate xs and index in case pp is vector-valued ... + xs = reshape(xs(ones(d,1),:),1,d*lx); + index = d*index; temp = [-d:-1].'; + index = reshape(1+index(ones(d,1),:)+temp(:,ones(1,lx)), d*lx, 1 ); +end + +% ... and apply nested multiplication to get derivative: + v = 3*c(index,1).'; + for i=2:k-1 + v = xs.*v + (4-i)*c(index,i).'; + end +v = reshape(v,d,lx); +if tosort>0, v(:,ix) = v; end +v = reshape(v,d*mx,nx); diff --git a/Matlab code/strut/e169.dat b/strut/e169.dat similarity index 100% rename from Matlab code/strut/e169.dat rename to strut/e169.dat diff --git a/Matlab code/strut/n0011sc.dat b/strut/n0011sc.dat similarity index 100% rename from Matlab code/strut/n0011sc.dat rename to strut/n0011sc.dat diff --git a/Matlab code/strut/profoil.xy b/strut/profoil.xy similarity index 100% rename from Matlab code/strut/profoil.xy rename to strut/profoil.xy diff --git a/Matlab code/strut/readme.txt b/strut/readme 2.txt similarity index 100% rename from Matlab code/strut/readme.txt rename to strut/readme 2.txt diff --git a/strut/readme.txt b/strut/readme.txt new file mode 100755 index 0000000..e6e88aa --- /dev/null +++ b/strut/readme.txt @@ -0,0 +1,69 @@ + +********************************************************************** +STRUT +********************************************************************** + +Using the strut fitting program +------------------------------- + +Make sure that all the .m files are in the same directory. Your +airfoil coordinate files do not have to be in the same directory. + +Make sure that the first line in the airfoil coordinate file is not +the name of the airfoil, i.e. only numbers are allowed in the file. +Also make sure the coordinates are sorted TE-LE-TE and that the +leading edge point (usually 0,0) is not repeated. This is important, +since it is easy to forget to remove the extra point if you sorted the +coordinates with a spreadsheet such as MS Excel. + +Start Matlab. +Change the directory to the directory with the .m files. Use the "cd" +command in Matlab to do this. +Run the GUI by typing "strut". + +Now you can load an airfoil by clicking on the "load" button. Simply +choose the file. After loading the filename of the current airfoil, +the name of the filename will appear in the box below the "load" +button. + +The size of the strut can be changed by changing the values for +"length" and "width". "Length" is the distance in the chordwise +direction. Units do not matter. You can also change the default +values by editing the "default.dat" text file. + +Click on "calculate", wait a couple of seconds and the information for +the fitted airfoil should appear in the three remaining boxes. The +values are: + +scale - How much you must enlarge the airfoil to fit over the box. +xLE% - Chord percentage where the leading edge of the strut is located. +xLE - Actual distance from the LE of the airfoil to the LE of the + strut. + +Notes: +------ + +The program will not converge for low aspect ratio struts in very thin +airfoils. It should however work for all practical cases for the AE +416 homework assignment. + + + +********************************************************************** +Development Notes +********************************************************************** + +1) Matlab program for sizing airfoils to fit over a rectangular + strut written Sept 1999 by + + B.A. Broughton + Graduate Student + Applied Aerodynamics Group + Dept. of Aerospace Engineering + University of Illinois at Urbana-Champaign + + +2) Minor fixes/updates/changes by Selig 090925 + + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Matlab code/strut/reversefit.m b/strut/reversefit 2.m similarity index 100% rename from Matlab code/strut/reversefit.m rename to strut/reversefit 2.m diff --git a/strut/reversefit.m b/strut/reversefit.m new file mode 100755 index 0000000..f34144b --- /dev/null +++ b/strut/reversefit.m @@ -0,0 +1,7 @@ +function theta=reversefit(P,y,theta0); + +TOL=1e-8; +F='Func1(x,P,y)'; +FP='FFunc1(x,P)'; +theta=Newton(F,FP,theta0,y,P,TOL); + diff --git a/Matlab code/strut/strut.m b/strut/strut 2.m similarity index 100% rename from Matlab code/strut/strut.m rename to strut/strut 2.m diff --git a/strut/strut.m b/strut/strut.m new file mode 100755 index 0000000..c00bb9c --- /dev/null +++ b/strut/strut.m @@ -0,0 +1,194 @@ +function fig = strut() +% This is the machine-generated representation of a Handle Graphics object +% and its children. Note that handle values may change when these objects +% are re-created. This may cause problems with any callbacks written to +% depend on the value of the handle at the time the object was saved. +% This problem is solved by saving the output as a FIG-file. +% +% To reopen this object, just type the name of the M-file at the MATLAB +% prompt. The M-file and its associated MAT-file must be on your path. +% +% NOTE: certain newer features in MATLAB may not have been saved in this +% M-file due to limitations of this format, which has been superseded by +% FIG-files. Figures which have been annotated using the plot editor tools +% are incompatible with the M-file/MAT-file format, and should be saved as +% FIG-files. + +load strut + +h0 = figure('Color',[0.8 0.8 0.8], ... + 'Colormap',mat0, ... + 'FileName','strut.m', ... + 'PaperPosition',[18 180 576 432], ... + 'PaperUnits','points', ... + 'Position',[392 219 560 420], ... + 'Tag','Fig1', ... + 'ToolBar','none'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'Callback','strutcall load', ... + 'ListboxTop',0, ... + 'Position',[356.25 289.5 50.25 15.75], ... + 'String','Load Airfoil', ... + 'Tag','Pushbutton1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 248.25 40 11], ... + 'String','Strut Size:', ... + 'Style','text', ... + 'Tag','StaticText1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 228.75 30 11.25], ... + 'String','Width', ... + 'Style','text', ... + 'Tag','StaticText1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 208.625 30 11], ... + 'String','Length', ... + 'Style','text', ... + 'Tag','StaticText1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'ListboxTop',0, ... + 'Position',[377.25 226.5 39.75 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','width'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'ListboxTop',0, ... + 'Position',[377.25 206.25 39.75 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','length'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'Callback','strutcall calculate', ... + 'ListboxTop',0, ... + 'Position',[356.25 177 50.25 15.75], ... + 'String','Calculate', ... + 'Tag','Pushbutton1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'ListboxTop',0, ... + 'Position',[347.25 133.5 30 11.25], ... + 'String','Scale', ... + 'Style','text', ... + 'Tag','StaticText2'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[347.25 88.875 30 11.25], ... + 'String','Xle (%)', ... + 'Style','text', ... + 'Tag','StaticText2'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[347.25 44.25 30 11.25], ... + 'String','Xle', ... + 'Style','text', ... + 'Tag','StaticText2'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[354.75 114 50.25 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','scale'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[354.75 69.375 50.25 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','xlepers'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[354.75 24.75 50.25 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','xle'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 152.25 40 12], ... + 'String','Results:', ... + 'Style','text', ... + 'Tag','StaticText3'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[347.25 264.75 66 15.75], ... + 'String','None Selected', ... + 'Style','edit', ... + 'Tag','airfoilname'); +h1 = axes('Parent',h0, ... + 'Units','pixels', ... + 'CameraUpVector',[0 1 0], ... + 'CameraUpVectorMode','manual', ... + 'Color',[1 1 1], ... + 'ColorOrder',mat1, ... + 'Position',[34 27 418 386], ... + 'Tag','Axes1', ... + 'XColor',[0 0 0], ... + 'YColor',[0 0 0], ... + 'ZColor',[0 0 0]); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','center', ... + 'Position',[0.4988009592326139 -0.06233766233766236 9.160254037844386], ... + 'Tag','Axes1Text4', ... + 'VerticalAlignment','cap'); +set(get(h2,'Parent'),'XLabel',h2); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','center', ... + 'Position',[-0.06954436450839328 0.4961038961038962 9.160254037844386], ... + 'Rotation',90, ... + 'Tag','Axes1Text3', ... + 'VerticalAlignment','baseline'); +set(get(h2,'Parent'),'YLabel',h2); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','right', ... + 'Position',[-0.0815347721822542 1.018181818181818 9.160254037844386], ... + 'Tag','Axes1Text2', ... + 'Visible','off'); +set(get(h2,'Parent'),'ZLabel',h2); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','center', ... + 'Position',[0.4988009592326139 1.018181818181818 9.160254037844386], ... + 'Tag','Axes1Text1', ... + 'VerticalAlignment','bottom'); +set(get(h2,'Parent'),'Title',h2); +if nargout > 0, fig = h0; end diff --git a/Matlab code/strut/strut.mat b/strut/strut.mat similarity index 100% rename from Matlab code/strut/strut.mat rename to strut/strut.mat diff --git a/Matlab code/strut/strutWindow.png b/strut/strutWindow 2.png similarity index 100% rename from Matlab code/strut/strutWindow.png rename to strut/strutWindow 2.png diff --git a/strut/strutWindow.png b/strut/strutWindow.png new file mode 100755 index 0000000..acd85bf Binary files /dev/null and b/strut/strutWindow.png differ diff --git a/Matlab code/strut/strutcall.m b/strut/strutcall 2.m similarity index 100% rename from Matlab code/strut/strutcall.m rename to strut/strutcall 2.m diff --git a/strut/strutcall.m b/strut/strutcall.m new file mode 100755 index 0000000..6497900 --- /dev/null +++ b/strut/strutcall.m @@ -0,0 +1,110 @@ +function strutcall(action) + +global x y tmax +% Remove +global P + +switch(action) +case 'load' + + % Read Input Data + [fname,pname] = uigetfile('*.*','File containing airfoil co-ordinates'); + if fname == 0 + return; + end + + dot=find(fname=='.'); + + oldpath = pwd; + eval(['cd ' pname]); + data = load(fname); + eval(['cd ' oldpath]); + + x = data(:,1); + y = data(:,2); + + txtHndl=findobj(gcbf,'Tag','airfoilname'); + set(txtHndl,'String',fname(1:dot-1)); + + plot(x,y); axis([0 1 -.5 .5]); + + % Load default strut size + fid=fopen('default.dat','r'); + fgetl(fid); + lstrut=eval(fgetl(fid)); + fgetl(fid); + wstrut=eval(fgetl(fid)); + fclose(fid); + + txtHndl=findobj(gcbf,'Tag','length'); + set(txtHndl,'String',num2str(lstrut)); + + txtHndl=findobj(gcbf,'Tag','width'); + set(txtHndl,'String',num2str(wstrut)); + +case 'calculate' + + global x y + delt=1e-7; % Used for calculating dF/dt + TOL=1e-6; % Tolerance for N-R iteration + + N = length(x); + c = max(x)-min(x); + x1 = x-c/2; + r = sqrt(x1.^2+y.^2); + theta = acos(x1./r); + % Use a continues theta + theta((N+1)/2:N)=2*pi-theta((N+1)/2:N); + P = spline(theta,r); % Fit cubic spline in polar coords + + txtHndl=findobj(gcbf,'Tag','length'); + lstrut=eval(get(txtHndl,'String')); + + txtHndl=findobj(gcbf,'Tag','width'); + tstrut=eval(get(txtHndl,'String')); + + ARrqd=lstrut/tstrut; % AR of strut + + [tmax,I]=max(y); % Approx. max thickness + tmax=tmax*2; + + t0=tmax/2; % Start with tmax/2 + + F='ARfit(P,x)-y'; % For sol. F=AR(t)-ARrqd=0 + FP=['(ARfit(P,x+' num2str(delt) ')-(ARfit(P,x)))/' num2str(delt)]; + % Derivative: F'=(F(t+dt)-F(t))/dt + + tnew=Newton(F,FP,t0,ARrqd,P,TOL); + % Find size of strut that will fit in norm. airfoil + + [AR,xLEnew]=ARfit(P,tnew); + + % Scale + scale = tstrut/tnew; + chord=scale*c; + xLEnewnorm = xLEnew+c/2; + xLEnew = xLEnewnorm*scale; + + x1=x*scale; + y1=y*scale; + + % Plotit + c1x=xLEnew; cy=tstrut/2; + c2x=xLEnew+lstrut; + strx=[c1x c2x c2x c1x c1x]; + stry=[cy cy -cy -cy cy]; + plot(x1,y1,'b',strx,stry,'r'); + axis([0 chord -chord/2 chord/2]); + + txtHndl=findobj(gcbf,'Tag','scale'); + set(txtHndl,'String',num2str(scale)); + + txtHndl=findobj(gcbf,'Tag','xlepers'); + set(txtHndl,'String',num2str(xLEnewnorm*100)); + + txtHndl=findobj(gcbf,'Tag','xle'); + set(txtHndl,'String',num2str(xLEnew)); + + + +end; diff --git a/Matlab code/strut/strutcall_update.m b/strut/strutcall_update 2.m similarity index 100% rename from Matlab code/strut/strutcall_update.m rename to strut/strutcall_update 2.m diff --git a/strut/strutcall_update.m b/strut/strutcall_update.m new file mode 100755 index 0000000..bd414c8 --- /dev/null +++ b/strut/strutcall_update.m @@ -0,0 +1,110 @@ +function strutcall(action) + +global x y tmax +% Remove +global P + +switch(action) +case 'load' + + % Read Input Data + [fname,pname] = uigetfile('*.dat','File containing airfoil co-ordinates'); + if fname == 0 + return; + end + + dot=find(fname=='.'); + + oldpath = pwd; + eval(['cd ' pname]); + data = load(fname); + eval(['cd ' pwd]); + + x = data(:,1); + y = data(:,2); + + txtHndl=findobj(gcbf,'Tag','airfoilname'); + set(txtHndl,'String',fname(1:dot-1)); + + plot(x,y); axis([0 1 -.5 .5]); + + % Load default strut size + fid=fopen('default.dat','r'); + fgetl(fid); + lstrut=eval(fgetl(fid)); + fgetl(fid); + wstrut=eval(fgetl(fid)); + fclose(fid); + + txtHndl=findobj(gcbf,'Tag','length'); + set(txtHndl,'String',num2str(lstrut)); + + txtHndl=findobj(gcbf,'Tag','width'); + set(txtHndl,'String',num2str(wstrut)); + +case 'calculate' + + global x y + delt=1e-7; % Used for calculating dF/dt + TOL=1e-6; % Tolerance for N-R iteration + + N = length(x); + c = max(x)-min(x); + x1 = x-c/2; + r = sqrt(x1.^2+y.^2); + theta = acos(x1./r); + % Use a continues theta + theta((N+1)/2:N)=2*pi-theta((N+1)/2:N); + P = spline(theta,r); % Fit cubic spline in polar coords + + txtHndl=findobj(gcbf,'Tag','length'); + lstrut=eval(get(txtHndl,'String')); + + txtHndl=findobj(gcbf,'Tag','width'); + tstrut=eval(get(txtHndl,'String')); + + ARrqd=lstrut/tstrut; % AR of strut + + [tmax,I]=max(y); % Approx. max thickness + tmax=tmax*2; + + t0=tmax/2; % Start with tmax/2 + + F='ARfit(P,x)-y'; % For sol. F=AR(t)-ARrqd=0 + FP=['(ARfit(P,x+' num2str(delt) ')-(ARfit(P,x)))/' num2str(delt)]; + % Derivative: F'=(F(t+dt)-F(t))/dt + + tnew=Newton(F,FP,t0,ARrqd,P,TOL); + % Find size of strut that will fit in norm. airfoil + + [AR,xLEnew]=ARfit(P,tnew); + + % Scale + scale = tstrut/tnew; + chord=scale*c; + xLEnewnorm = xLEnew+c/2; + xLEnew = xLEnewnorm*scale; + + x1=x*scale; + y1=y*scale; + + % Plotit + c1x=xLEnew; cy=tstrut/2; + c2x=xLEnew+lstrut; + strx=[c1x c2x c2x c1x c1x]; + stry=[cy cy -cy -cy cy]; + plot(x1,y1,'b',strx,stry,'r'); + axis([0 chord -chord/2 chord/2]); + + txtHndl=findobj(gcbf,'Tag','scale'); + set(txtHndl,'String',num2str(scale)); + + txtHndl=findobj(gcbf,'Tag','xlepers'); + set(txtHndl,'String',num2str(xLEnewnorm*100)); + + txtHndl=findobj(gcbf,'Tag','xle'); + set(txtHndl,'String',num2str(xLEnew)); + + + +end; \ No newline at end of file diff --git a/Matlab code/strut/strutfit.m b/strut/strutfit 2.m similarity index 100% rename from Matlab code/strut/strutfit.m rename to strut/strutfit 2.m diff --git a/strut/strutfit.m b/strut/strutfit.m new file mode 100755 index 0000000..06e0ff3 --- /dev/null +++ b/strut/strutfit.m @@ -0,0 +1,208 @@ +function fig = strut() +% This is the machine-generated representation of a Handle Graphics object +% and its children. Note that handle values may change when these objects +% are re-created. This may cause problems with any callbacks written to +% depend on the value of the handle at the time the object was saved. +% This problem is solved by saving the output as a FIG-file. +% +% To reopen this object, just type the name of the M-file at the MATLAB +% prompt. The M-file and its associated MAT-file must be on your path. +% +% NOTE: certain newer features in MATLAB may not have been saved in this +% M-file due to limitations of this format, which has been superseded by +% FIG-files. Figures which have been annotated using the plot editor tools +% are incompatible with the M-file/MAT-file format, and should be saved as +% FIG-files. + +load strut + +h0 = figure('Color',[0.8 0.8 0.8], ... + 'Colormap',mat0, ... + 'FileName','strutfit.m', ... + 'MenuBar','none', ... + 'PaperPosition',[18 180 576 432], ... + 'PaperUnits','points', ... + 'Position',[392 219 560 420], ... + 'Tag','Fig1', ... + 'ToolBar','none', ... + 'NumberTitle','off', ... + 'Name','Strutfit'); +h1 = uimenu('Parent',h0, ... + 'Label','Help', ... + 'Tag','uimenu1'); +h2 = uimenu('Parent',h1, ... + 'Callback','edit readme.txt', ... + 'Label','Readme', ... + 'Tag','Helpuimenu1'); +h2 = uimenu('Parent',h1, ... + 'Callback','edit about.txt', ... + 'Label','About Strutfit', ... + 'Tag','Aboutuimenu1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'Callback','strutcall load', ... + 'ListboxTop',0, ... + 'Position',[356.25 289.5 50.25 15.75], ... + 'String','Load Airfoil', ... + 'Tag','Pushbutton1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 248.25 40 11], ... + 'String','Strut Size:', ... + 'Style','text', ... + 'Tag','StaticText1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 228.75 30 11.25], ... + 'String','Width', ... + 'Style','text', ... + 'Tag','StaticText1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 208.625 30 11], ... + 'String','Length', ... + 'Style','text', ... + 'Tag','StaticText1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'ListboxTop',0, ... + 'Position',[377.25 226.5 39.75 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','width'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'ListboxTop',0, ... + 'Position',[377.25 206.25 39.75 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','length'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'Callback','strutcall calculate', ... + 'ListboxTop',0, ... + 'Position',[356.25 177 50.25 15.75], ... + 'String','Calculate', ... + 'Tag','Pushbutton1'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'ListboxTop',0, ... + 'Position',[347.25 133.5 30 11.25], ... + 'String','Scale', ... + 'Style','text', ... + 'Tag','StaticText2'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[347.25 88.875 30 11.25], ... + 'String','Xle (%)', ... + 'Style','text', ... + 'Tag','StaticText2'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[347.25 44.25 30 11.25], ... + 'String','Xle', ... + 'Style','text', ... + 'Tag','StaticText2'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[354.75 114 50.25 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','scale'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[354.75 69.375 50.25 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','xlepers'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[354.75 24.75 50.25 15.75], ... + 'String','0', ... + 'Style','edit', ... + 'Tag','xle'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[0.752941176470588 0.752941176470588 0.752941176470588], ... + 'ListboxTop',0, ... + 'Position',[341.25 152.25 40 12], ... + 'String','Results:', ... + 'Style','text', ... + 'Tag','StaticText3'); +h1 = uicontrol('Parent',h0, ... + 'Units','points', ... + 'BackgroundColor',[1 1 1], ... + 'Enable','off', ... + 'ListboxTop',0, ... + 'Position',[347.25 264.75 66 15.75], ... + 'String','None Selected', ... + 'Style','edit', ... + 'Tag','airfoilname'); +h1 = axes('Parent',h0, ... + 'Units','pixels', ... + 'CameraUpVector',[0 1 0], ... + 'CameraUpVectorMode','manual', ... + 'Color',[1 1 1], ... + 'ColorOrder',mat1, ... + 'Position',[34 27 418 386], ... + 'Tag','Axes1', ... + 'XColor',[0 0 0], ... + 'YColor',[0 0 0], ... + 'ZColor',[0 0 0]); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','center', ... + 'Position',[0.4988009592326139 -0.06233766233766236 9.160254037844386], ... + 'Tag','Axes1Text4', ... + 'VerticalAlignment','cap'); +set(get(h2,'Parent'),'XLabel',h2); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','center', ... + 'Position',[-0.06954436450839328 0.4961038961038962 9.160254037844386], ... + 'Rotation',90, ... + 'Tag','Axes1Text3', ... + 'VerticalAlignment','baseline'); +set(get(h2,'Parent'),'YLabel',h2); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','right', ... + 'Position',[-0.0815347721822542 1.018181818181818 9.160254037844386], ... + 'Tag','Axes1Text2', ... + 'Visible','off'); +set(get(h2,'Parent'),'ZLabel',h2); +h2 = text('Parent',h1, ... + 'Color',[0 0 0], ... + 'HandleVisibility','off', ... + 'HorizontalAlignment','center', ... + 'Position',[0.4988009592326139 1.018181818181818 9.160254037844386], ... + 'Tag','Axes1Text1', ... + 'VerticalAlignment','bottom'); +set(get(h2,'Parent'),'Title',h2); +if nargout > 0, fig = h0; end diff --git a/Matlab code/superGrimace.m b/super-grimace/superGrimace 2.m similarity index 100% rename from Matlab code/superGrimace.m rename to super-grimace/superGrimace 2.m diff --git a/super-grimace/superGrimace Outputs/.DS_Store b/super-grimace/superGrimace Outputs/.DS_Store new file mode 100755 index 0000000..222f295 Binary files /dev/null and b/super-grimace/superGrimace Outputs/.DS_Store differ diff --git a/superGrimace Outputs/FDR020_BLthicknessv1.tiff b/super-grimace/superGrimace Outputs/FDR020_BLthicknessv1.tiff similarity index 100% rename from superGrimace Outputs/FDR020_BLthicknessv1.tiff rename to super-grimace/superGrimace Outputs/FDR020_BLthicknessv1.tiff diff --git a/superGrimace Outputs/FDR020_BLthicknessv2.tiff b/super-grimace/superGrimace Outputs/FDR020_BLthicknessv2.tiff similarity index 100% rename from superGrimace Outputs/FDR020_BLthicknessv2.tiff rename to super-grimace/superGrimace Outputs/FDR020_BLthicknessv2.tiff diff --git a/superGrimace Outputs/FDR020_surfacev1.tiff b/super-grimace/superGrimace Outputs/FDR020_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/FDR020_surfacev1.tiff rename to super-grimace/superGrimace Outputs/FDR020_surfacev1.tiff diff --git a/superGrimace Outputs/FDR020_surfacev1hires.tiff b/super-grimace/superGrimace Outputs/FDR020_surfacev1hires.tiff similarity index 100% rename from superGrimace Outputs/FDR020_surfacev1hires.tiff rename to super-grimace/superGrimace Outputs/FDR020_surfacev1hires.tiff diff --git a/superGrimace Outputs/FDR020_surfacev2.tiff b/super-grimace/superGrimace Outputs/FDR020_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/FDR020_surfacev2.tiff rename to super-grimace/superGrimace Outputs/FDR020_surfacev2.tiff diff --git a/superGrimace Outputs/FDR020_surfacev2hires.tiff b/super-grimace/superGrimace Outputs/FDR020_surfacev2hires.tiff similarity index 100% rename from superGrimace Outputs/FDR020_surfacev2hires.tiff rename to super-grimace/superGrimace Outputs/FDR020_surfacev2hires.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR001_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR001_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR001_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR001_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR002_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR002_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR002_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR002_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR003_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR003_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR003_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR003_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR004_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR004_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR004_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR004_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR005_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR005_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR005_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR005_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR006_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR006_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR006_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR006_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR007_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR007_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR007_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR007_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR009_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR009_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR009_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR009_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR010_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR010_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR010_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR010_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR011_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR011_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR011_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR011_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR012_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR012_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR012_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR012_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR013_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR013_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR013_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR013_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR014_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR014_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR014_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR014_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR015_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR015_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR015_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR015_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR016_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR016_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR016_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR016_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR017_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR017_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR017_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR017_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR018_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR018_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR018_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR018_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR019_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR019_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR019_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR019_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 1/FDR020_surfacev1.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR020_surfacev1.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 1/FDR020_surfacev1.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 1/FDR020_surfacev1.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR001_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR001_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR001_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR001_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR002_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR002_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR002_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR002_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR003_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR003_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR003_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR003_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR004_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR004_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR004_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR004_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR005_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR005_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR005_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR005_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR006_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR006_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR006_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR006_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR007_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR007_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR007_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR007_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR009_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR009_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR009_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR009_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR010_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR010_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR010_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR010_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR011_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR011_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR011_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR011_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR012_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR012_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR012_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR012_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR013_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR013_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR013_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR013_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR014_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR014_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR014_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR014_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR015_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR015_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR015_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR015_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR016_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR016_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR016_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR016_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR017_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR017_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR017_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR017_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR018_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR018_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR018_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR018_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR019_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR019_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR019_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR019_surfacev2.tiff diff --git a/superGrimace Outputs/Thickness Plot View 2/FDR020_surfacev2.tiff b/super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR020_surfacev2.tiff similarity index 100% rename from superGrimace Outputs/Thickness Plot View 2/FDR020_surfacev2.tiff rename to super-grimace/superGrimace Outputs/Thickness Plot View 2/FDR020_surfacev2.tiff diff --git a/superGrimace Outputs/untitledshit.jpg b/super-grimace/superGrimace Outputs/untitledshit.jpg similarity index 100% rename from superGrimace Outputs/untitledshit.jpg rename to super-grimace/superGrimace Outputs/untitledshit.jpg diff --git a/super-grimace/superGrimace.m b/super-grimace/superGrimace.m new file mode 100755 index 0000000..8e0fcdf --- /dev/null +++ b/super-grimace/superGrimace.m @@ -0,0 +1,451 @@ +%superGrimace +%all alfas in DEGREES! +%by ascorrea, with help from Jacob Huffman and Omkar Shetty +%"filler" variable just makes it easier to switch between Ronald and Grimace + +function superGrimace(paramfile, pranformfile, pranformConstraint) +testrange={'20'}; + +for testnumber=1:length(testrange) +prefix='FDR0'; +name=strcat(prefix, testrange{testnumber}); +paramfile=strcat(name, '.param'); +pranformfile=strcat(name, '.plan', ''); +fprintf('%s \n', name) + + +%LOCATIONS--------------------------------------------------------------] +rootLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Matlab Code'; +airfoilLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Airfoils'; +pranformLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Planforms'; +pranformConstraintLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Planform Constraints'; +paramLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/Parameter Files'; +outputsLOCATION='/Users/anthonyscorrea/Documents/MATLAB/AE441 - Home Edition/superGrimace Outputs'; +%-----------------------------------------------------------------------] +spanwiseresolution=50; +chordwiseresolution=100; + +cd(paramLOCATION); +[variablenames, variablevalues]=textread(paramfile, '%s %f'); +cd(pranformLOCATION) +[spans, chords, offsets, airfoil]=textread(pranformfile, '%f %f %f %s'); +cd(pranformConstraintLOCATION) +[spansCONST, chordsCONST, offsetsCONST, heightCONST]=textread(pranformConstraint, '%f %f %f %f'); +cd(rootLOCATION) + +for k = 1:length(variablenames) +eval([variablenames{k} '= variablevalues(k);']); +end + +cd(airfoilLOCATION) + +[surfplotY surfplotX thicknessplot]=findthicknessplot(airfoil, chords, spans, offsets, spanwiseresolution, chordwiseresolution); +[wakeplot]=findwakeplot(chords, spans, alt_cruise, M_cruise, laminarflow_cruise, fuse_width, spanwiseresolution, chordwiseresolution); +plotitle=regexprep(pranformfile, '.plan', ''); + +cd(outputsLOCATION) +% clf +% hold on +% surf(surfplotY, -surfplotX, thicknessplot, 'LineStyle', 'none') +% surf(-surfplotY,-surfplotX, thicknessplot, 'LineStyle', 'none') +% title(plotitle) +% axis off +% axis equal +% colorbar +% view(2) +% filename=regexprep(pranformfile, '.plan', '_surfacev1.tiff'); +% print (gcf, '-dtiff', filename) +% clf +% hold on +% surf(surfplotY, surfplotX, thicknessplot, 'LineStyle', 'none') +% surf(-surfplotY, surfplotX, thicknessplot, 'LineStyle', 'none') +% axis equal +% axis off +% colorbar +% view(3) +% title(plotitle) +% filename=regexprep(pranformfile, '.plan', '_surfacev2.tiff'); +% print (gcf, '-dtiff', filename) + +clf +hold on +surf(surfplotY, -surfplotX, wakeplot, 'LineStyle', 'none') +surf(-surfplotY,-surfplotX, wakeplot, 'LineStyle', 'none') +title(plotitle) +axis off +axis equal +colorbar +view(2) +filename=regexprep(pranformfile, '.plan', '_BLthicknessv1.tiff'); +print (gcf, '-dtiff', filename) + +clf +hold on +surf(-surfplotY, -surfplotX, wakeplot, 'LineStyle', 'none') +surf(-surfplotY, -surfplotX, wakeplot, 'LineStyle', 'none') +axis off +axis([-80 80 -160 0 0 1]) +colorbar +view(3) +title(plotitle) +filename=regexprep(pranformfile, '.plan', '_BLthicknessv2.tiff'); +print (gcf, '-dtiff', filename) + + +axis equal +axis off +hold off + +cd(rootLOCATION) +end +clc +fprintf('You are welcome\n') +end + +function [plotLE plotTE]=plotpranform(spans, chords, offsets, n) +Chords = findChords(n, chords, spans); + +%plot planform +for i = 1:(size(chords)-1) + dist=0; + for j = 1:n + dist = (spans(i+1)-spans(i))./n; + + if i==1 + xplotLE(i,j+1)=spans(1)+dist*(j); + else + xplotLE(i,1)=xplotLE(i-1,end); + xplotLE(i,j+1)=xplotLE(i-1,end)+dist*(j); + end + + fitX(1)=spans(i); + fitX(2)=spans(i+1); + fitY(1)=offsets(i); + fitY(2)=offsets(i+1); + a = polyfit(fitX, fitY,1); + yplotLE(i,j) = a(1)*xplotLE(i,j)+a(2); + + + + end +end + + +plotLE=zeros(1,2); +plotTE=zeros(1,2); + +for i=1:(size(chords)-1) + for j=1:n + plotLE=[plotLE; xplotLE(i,j) -yplotLE(i,j)]; + plotTE=[plotTE; xplotLE(i,j) -(yplotLE(i,j)+Chords(i,j))]; + end +end +plotTE(1,:)=[]; +plotLE(1,:)=[]; +end +function [plotLE plotTE]=plotconstraint(spans, chords, offsets, n) + +%plot constraint +for i = 1:(size(chords)-1) + for j = 1:n + dist = (spans(i+1)-spans(i))./n; + if i==1 + xplotLE(i,j+1)=spans(1)+dist*(j); + else + xplotLE(i,1)=xplotLE(i-1,end); + xplotLE(i,j+1)=xplotLE(i-1,end)+dist*(j); + end + yplotLE(i,j) = offsets(i+1); + end +end + +plotLE=zeros(1,2); +plotTE=zeros(1,2); + +for i=1:(size(chords)-1) + for j=1:n + plotLE=[plotLE; xplotLE(i,j) -yplotLE(i,j)]; + plotTE=[plotTE; xplotLE(i,j) (-yplotLE(i,j)-chords(i+1))]; + end +end + +plotTE(1,:)=[]; +plotLE(1,:)=[]; +end +function plotThick=plotThick(spans, chords, offsets, airfoil, h, n) +n=n/10; +Chords = findChords(n, chords, spans); +plotThickLE=zeros(1,2); +plotThickTE=zeros(1,2); + +for i = 1:(size(chords)-1) + for j = 1:n + + Chords(i,j); + dist = (spans(i+1)-spans(i))./n; + + if i==1 + xplotLE(i,j+1)=spans(1)+dist*(j); + else + xplotLE(i,1)=xplotLE(i-1,end); + xplotLE(i,j+1)=xplotLE(i-1,end)+dist*(j); + end + + fitX(1)=spans(i); + fitX(2)=spans(i+1); + fitY(1)=offsets(i); + fitY(2)=offsets(i+1); + a = polyfit(fitX, fitY,1); + yplotLE(i,j) = a(1)*xplotLE(i,j)+a(2); + + chordloc=linspace(0, Chords(i,j)); + + for k=1:length(chordloc)-1 + thicknessLE(k)=findthickness(airfoil{i}, Chords(i,j), chordloc(k)); + clc + fprintf('%g:%u:%u:%u/%g:%u:%u:%u',h,i,j,k,h,(length(chords)-1),n,(length(chordloc)-1)) + if thicknessLE(k)>=h + plotThickLE=[plotThickLE; xplotLE(i,j) -(chordloc(k)+yplotLE(i,j))]; + break + end + end + + for k=1:length(chordloc)-1 + thicknessTE(k)=findthickness(airfoil{i}, Chords(i,j), chordloc(length(chordloc)-k)); + if thicknessTE(k)>=h + plotThickTE=[plotThickTE; xplotLE(i,j) -(chordloc(length(chordloc)-k)+yplotLE(i,j))]; + break + end + end + + end + +end + + +plotLE=zeros(1,2); +plotTE=zeros(1,2); + +for i=1:(size(chords)-1) + for j=1:n + plotLE=[plotLE; xplotLE(i,j) -yplotLE(i,j)]; + plotTE=[plotTE; xplotLE(i,j) -(yplotLE(i,j)+Chords(i,j))]; + end +end + +plotTE(1,:)=[]; +plotLE(1,:)=[]; +plotThickLE(1,:)=[]; +plotThickTE(1,:)=[]; +plotThick=[plotThickLE; flipud(plotThickTE)]; +end +function thickness=findthickness(airfoil, Chord, xLoc) +Airfoil = load(airfoil); +Airfoil = Airfoil*Chord; +% blah....goodnight + + AirfoilX=Airfoil(:,1); + [min_diff, k]=min(abs(AirfoilX)); + + for j=1:k + AirfoilYupper(j)=Airfoil(j,2); + AirfoilXupper(j)=Airfoil(j,1); + end + + for j=1:length(Airfoil)-k + AirfoilYlower(j)=Airfoil(length(Airfoil)-(j-1), 2); + AirfoilXlower(j)=Airfoil(length(Airfoil)-(j-1), 1); + end + + AirfoilYupper=fliplr(AirfoilYupper); + AirfoilXupper=fliplr(AirfoilXupper); + AirfoilYlower=fliplr(AirfoilYlower); + AirfoilXlower=fliplr(AirfoilXlower); + AirfoilYlower=[0 AirfoilYlower]; + AirfoilXlower=[0 AirfoilXlower]; + + [min_diff, k]=min(abs(AirfoilX)); + + [min_diff, kU]=min(abs(AirfoilXupper-xLoc)); + [min_diff, kL]=min(abs(AirfoilXlower-xLoc)); + + if xLocwidth + lam=laminarflow; + else + lam=laminarflow-.15; + end + x=linspace(0, Chords(i,j),reso); + for k = 1:length(x) + if (k <= 100*lam) + delta_x=( 5.2 * x(k) )*(v_fps*x(k)/dynvisc)^-0.5; + wake(k,j)= delta_x; + else %if turbulent + x_tr=x(100*lam); + Re_xtr = v_fps * x_tr / dynvisc; + delta_xtr=(5.2*x_tr)*(v_fps*x(k)/dynvisc)^-(0.5); + delta_l = ((delta_xtr*((v_fps)^0.2))/(0.37*((dynvisc)^0.2)))^(1/0.8); + lt = x(k) - x_tr + delta_l; + Re_lt = v_fps * lt / dynvisc; + delta = 0.37 * lt /(Re_lt)^0.2; + wake(k,j) = delta; + end + end +wakeplot=[wakeplot, wake]; + end + +fprintf('Wake plot: %6.2f percent complete\n', 100*(i+.1*j)/((length(chords)-1)+ n*.1)) +end +wakeplot(1,:)=[]; +wakeplot(:,1)=[ ]; +flipud(wakeplot); +end +function q=finddynpress(alt, v_mach) +if alt < 36152 +temp=59-.00356*alt; +press=2116*((temp+459.7)/518.6)^5.256; + +elseif alt < 82345 + temp=-70; + press=473.1*exp(1.73-.000048*alt); + +else + print('Program Not Valid for given altitude') +end + +%slpcuft: clugs ber cubic foot +density_slpcuft=press/(1718*(temp+459.7)); +v_fps=v_mach*sqrt(1.4*1718*(temp+459.7)); +q=.5*density_slpcuft*v_fps^2; +end diff --git a/Matlab code/superGrimace.m~ b/super-grimace/superGrimace.m~ similarity index 100% rename from Matlab code/superGrimace.m~ rename to super-grimace/superGrimace.m~ diff --git a/Matlab code/tradestudyAR.m b/tradestudies/tradestudyAR.m similarity index 100% rename from Matlab code/tradestudyAR.m rename to tradestudies/tradestudyAR.m diff --git a/Matlab code/tradestudyS.m b/tradestudies/tradestudyS.m similarity index 100% rename from Matlab code/tradestudyS.m rename to tradestudies/tradestudyS.m diff --git a/Matlab code/tradestudySwet.m b/tradestudies/tradestudySwet.m similarity index 100% rename from Matlab code/tradestudySwet.m rename to tradestudies/tradestudySwet.m diff --git a/xflr/outputs/.DS_Store b/xflr/outputs/.DS_Store new file mode 100755 index 0000000..a6c4761 Binary files /dev/null and b/xflr/outputs/.DS_Store differ diff --git a/XFLR Outputs/FDR001.out b/xflr/outputs/FDR001 2.txt similarity index 100% rename from XFLR Outputs/FDR001.out rename to xflr/outputs/FDR001 2.txt diff --git a/XFLR Outputs/FDR001.txt b/xflr/outputs/FDR001.out similarity index 100% rename from XFLR Outputs/FDR001.txt rename to xflr/outputs/FDR001.out diff --git a/xflr/outputs/FDR001.txt b/xflr/outputs/FDR001.txt new file mode 100755 index 0000000..f7bcfb6 --- /dev/null +++ b/xflr/outputs/FDR001.txt @@ -0,0 +1,53 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR001 +Wing polar name : kickin' ass +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.006842 0.000251 0.000000 0.000251 0.000000 -0.026050 0.000000 -0.000000 -0.000000 9.7536 0.4046 + -0.900 0.011881 0.000243 0.000000 0.000243 -0.000000 -0.032028 0.000000 0.000000 0.000000 9.7536 0.2865 + -0.800 0.017486 0.000242 0.000000 0.000242 0.000000 -0.038399 -0.000000 -0.000000 -0.000000 9.7536 0.2333 + -0.700 0.023090 0.000245 0.000000 0.000245 0.000000 -0.044770 0.000000 -0.000000 -0.000000 9.7536 0.2060 + -0.600 0.028695 0.000252 0.000000 0.000252 0.000000 -0.051140 0.000000 -0.000000 -0.000000 9.7536 0.1894 + -0.500 0.034863 0.000267 0.000000 0.000267 -0.000000 -0.057902 0.000000 0.000000 0.000000 9.7536 0.1765 + -0.400 0.039903 0.000279 0.000000 0.000279 0.000000 -0.063881 0.000000 -0.000000 -0.000000 9.7536 0.1701 + -0.300 0.045507 0.000300 0.000000 0.000300 -0.000000 -0.070251 -0.000000 0.000000 0.000000 9.7536 0.1640 + -0.200 0.051111 0.000325 0.000000 0.000325 0.000000 -0.076621 0.000000 0.000000 0.000000 9.7536 0.1593 + -0.100 0.056714 0.000354 0.000000 0.000354 -0.000000 -0.082991 0.000000 -0.000000 -0.000000 9.7536 0.1555 + 0.000 0.062882 0.000392 0.000000 0.000392 0.000000 -0.089751 0.000000 -0.000000 -0.000000 9.7536 0.1516 + 0.100 0.067920 0.000425 0.000000 0.000425 0.000000 -0.095729 0.000000 0.000000 0.000000 9.7536 0.1497 + 0.200 0.073522 0.000467 0.000000 0.000467 -0.000000 -0.102097 -0.000000 -0.000000 -0.000000 9.7536 0.1475 + 0.300 0.079124 0.000514 0.000000 0.000514 0.000000 -0.108464 0.000000 -0.000000 -0.000000 9.7536 0.1456 + 0.400 0.084725 0.000565 0.000000 0.000565 -0.000000 -0.114831 -0.000000 -0.000000 -0.000000 9.7536 0.1440 + 0.500 0.090889 0.000627 0.000000 0.000627 -0.000000 -0.121587 -0.000000 0.000000 0.000000 9.7536 0.1421 + 0.600 0.095925 0.000680 0.000000 0.000680 0.000000 -0.127562 0.000000 -0.000000 -0.000000 9.7536 0.1413 + 0.700 0.101523 0.000744 0.000000 0.000744 -0.000000 -0.133926 -0.000000 -0.000000 -0.000000 9.7536 0.1402 + 0.710 0.102066 0.000751 0.000000 0.000751 0.000000 -0.134543 0.000000 -0.000000 -0.000000 9.7536 0.1401 + 0.800 0.107121 0.000813 0.000000 0.000813 0.000000 -0.140289 -0.000000 -0.000000 -0.000000 9.7536 0.1391 + 0.900 0.112718 0.000886 0.000000 0.000886 0.000000 -0.146650 0.000000 -0.000000 -0.000000 9.7536 0.1382 + 1.000 0.118877 0.000971 0.000000 0.000971 -0.000000 -0.153400 0.000000 0.000000 0.000000 9.7536 0.1371 + 1.100 0.123909 0.001045 0.000000 0.001045 -0.000000 -0.159370 0.000000 -0.000000 -0.000000 9.7536 0.1367 + 1.200 0.129502 0.001131 0.000000 0.001131 0.000000 -0.165728 0.000000 -0.000000 -0.000000 9.7536 0.1360 + 1.300 0.135095 0.001221 0.000000 0.001221 0.000000 -0.172084 0.000000 -0.000000 -0.000000 9.7536 0.1354 + 1.400 0.140686 0.001316 0.000000 0.001316 0.000000 -0.178439 0.000000 -0.000000 -0.000000 9.7536 0.1348 + 1.500 0.146838 0.001425 0.000000 0.001425 0.000000 -0.185180 0.000000 -0.000000 -0.000000 9.7536 0.1340 + 1.600 0.151864 0.001518 0.000000 0.001518 -0.000000 -0.191144 0.000000 -0.000000 -0.000000 9.7536 0.1338 + 1.700 0.157451 0.001626 0.000000 0.001626 0.000000 -0.197494 0.000000 -0.000000 -0.000000 9.7536 0.1333 + 1.800 0.163037 0.001738 0.000000 0.001738 -0.000000 -0.203842 -0.000000 -0.000000 -0.000000 9.7536 0.1329 + 1.900 0.168621 0.001854 0.000000 0.001854 0.000000 -0.210188 0.000000 0.000000 0.000000 9.7536 0.1325 + 2.000 0.174764 0.001987 0.000000 0.001987 0.000000 -0.216919 -0.000000 0.000000 0.000000 9.7536 0.1319 + 2.100 0.179784 0.002100 0.000000 0.002100 0.000000 -0.222875 0.000000 -0.000000 -0.000000 9.7536 0.1318 + 2.200 0.185363 0.002230 0.000000 0.002230 0.000000 -0.229214 -0.000000 -0.000000 -0.000000 9.7536 0.1315 + 2.300 0.190940 0.002364 0.000000 0.002364 -0.000000 -0.235552 -0.000000 0.000000 0.000000 9.7536 0.1312 + 2.400 0.196515 0.002502 0.000000 0.002502 0.000000 -0.241888 -0.000000 -0.000000 -0.000000 9.7536 0.1309 + 2.500 0.202648 0.002657 0.000000 0.002657 0.000000 -0.248606 -0.000000 -0.000000 -0.000000 9.7536 0.1305 + 2.600 0.207659 0.002791 0.000000 0.002791 -0.000000 -0.254551 -0.000000 -0.000000 -0.000000 9.7536 0.1304 + 2.700 0.213229 0.002942 0.000000 0.002942 0.000000 -0.260879 0.000000 -0.000000 -0.000000 9.7536 0.1301 + 2.800 0.218796 0.003097 0.000000 0.003097 -0.000000 -0.267205 0.000000 -0.000000 -0.000000 9.7536 0.1299 + 2.900 0.224360 0.003257 0.000000 0.003257 -0.000000 -0.273528 -0.000000 -0.000000 -0.000000 9.7536 0.1297 + 3.000 0.230482 0.003436 0.000000 0.003436 0.000000 -0.280232 0.000000 -0.000000 -0.000000 9.7536 0.1293 + + diff --git a/XFLR Outputs/FDR004.out b/xflr/outputs/FDR004 2.txt similarity index 100% rename from XFLR Outputs/FDR004.out rename to xflr/outputs/FDR004 2.txt diff --git a/XFLR Outputs/FDR004.txt b/xflr/outputs/FDR004.out similarity index 100% rename from XFLR Outputs/FDR004.txt rename to xflr/outputs/FDR004.out diff --git a/xflr/outputs/FDR004.txt b/xflr/outputs/FDR004.txt new file mode 100755 index 0000000..18bada4 --- /dev/null +++ b/xflr/outputs/FDR004.txt @@ -0,0 +1,20 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR004 +Wing polar name : T1-32.0 ft/s-VLM2- 0.00ft-Inviscid +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.085107 0.000981 0.000000 0.000981 0.000000 -0.142817 0.000000 -0.000000 -0.000000 9.7536 0.1523 + -0.500 0.113515 0.001143 0.000000 0.001143 -0.000000 -0.175844 -0.000000 0.000000 0.000000 9.7536 0.1406 + 0.000 0.141908 0.001402 0.000000 0.001402 -0.000000 -0.208848 0.000000 0.000000 0.000000 9.7536 0.1336 + 0.500 0.170279 0.001759 0.000000 0.001759 -0.000000 -0.241821 0.000000 0.000000 0.000000 9.7536 0.1289 + 1.000 0.198620 0.002213 0.000000 0.002213 0.000000 -0.274753 0.000000 0.000000 0.000000 9.7536 0.1255 + 1.500 0.226925 0.002764 0.000000 0.002764 -0.000000 -0.307632 0.000000 -0.000000 -0.000000 9.7536 0.1231 + 2.000 0.255186 0.003411 0.000000 0.003411 0.000000 -0.340450 -0.000000 -0.000000 -0.000000 9.7536 0.1211 + 2.500 0.283396 0.004155 0.000000 0.004155 -0.000000 -0.373196 0.000000 -0.000000 -0.000000 9.7536 0.1196 + 3.000 0.311548 0.004994 0.000000 0.004994 -0.000000 -0.405860 0.000000 -0.000000 -0.000000 9.7536 0.1184 + + diff --git a/XFLR Outputs/FDR005.out b/xflr/outputs/FDR005 2.txt similarity index 100% rename from XFLR Outputs/FDR005.out rename to xflr/outputs/FDR005 2.txt diff --git a/XFLR Outputs/FDR005.txt b/xflr/outputs/FDR005.out similarity index 100% rename from XFLR Outputs/FDR005.txt rename to xflr/outputs/FDR005.out diff --git a/xflr/outputs/FDR005.txt b/xflr/outputs/FDR005.txt new file mode 100755 index 0000000..5e5ccb0 --- /dev/null +++ b/xflr/outputs/FDR005.txt @@ -0,0 +1,20 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR005 +Wing polar name : T1-32.0 ft/s-VLM2- 0.00ft-Inviscid +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.085162 0.000927 0.000000 0.000927 -0.000000 -0.134114 0.000000 0.000000 0.000000 9.7536 0.1429 + -0.500 0.113619 0.001087 0.000000 0.001087 0.000000 -0.165237 -0.000000 -0.000000 -0.000000 9.7536 0.1320 + 0.000 0.142061 0.001347 0.000000 0.001347 -0.000000 -0.196340 -0.000000 -0.000000 -0.000000 9.7536 0.1254 + 0.500 0.170480 0.001707 0.000000 0.001707 -0.000000 -0.227413 -0.000000 0.000000 0.000000 9.7536 0.1211 + 1.000 0.198870 0.002166 0.000000 0.002166 -0.000000 -0.258447 0.000000 0.000000 0.000000 9.7536 0.1179 + 1.500 0.227222 0.002724 0.000000 0.002724 -0.000000 -0.289432 0.000000 0.000000 0.000000 9.7536 0.1156 + 2.000 0.255529 0.003380 0.000000 0.003380 -0.000000 -0.320359 -0.000000 -0.000000 -0.000000 9.7536 0.1138 + 2.500 0.283785 0.004135 0.000000 0.004135 -0.000000 -0.351218 0.000000 -0.000000 -0.000000 9.7536 0.1124 + 3.000 0.311981 0.004988 0.000000 0.004988 -0.000000 -0.382000 0.000000 0.000000 0.000000 9.7536 0.1113 + + diff --git a/XFLR Outputs/FDR006.out b/xflr/outputs/FDR006 2.txt similarity index 100% rename from XFLR Outputs/FDR006.out rename to xflr/outputs/FDR006 2.txt diff --git a/XFLR Outputs/FDR006.txt b/xflr/outputs/FDR006.out similarity index 100% rename from XFLR Outputs/FDR006.txt rename to xflr/outputs/FDR006.out diff --git a/xflr/outputs/FDR006.txt b/xflr/outputs/FDR006.txt new file mode 100755 index 0000000..8faf5ff --- /dev/null +++ b/xflr/outputs/FDR006.txt @@ -0,0 +1,20 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR006 +Wing polar name : T1-32.0 ft/s-VLM2- 0.00ft-Inviscid +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.091968 0.001738 0.000000 0.001738 0.000000 -0.160384 -0.000000 -0.000000 -0.000000 9.7536 0.1775 + -0.500 0.120852 0.002090 0.000000 0.002090 -0.000000 -0.195204 -0.000000 0.000000 0.000000 9.7536 0.1643 + 0.000 0.149715 0.002561 0.000000 0.002561 0.000000 -0.230000 -0.000000 0.000000 0.000000 9.7536 0.1563 + 0.500 0.178548 0.003149 0.000000 0.003149 -0.000000 -0.264762 0.000000 0.000000 0.000000 9.7536 0.1509 + 1.000 0.207344 0.003856 0.000000 0.003856 -0.000000 -0.299477 -0.000000 0.000000 0.000000 9.7536 0.1470 + 1.500 0.236093 0.004680 0.000000 0.004680 -0.000000 -0.334137 -0.000000 0.000000 0.000000 9.7536 0.1440 + 2.000 0.264788 0.005620 0.000000 0.005620 -0.000000 -0.368730 -0.000000 0.000000 0.000000 9.7536 0.1418 + 2.500 0.293420 0.006677 0.000000 0.006677 -0.000000 -0.403246 -0.000000 0.000000 0.000000 9.7536 0.1399 + 3.000 0.321981 0.007850 0.000000 0.007850 -0.000000 -0.437675 0.000000 0.000000 0.000000 9.7536 0.1385 + + diff --git a/XFLR Outputs/FDR007.out b/xflr/outputs/FDR007 2.txt similarity index 100% rename from XFLR Outputs/FDR007.out rename to xflr/outputs/FDR007 2.txt diff --git a/XFLR Outputs/FDR007.txt b/xflr/outputs/FDR007.out similarity index 100% rename from XFLR Outputs/FDR007.txt rename to xflr/outputs/FDR007.out diff --git a/xflr/outputs/FDR007.txt b/xflr/outputs/FDR007.txt new file mode 100755 index 0000000..a4427b0 --- /dev/null +++ b/xflr/outputs/FDR007.txt @@ -0,0 +1,20 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR007 +Wing polar name : kickin' ass -inviscid +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.091190 0.001207 0.000000 0.001207 -0.000000 -0.163135 -0.000000 0.000000 0.000000 9.7536 0.1534 + -0.500 0.120608 0.001405 0.000000 0.001405 0.000000 -0.199971 -0.000000 0.000000 0.000000 9.7536 0.1421 + 0.000 0.150010 0.001701 0.000000 0.001701 -0.000000 -0.236781 -0.000000 0.000000 0.000000 9.7536 0.1353 + 0.500 0.179388 0.002095 0.000000 0.002095 0.000000 -0.273556 0.000000 -0.000000 -0.000000 9.7536 0.1307 + 1.000 0.208736 0.002586 0.000000 0.002586 0.000000 -0.310284 -0.000000 -0.000000 -0.000000 9.7536 0.1274 + 1.500 0.238045 0.003175 0.000000 0.003175 0.000000 -0.346954 0.000000 0.000000 0.000000 9.7536 0.1250 + 2.000 0.267309 0.003860 0.000000 0.003860 -0.000000 -0.383554 -0.000000 -0.000000 -0.000000 9.7536 0.1230 + 2.500 0.296520 0.004642 0.000000 0.004642 0.000000 -0.420074 0.000000 0.000000 0.000000 9.7536 0.1215 + 3.000 0.325671 0.005520 0.000000 0.005520 0.000000 -0.456501 0.000000 0.000000 0.000000 9.7536 0.1203 + + diff --git a/XFLR Outputs/FDR008.out b/xflr/outputs/FDR008 2.txt similarity index 100% rename from XFLR Outputs/FDR008.out rename to xflr/outputs/FDR008 2.txt diff --git a/XFLR Outputs/FDR008.txt b/xflr/outputs/FDR008.out similarity index 100% rename from XFLR Outputs/FDR008.txt rename to xflr/outputs/FDR008.out diff --git a/xflr/outputs/FDR008.txt b/xflr/outputs/FDR008.txt new file mode 100755 index 0000000..f0a18b0 --- /dev/null +++ b/xflr/outputs/FDR008.txt @@ -0,0 +1,20 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR008 +Wing polar name : T1-32.0 ft/s-VLM2- 0.00ft-Inviscid +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.102761 0.001092 0.000000 0.001092 0.000000 -0.171934 -0.000000 -0.000000 -0.000000 9.7536 0.1434 + -0.500 0.132184 0.001345 0.000000 0.001345 0.000000 -0.208771 -0.000000 -0.000000 -0.000000 9.7536 0.1354 + 0.000 0.161587 0.001696 0.000000 0.001696 0.000000 -0.245585 0.000000 -0.000000 -0.000000 9.7536 0.1303 + 0.500 0.190964 0.002145 0.000000 0.002145 0.000000 -0.282364 0.000000 -0.000000 -0.000000 9.7536 0.1267 + 1.000 0.220308 0.002692 0.000000 0.002692 -0.000000 -0.319097 0.000000 0.000000 0.000000 9.7536 0.1241 + 1.500 0.249610 0.003335 0.000000 0.003335 -0.000000 -0.355774 -0.000000 0.000000 0.000000 9.7536 0.1222 + 2.000 0.278864 0.004075 0.000000 0.004075 -0.000000 -0.392382 -0.000000 0.000000 0.000000 9.7536 0.1207 + 2.500 0.308063 0.004912 0.000000 0.004912 -0.000000 -0.428911 0.000000 0.000000 0.000000 9.7536 0.1194 + 3.000 0.337198 0.005845 0.000000 0.005845 0.000000 -0.465350 0.000000 -0.000000 -0.000000 9.7536 0.1184 + + diff --git a/XFLR Outputs/FDR009.txt b/xflr/outputs/FDR009 2.txt similarity index 100% rename from XFLR Outputs/FDR009.txt rename to xflr/outputs/FDR009 2.txt diff --git a/XFLR Outputs/FDR009.out b/xflr/outputs/FDR009.out similarity index 100% rename from XFLR Outputs/FDR009.out rename to xflr/outputs/FDR009.out diff --git a/xflr/outputs/FDR009.txt b/xflr/outputs/FDR009.txt new file mode 100755 index 0000000..a14a45f --- /dev/null +++ b/xflr/outputs/FDR009.txt @@ -0,0 +1,21 @@ +QFLR5 v0.04 Beta + +Wing name : sF DR009 +Wing polar name : T1 -32.0 ft/s 0 0ft +Freestream speed : 3 2.000 ft/s + +alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP +_________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ +-2 0.028775 0.000902 0.039073 0.039975 0 -0.075392 0 0 0 9.7536 0.266 +-1.5 0.055659 0.000888 0.039687 0.040574 0 -0.106895 0 0 0 9.7536 0.1949 +-1 0.082543 0.00097 0.039993 0.040963 0 -0.138397 0 0 0 9.7536 0.1701 +-0.5 0.109418 0.001148 0.045594 0.046742 0 -0.169891 0 0 0 9.7536 0.1575 +0 0.136278 0.001422 0.049288 0.05071 0 -0.201364 0 0 0 9.7536 0.1499 +0.5 0.163116 0.001792 0.051593 0.053384 0 -0.232805 0 0 0 9.7536 0.1448 +1 0.189924 0.002257 0.054106 0.056363 0 -0.264205 0 0 0 9.7536 0.1412 +1.5 0.216697 0.002817 0.057404 0.060221 0 -0.295557 0 0 0 9.7536 0.1384 +2 0.243426 0.003472 0.05946 0.062932 0 -0.326849 0 0 0 9.7536 0.1363 +2.5 0.270105 0.004222 0.062187 0.066409 0 -0.358073 0 0 0 9.7536 0.1346 +3 0.296727 0.005065 0.064045 0.06911 0 -0.389217 0 0 0 9.7536 0.1333 +3.5 0.323284 0.006002 0.066155 0.072157 0 -0.420274 0 0 0 9.7536 0.1321 +4 0.34977 0.007031 0.070139 0.07717 0 -0.451235 0 0 0 9.7536 0.1312 \ No newline at end of file diff --git a/XFLR Outputs/FDR010.out b/xflr/outputs/FDR010 2.txt similarity index 100% rename from XFLR Outputs/FDR010.out rename to xflr/outputs/FDR010 2.txt diff --git a/XFLR Outputs/FDR010.txt b/xflr/outputs/FDR010.out similarity index 100% rename from XFLR Outputs/FDR010.txt rename to xflr/outputs/FDR010.out diff --git a/xflr/outputs/FDR010.txt b/xflr/outputs/FDR010.txt new file mode 100755 index 0000000..d8800b8 --- /dev/null +++ b/xflr/outputs/FDR010.txt @@ -0,0 +1,24 @@ + + QFLR5 v0.04 Beta + +Wing name : FDR010s +Wing polar name : T1-32.0 ft/s-VLM2- 0.00ft +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.116962 0.001621 0.051031 0.052652 -0.000000 -0.178726 -0.000000 0.000000 -0.000000 9.7536 0.1726 + -0.500 0.143347 0.002042 0.056144 0.058186 0.000000 -0.207479 0.000000 0.000000 0.000000 9.7536 0.1635 + 0.000 0.169707 0.002565 0.058118 0.060682 -0.000000 -0.236203 -0.000000 0.000000 0.000000 9.7536 0.1572 + 0.500 0.196033 0.003189 0.059796 0.062985 -0.000000 -0.264890 0.000000 0.000000 0.000000 9.7536 0.1526 + 1.000 0.222318 0.003914 0.063433 0.067347 -0.000000 -0.293535 -0.000000 0.000000 0.000000 9.7536 0.1491 + 1.500 0.248556 0.004739 0.064884 0.069623 -0.000000 -0.322125 0.000000 0.000000 0.000000 9.7536 0.1464 + 2.000 0.274738 0.005665 0.066241 0.071906 0.000000 -0.350652 -0.000000 0.000000 -0.000000 9.7536 0.1442 + 2.500 0.300858 0.006689 0.067503 0.074192 0.000000 -0.379109 -0.000000 0.000000 0.000000 9.7536 0.1424 + 3.000 0.326908 0.007813 0.068834 0.076647 0.000000 -0.407487 -0.000000 0.000000 0.000000 9.7536 0.1410 + 3.500 0.352881 0.009034 0.070760 0.079794 0.000000 -0.435777 -0.000000 0.000000 -0.000000 9.7536 0.1397 + 4.000 0.378770 0.010353 0.075051 0.085405 0.000000 -0.463973 0.000000 0.000000 0.000000 9.7536 0.1387 + 4.500 0.404568 0.011768 0.082388 0.094156 -0.000000 -0.492068 -0.000000 0.000000 0.000000 9.7536 0.1378 + 5.000 0.430268 0.013279 0.082849 0.096128 0.000000 -0.520042 0.000000 0.000000 0.000000 9.7536 0.1370 + + diff --git a/XFLR Outputs/FDR012.txt b/xflr/outputs/FDR012 2.txt similarity index 100% rename from XFLR Outputs/FDR012.txt rename to xflr/outputs/FDR012 2.txt diff --git a/xflr/outputs/FDR012.txt b/xflr/outputs/FDR012.txt new file mode 100755 index 0000000..6cfdae2 --- /dev/null +++ b/xflr/outputs/FDR012.txt @@ -0,0 +1,17 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR012 +Wing polar name : T1-32.0 ft/s-VLM2- 0.00ft-Inviscid +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + 0.000 0.144128 0.001339 0.000000 0.001339 0.000000 -0.198932 -0.000000 -0.000000 -0.000000 9.7536 0.1202 + 1.000 0.202051 0.002148 0.000000 0.002148 0.000000 -0.262090 0.000000 0.000000 0.000000 9.7536 0.1130 + 2.000 0.259825 0.003355 0.000000 0.003355 0.000000 -0.325051 -0.000000 -0.000000 -0.000000 9.7536 0.1091 + 3.000 0.317389 0.004957 0.000000 0.004957 -0.000000 -0.387737 -0.000000 -0.000000 -0.000000 9.7536 0.1066 + 4.000 0.374686 0.006950 0.000000 0.006950 0.000000 -0.450073 0.000000 0.000000 0.000000 9.7536 0.1049 + 5.000 0.431657 0.009328 0.000000 0.009328 0.000000 -0.511982 -0.000000 -0.000000 -0.000000 9.7536 0.1037 + + diff --git a/XFLR Outputs/FDR013.txt b/xflr/outputs/FDR013 2.txt similarity index 100% rename from XFLR Outputs/FDR013.txt rename to xflr/outputs/FDR013 2.txt diff --git a/XFLR Outputs/FDR013.out b/xflr/outputs/FDR013.out similarity index 100% rename from XFLR Outputs/FDR013.out rename to xflr/outputs/FDR013.out diff --git a/xflr/outputs/FDR013.txt b/xflr/outputs/FDR013.txt new file mode 100755 index 0000000..0bf1412 --- /dev/null +++ b/xflr/outputs/FDR013.txt @@ -0,0 +1,17 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR013 +Wing polar name : T1-32.0 ft/s-VLM2- 0.00ft-Inviscid +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + 0.000 0.197841 0.002619 0.000000 0.002619 0.000000 -0.267136 -0.000000 -0.000000 -0.000000 9.7536 0.1217 + 1.000 0.254737 0.004020 0.000000 0.004020 -0.000000 -0.327464 -0.000000 -0.000000 -0.000000 9.7536 0.1159 + 2.000 0.311422 0.005817 0.000000 0.005817 0.000000 -0.387557 -0.000000 0.000000 0.000000 9.7536 0.1123 + 3.000 0.367837 0.008003 0.000000 0.008003 0.000000 -0.447341 0.000000 -0.000000 -0.000000 9.7536 0.1098 + 4.000 0.423924 0.010575 0.000000 0.010575 -0.000000 -0.506744 -0.000000 -0.000000 -0.000000 9.7536 0.1080 + 5.000 0.479626 0.013523 0.000000 0.013523 -0.000000 -0.565693 0.000000 -0.000000 -0.000000 9.7536 0.1067 + + diff --git a/XFLR Outputs/FDR020.out b/xflr/outputs/FDR020 2.txt similarity index 100% rename from XFLR Outputs/FDR020.out rename to xflr/outputs/FDR020 2.txt diff --git a/XFLR Outputs/FDR020.txt b/xflr/outputs/FDR020.out similarity index 100% rename from XFLR Outputs/FDR020.txt rename to xflr/outputs/FDR020.out diff --git a/xflr/outputs/FDR020.txt b/xflr/outputs/FDR020.txt new file mode 100755 index 0000000..5dc4375 --- /dev/null +++ b/xflr/outputs/FDR020.txt @@ -0,0 +1,15 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR020 +Wing polar name : T1-32.0 ft/s-Panel- 0.31ft +Freestream speed : 32.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + 0.000 0.084447 0.000837 0.042292 0.043129 -0.000000 -0.036884 0.000000 -0.000000 -0.000000 9.7536 0.1450 + 1.000 0.121470 0.001267 0.048979 0.050246 0.000000 -0.036566 0.000000 -0.000000 -0.000000 9.7536 0.1286 + 2.000 0.158434 0.001864 0.053171 0.055035 -0.000000 -0.036226 0.000000 -0.000000 0.000000 9.7536 0.1198 + 3.000 0.195321 0.002624 0.058185 0.060809 -0.000000 -0.035866 0.000000 -0.000000 0.000000 9.7536 0.1144 + + diff --git a/XFLR Outputs/PDR001.out b/xflr/outputs/PDR001 2.txt similarity index 100% rename from XFLR Outputs/PDR001.out rename to xflr/outputs/PDR001 2.txt diff --git a/XFLR Outputs/PDR001.txt b/xflr/outputs/PDR001.out similarity index 100% rename from XFLR Outputs/PDR001.txt rename to xflr/outputs/PDR001.out diff --git a/xflr/outputs/PDR001.txt b/xflr/outputs/PDR001.txt new file mode 100755 index 0000000..31e4d15 --- /dev/null +++ b/xflr/outputs/PDR001.txt @@ -0,0 +1,15 @@ + + QFLR5 v0.04 Beta + +Wing name : whole damn thing scaled +Wing polar name : T1-16.0 ft/s-VLM2- 0.00ft +Freestream speed : 16.000 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -0.500 0.141086 0.003049 0.059669 0.062717 0.000000 -0.216817 -0.000000 -0.000000 0.000000 4.8768 0.1839 + 0.000 0.167846 0.003683 0.068042 0.071725 -0.000000 -0.245851 0.000000 -0.000000 -0.000000 4.8768 0.1752 + 0.500 0.194566 0.004440 0.071442 0.075882 -0.000000 -0.274840 0.000000 -0.000000 -0.000000 4.8768 0.1690 + 1.000 0.221238 0.005319 0.074465 0.079784 -0.000000 -0.303781 0.000000 -0.000000 -0.000000 4.8768 0.1643 + + diff --git a/XFLR Outputs/T1-105.0 ft s-VLM2- 0.out b/xflr/outputs/T1-105.0 ft s-VLM2- 0 2.txt similarity index 100% rename from XFLR Outputs/T1-105.0 ft s-VLM2- 0.out rename to xflr/outputs/T1-105.0 ft s-VLM2- 0 2.txt diff --git a/XFLR Outputs/T1-105.0 ft s-VLM2- 0.txt b/xflr/outputs/T1-105.0 ft s-VLM2- 0.out similarity index 100% rename from XFLR Outputs/T1-105.0 ft s-VLM2- 0.txt rename to xflr/outputs/T1-105.0 ft s-VLM2- 0.out diff --git a/xflr/outputs/T1-105.0 ft s-VLM2- 0.txt b/xflr/outputs/T1-105.0 ft s-VLM2- 0.txt new file mode 100755 index 0000000..9ba8280 --- /dev/null +++ b/xflr/outputs/T1-105.0 ft s-VLM2- 0.txt @@ -0,0 +1,18 @@ + + QFLR5 v0.04 Beta + +Wing name : sFDR012 +Wing polar name : T1-105.0 ft/s-VLM2- 0.00ft-Inviscid +Freestream speed : 104.990 ft/s + + alpha CL ICd PCd TCd CY Cm Rm Ym IYm QInf XCP + _________ ________ ________ _________ _________ _________ _________ _________ _________ _________ _________ _________ + -1.000 0.086115 0.000931 0.000000 0.000931 0.000000 -0.135653 -0.000000 0.000000 0.000000 32.0010 0.1373 + 0.000 0.144128 0.001339 0.000000 0.001339 -0.000000 -0.198932 0.000000 0.000000 0.000000 32.0010 0.1202 + 1.000 0.202051 0.002148 0.000000 0.002148 -0.000000 -0.262090 -0.000000 -0.000000 -0.000000 32.0010 0.1130 + 2.000 0.259825 0.003355 0.000000 0.003355 -0.000000 -0.325051 0.000000 -0.000000 -0.000000 32.0010 0.1091 + 3.000 0.317390 0.004957 0.000000 0.004957 -0.000000 -0.387737 -0.000000 0.000000 0.000000 32.0010 0.1066 + 4.000 0.374686 0.006950 0.000000 0.006950 -0.000000 -0.450073 -0.000000 0.000000 0.000000 32.0010 0.1049 + 5.000 0.431657 0.009328 0.000000 0.009328 -0.000000 -0.511982 0.000000 -0.000000 -0.000000 32.0010 0.1037 + + diff --git a/XFLR Outputs/Trade Study planform/.DS_Store b/xflr/outputs/Trade Study planform/.DS_Store similarity index 100% rename from XFLR Outputs/Trade Study planform/.DS_Store rename to xflr/outputs/Trade Study planform/.DS_Store diff --git a/XFLR Outputs/Trade Study planform/FDR001.out b/xflr/outputs/Trade Study planform/FDR001.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR001.out rename to xflr/outputs/Trade Study planform/FDR001.out diff --git a/XFLR Outputs/Trade Study planform/FDR001.param b/xflr/outputs/Trade Study planform/FDR001.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR001.param rename to xflr/outputs/Trade Study planform/FDR001.param diff --git a/XFLR Outputs/Trade Study planform/FDR001.plan b/xflr/outputs/Trade Study planform/FDR001.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR001.plan rename to xflr/outputs/Trade Study planform/FDR001.plan diff --git a/XFLR Outputs/Trade Study planform/FDR001grimlite.tiff b/xflr/outputs/Trade Study planform/FDR001grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR001grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR001grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR001grimlite.tiff b/xflr/outputs/Trade Study planform/FDR001grimlite.tiff new file mode 100755 index 0000000..996403e Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR001grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR001grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR001grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR001grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR001grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR001grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR001grimliteoutput.txt new file mode 100755 index 0000000..a7ebab4 --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR001grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR001--------------------------------------------------- +Wingspan: 140.000000, AR: 4.816577, Planform Area: 4069.280000, Wetted Area: 8408.002654 + +----------Takeoff-------------------------------- + alfa: 9.392178, Cd0: 0.005688, CL: 0.662962, CD: 0.041996, CM: -0.788707, L/D: 15.786333 + +----------Cruise--------------------------------- + alfa: 0.688827, Cd0: 0.004598, CL: 0.175574, CD: 0.007145, CM: -0.240396, L/D: 24.573681 + +----------Loiter--------------------------------- + alfa: 3.765730, Cd0: 0.005328, CL: 0.347881, CD: 0.015325, CM: -0.434241, L/D: 22.699622 + +----------Landing-------------------------------- + alfa: 7.172439, Cd0: 0.005688, CL: 0.538657, CD: 0.029657, CM: -0.648864, L/D: 18.162885 diff --git a/XFLR Outputs/Trade Study planform/FDR002.out b/xflr/outputs/Trade Study planform/FDR002.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR002.out rename to xflr/outputs/Trade Study planform/FDR002.out diff --git a/XFLR Outputs/Trade Study planform/FDR002.param b/xflr/outputs/Trade Study planform/FDR002.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR002.param rename to xflr/outputs/Trade Study planform/FDR002.param diff --git a/XFLR Outputs/Trade Study planform/FDR002.plan b/xflr/outputs/Trade Study planform/FDR002.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR002.plan rename to xflr/outputs/Trade Study planform/FDR002.plan diff --git a/XFLR Outputs/Trade Study planform/FDR002grimlite.tiff b/xflr/outputs/Trade Study planform/FDR002grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR002grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR002grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR002grimlite.tiff b/xflr/outputs/Trade Study planform/FDR002grimlite.tiff new file mode 100755 index 0000000..fa3b0b7 Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR002grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR002grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR002grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR002grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR002grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR002grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR002grimliteoutput.txt new file mode 100755 index 0000000..04b219b --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR002grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR002--------------------------------------------------- +Wingspan: 160.000000, AR: 6.122637, Planform Area: 4181.205000, Wetted Area: 8638.340407 + +----------Takeoff-------------------------------- + alfa: 8.793252, Cd0: 0.005750, CL: 0.645215, CD: 0.032804, CM: -0.791355, L/D: 19.668736 + +----------Cruise--------------------------------- + alfa: 0.471481, Cd0: 0.004640, CL: 0.170874, CD: 0.006538, CM: -0.242118, L/D: 26.135980 + +----------Loiter--------------------------------- + alfa: 3.413484, Cd0: 0.005383, CL: 0.338569, CD: 0.012832, CM: -0.436290, L/D: 26.383862 + +----------Landing-------------------------------- + alfa: 6.670833, Cd0: 0.005750, CL: 0.524237, CD: 0.023610, CM: -0.651275, L/D: 22.204057 diff --git a/XFLR Outputs/Trade Study planform/FDR003.out b/xflr/outputs/Trade Study planform/FDR003.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR003.out rename to xflr/outputs/Trade Study planform/FDR003.out diff --git a/XFLR Outputs/Trade Study planform/FDR003.param b/xflr/outputs/Trade Study planform/FDR003.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR003.param rename to xflr/outputs/Trade Study planform/FDR003.param diff --git a/XFLR Outputs/Trade Study planform/FDR003.plan b/xflr/outputs/Trade Study planform/FDR003.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR003.plan rename to xflr/outputs/Trade Study planform/FDR003.plan diff --git a/XFLR Outputs/Trade Study planform/FDR003grimlite.tiff b/xflr/outputs/Trade Study planform/FDR003grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR003grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR003grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR003grimlite.tiff b/xflr/outputs/Trade Study planform/FDR003grimlite.tiff new file mode 100755 index 0000000..40cb343 Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR003grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR003grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR003grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR003grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR003grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR003grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR003grimliteoutput.txt new file mode 100755 index 0000000..64a957c --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR003grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR003--------------------------------------------------- +Wingspan: 160.000000, AR: 6.122637, Planform Area: 4181.205000, Wetted Area: 8638.340407 + +----------Takeoff-------------------------------- + alfa: 8.793252, Cd0: 0.005750, CL: 0.645215, CD: 0.032804, CM: -0.791355, L/D: 19.668736 + +----------Cruise--------------------------------- + alfa: 0.471481, Cd0: 0.004640, CL: 0.170874, CD: 0.006538, CM: -0.242118, L/D: 26.135980 + +----------Loiter--------------------------------- + alfa: 3.413484, Cd0: 0.005383, CL: 0.338569, CD: 0.012832, CM: -0.436290, L/D: 26.383862 + +----------Landing-------------------------------- + alfa: 6.670833, Cd0: 0.005750, CL: 0.524237, CD: 0.023610, CM: -0.651275, L/D: 22.204057 diff --git a/XFLR Outputs/Trade Study planform/FDR004.out b/xflr/outputs/Trade Study planform/FDR004.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR004.out rename to xflr/outputs/Trade Study planform/FDR004.out diff --git a/XFLR Outputs/Trade Study planform/FDR004.param b/xflr/outputs/Trade Study planform/FDR004.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR004.param rename to xflr/outputs/Trade Study planform/FDR004.param diff --git a/XFLR Outputs/Trade Study planform/FDR004.plan b/xflr/outputs/Trade Study planform/FDR004.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR004.plan rename to xflr/outputs/Trade Study planform/FDR004.plan diff --git a/XFLR Outputs/Trade Study planform/FDR004grimlite.tiff b/xflr/outputs/Trade Study planform/FDR004grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR004grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR004grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR004grimlite.tiff b/xflr/outputs/Trade Study planform/FDR004grimlite.tiff new file mode 100755 index 0000000..9af0c69 Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR004grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR004grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR004grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR004grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR004grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR004grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR004grimliteoutput.txt new file mode 100755 index 0000000..ccfa63a --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR004grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR004--------------------------------------------------- +Wingspan: 160.000000, AR: 6.122637, Planform Area: 4181.205000, Wetted Area: 8638.340407 + +----------Takeoff-------------------------------- + alfa: 8.985989, Cd0: 0.005750, CL: 0.645215, CD: 0.032804, CM: -0.793089, L/D: 19.668736 + +----------Cruise--------------------------------- + alfa: 0.515615, Cd0: 0.004640, CL: 0.170874, CD: 0.006538, CM: -0.242515, L/D: 26.135980 + +----------Loiter--------------------------------- + alfa: 3.510154, Cd0: 0.005383, CL: 0.338569, CD: 0.012832, CM: -0.437160, L/D: 26.383862 + +----------Landing-------------------------------- + alfa: 6.825670, Cd0: 0.005750, CL: 0.524237, CD: 0.023610, CM: -0.652669, L/D: 22.204057 diff --git a/XFLR Outputs/Trade Study planform/FDR005.out b/xflr/outputs/Trade Study planform/FDR005.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR005.out rename to xflr/outputs/Trade Study planform/FDR005.out diff --git a/XFLR Outputs/Trade Study planform/FDR005.param b/xflr/outputs/Trade Study planform/FDR005.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR005.param rename to xflr/outputs/Trade Study planform/FDR005.param diff --git a/XFLR Outputs/Trade Study planform/FDR005.plan b/xflr/outputs/Trade Study planform/FDR005.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR005.plan rename to xflr/outputs/Trade Study planform/FDR005.plan diff --git a/XFLR Outputs/Trade Study planform/FDR005grimlite.tiff b/xflr/outputs/Trade Study planform/FDR005grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR005grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR005grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR005grimlite.tiff b/xflr/outputs/Trade Study planform/FDR005grimlite.tiff new file mode 100755 index 0000000..5a1627d Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR005grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR005grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR005grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR005grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR005grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR005grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR005grimliteoutput.txt new file mode 100755 index 0000000..888268d --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR005grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR005--------------------------------------------------- +Wingspan: 160.000000, AR: 6.122637, Planform Area: 4181.205000, Wetted Area: 8638.340407 + +----------Takeoff-------------------------------- + alfa: 8.985989, Cd0: 0.005750, CL: 0.645215, CD: 0.032804, CM: -0.753131, L/D: 19.668736 + +----------Cruise--------------------------------- + alfa: 0.515615, Cd0: 0.004640, CL: 0.170874, CD: 0.006538, CM: -0.227968, L/D: 26.135980 + +----------Loiter--------------------------------- + alfa: 3.510154, Cd0: 0.005383, CL: 0.338569, CD: 0.012832, CM: -0.413630, L/D: 26.383862 + +----------Landing-------------------------------- + alfa: 6.825670, Cd0: 0.005750, CL: 0.524237, CD: 0.023610, CM: -0.619192, L/D: 22.204057 diff --git a/XFLR Outputs/Trade Study planform/FDR006.out b/xflr/outputs/Trade Study planform/FDR006.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR006.out rename to xflr/outputs/Trade Study planform/FDR006.out diff --git a/XFLR Outputs/Trade Study planform/FDR006.param b/xflr/outputs/Trade Study planform/FDR006.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR006.param rename to xflr/outputs/Trade Study planform/FDR006.param diff --git a/XFLR Outputs/Trade Study planform/FDR006.plan b/xflr/outputs/Trade Study planform/FDR006.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR006.plan rename to xflr/outputs/Trade Study planform/FDR006.plan diff --git a/XFLR Outputs/Trade Study planform/FDR006grimlite.tiff b/xflr/outputs/Trade Study planform/FDR006grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR006grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR006grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR006grimlite.tiff b/xflr/outputs/Trade Study planform/FDR006grimlite.tiff new file mode 100755 index 0000000..ab0116f Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR006grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR006grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR006grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR006grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR006grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR006grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR006grimliteoutput.txt new file mode 100755 index 0000000..ae8f060 --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR006grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR006--------------------------------------------------- +Wingspan: 160.000000, AR: 5.372164, Planform Area: 4765.305000, Wetted Area: 9841.204819 + +----------Takeoff-------------------------------- + alfa: 7.300510, Cd0: 0.005716, CL: 0.566129, CD: 0.029454, CM: -0.726435, L/D: 19.220819 + +----------Cruise--------------------------------- + alfa: -0.001232, Cd0: 0.004619, CL: 0.149930, CD: 0.006284, CM: -0.229916, L/D: 23.859484 + +----------Loiter--------------------------------- + alfa: 2.580159, Cd0: 0.005354, CL: 0.297069, CD: 0.011890, CM: -0.405451, L/D: 24.985343 + +----------Landing-------------------------------- + alfa: 5.438244, Cd0: 0.005716, CL: 0.459980, CD: 0.021387, CM: -0.599801, L/D: 21.507670 diff --git a/XFLR Outputs/Trade Study planform/FDR007.out b/xflr/outputs/Trade Study planform/FDR007.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR007.out rename to xflr/outputs/Trade Study planform/FDR007.out diff --git a/XFLR Outputs/Trade Study planform/FDR007.param b/xflr/outputs/Trade Study planform/FDR007.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR007.param rename to xflr/outputs/Trade Study planform/FDR007.param diff --git a/XFLR Outputs/Trade Study planform/FDR007.plan b/xflr/outputs/Trade Study planform/FDR007.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR007.plan rename to xflr/outputs/Trade Study planform/FDR007.plan diff --git a/XFLR Outputs/Trade Study planform/FDR007grimlite.tiff b/xflr/outputs/Trade Study planform/FDR007grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR007grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR007grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR007grimlite.tiff b/xflr/outputs/Trade Study planform/FDR007grimlite.tiff new file mode 100755 index 0000000..510fd99 Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR007grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR007grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR007grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR007grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR007grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR007grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR007grimliteoutput.txt new file mode 100755 index 0000000..b069c4d --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR007grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR007--------------------------------------------------- +Wingspan: 160.000000, AR: 5.961418, Planform Area: 4294.280000, Wetted Area: 8871.044819 + +----------Takeoff-------------------------------- + alfa: 8.245274, Cd0: 0.005754, CL: 0.628226, CD: 0.032095, CM: -0.830660, L/D: 19.573691 + +----------Cruise--------------------------------- + alfa: 0.282329, Cd0: 0.004644, CL: 0.166375, CD: 0.006491, CM: -0.257328, L/D: 25.631038 + +----------Loiter--------------------------------- + alfa: 3.097476, Cd0: 0.005387, CL: 0.329654, CD: 0.012640, CM: -0.460018, L/D: 26.080567 + +----------Landing-------------------------------- + alfa: 6.214371, Cd0: 0.005754, CL: 0.510434, CD: 0.023143, CM: -0.684435, L/D: 22.055258 diff --git a/XFLR Outputs/Trade Study planform/FDR008.out b/xflr/outputs/Trade Study planform/FDR008.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR008.out rename to xflr/outputs/Trade Study planform/FDR008.out diff --git a/XFLR Outputs/Trade Study planform/FDR008.param b/xflr/outputs/Trade Study planform/FDR008.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR008.param rename to xflr/outputs/Trade Study planform/FDR008.param diff --git a/XFLR Outputs/Trade Study planform/FDR008.plan b/xflr/outputs/Trade Study planform/FDR008.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR008.plan rename to xflr/outputs/Trade Study planform/FDR008.plan diff --git a/XFLR Outputs/Trade Study planform/FDR008grimlite.tiff b/xflr/outputs/Trade Study planform/FDR008grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR008grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR008grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR008grimlite.tiff b/xflr/outputs/Trade Study planform/FDR008grimlite.tiff new file mode 100755 index 0000000..f997a25 Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR008grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR008grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR008grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR008grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR008grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR008grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR008grimliteoutput.txt new file mode 100755 index 0000000..608c881 --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR008grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR008--------------------------------------------------- +Wingspan: 160.000000, AR: 5.961418, Planform Area: 4294.280000, Wetted Area: 8871.044819 + +----------Takeoff-------------------------------- + alfa: 8.245274, Cd0: 0.005754, CL: 0.628226, CD: 0.032095, CM: -0.830660, L/D: 19.573691 + +----------Cruise--------------------------------- + alfa: 0.282329, Cd0: 0.004644, CL: 0.166375, CD: 0.006491, CM: -0.257328, L/D: 25.631038 + +----------Loiter--------------------------------- + alfa: 3.097476, Cd0: 0.005387, CL: 0.329654, CD: 0.012640, CM: -0.460018, L/D: 26.080567 + +----------Landing-------------------------------- + alfa: 6.214371, Cd0: 0.005754, CL: 0.510434, CD: 0.023143, CM: -0.684435, L/D: 22.055258 diff --git a/XFLR Outputs/Trade Study planform/FDR009.out b/xflr/outputs/Trade Study planform/FDR009.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR009.out rename to xflr/outputs/Trade Study planform/FDR009.out diff --git a/XFLR Outputs/Trade Study planform/FDR009.param b/xflr/outputs/Trade Study planform/FDR009.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR009.param rename to xflr/outputs/Trade Study planform/FDR009.param diff --git a/XFLR Outputs/Trade Study planform/FDR009.plan b/xflr/outputs/Trade Study planform/FDR009.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR009.plan rename to xflr/outputs/Trade Study planform/FDR009.plan diff --git a/XFLR Outputs/Trade Study planform/FDR009grimlite.tiff b/xflr/outputs/Trade Study planform/FDR009grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR009grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR009grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR009grimlite.tiff b/xflr/outputs/Trade Study planform/FDR009grimlite.tiff new file mode 100755 index 0000000..00e914b Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR009grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR009grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR009grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR009grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR009grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR009grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR009grimliteoutput.txt new file mode 100755 index 0000000..4c70ecd --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR009grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR009--------------------------------------------------- +Wingspan: 160.000000, AR: 5.478266, Planform Area: 4673.011400, Wetted Area: 9654.410650 + +----------Takeoff-------------------------------- + alfa: 8.326610, Cd0: 0.005645, CL: 0.577310, CD: 0.029852, CM: -0.717250, L/D: 19.339016 + +----------Cruise--------------------------------- + alfa: 0.318697, Cd0: 0.004567, CL: 0.152891, CD: 0.006265, CM: -0.220759, L/D: 24.404627 + +----------Loiter--------------------------------- + alfa: 3.149741, Cd0: 0.005289, CL: 0.302936, CD: 0.011955, CM: -0.396284, L/D: 25.340758 + +----------Landing-------------------------------- + alfa: 6.284239, Cd0: 0.005645, CL: 0.469065, CD: 0.021626, CM: -0.590623, L/D: 21.690241 diff --git a/XFLR Outputs/Trade Study planform/FDR010.out b/xflr/outputs/Trade Study planform/FDR010.out similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR010.out rename to xflr/outputs/Trade Study planform/FDR010.out diff --git a/XFLR Outputs/Trade Study planform/FDR010.param b/xflr/outputs/Trade Study planform/FDR010.param similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR010.param rename to xflr/outputs/Trade Study planform/FDR010.param diff --git a/XFLR Outputs/Trade Study planform/FDR010.plan b/xflr/outputs/Trade Study planform/FDR010.plan similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR010.plan rename to xflr/outputs/Trade Study planform/FDR010.plan diff --git a/XFLR Outputs/Trade Study planform/FDR010grimlite.tiff b/xflr/outputs/Trade Study planform/FDR010grimlite 2.tiff similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR010grimlite.tiff rename to xflr/outputs/Trade Study planform/FDR010grimlite 2.tiff diff --git a/xflr/outputs/Trade Study planform/FDR010grimlite.tiff b/xflr/outputs/Trade Study planform/FDR010grimlite.tiff new file mode 100755 index 0000000..5957fe0 Binary files /dev/null and b/xflr/outputs/Trade Study planform/FDR010grimlite.tiff differ diff --git a/XFLR Outputs/Trade Study planform/FDR010grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR010grimliteoutput 2.txt similarity index 100% rename from XFLR Outputs/Trade Study planform/FDR010grimliteoutput.txt rename to xflr/outputs/Trade Study planform/FDR010grimliteoutput 2.txt diff --git a/xflr/outputs/Trade Study planform/FDR010grimliteoutput.txt b/xflr/outputs/Trade Study planform/FDR010grimliteoutput.txt new file mode 100755 index 0000000..4f232e7 --- /dev/null +++ b/xflr/outputs/Trade Study planform/FDR010grimliteoutput.txt @@ -0,0 +1,14 @@ +FDR010--------------------------------------------------- +Wingspan: 160.020000, AR: 4.351054, Planform Area: 5885.103300, Wetted Area: 12255.124748 + +----------Takeoff-------------------------------- + alfa: 5.546306, Cd0: 0.005524, CL: 0.458408, CD: 0.024740, CM: -0.546593, L/D: 18.529145 + +----------Cruise--------------------------------- + alfa: -0.934584, Cd0: 0.004487, CL: 0.121402, CD: 0.005835, CM: -0.183663, L/D: 20.806322 + +----------Loiter--------------------------------- + alfa: 1.356610, Cd0: 0.005182, CL: 0.240544, CD: 0.010473, CM: -0.311970, L/D: 22.967682 + +----------Landing-------------------------------- + alfa: 3.893393, Cd0: 0.005524, CL: 0.372456, CD: 0.018209, CM: -0.454030, L/D: 20.454199 diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR001.param b/xflr/outputs/Trade Study planform/Old Param/FDR001.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR001.param rename to xflr/outputs/Trade Study planform/Old Param/FDR001.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR002.param b/xflr/outputs/Trade Study planform/Old Param/FDR002.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR002.param rename to xflr/outputs/Trade Study planform/Old Param/FDR002.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR003.param b/xflr/outputs/Trade Study planform/Old Param/FDR003.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR003.param rename to xflr/outputs/Trade Study planform/Old Param/FDR003.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR004.param b/xflr/outputs/Trade Study planform/Old Param/FDR004.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR004.param rename to xflr/outputs/Trade Study planform/Old Param/FDR004.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR005.param b/xflr/outputs/Trade Study planform/Old Param/FDR005.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR005.param rename to xflr/outputs/Trade Study planform/Old Param/FDR005.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR006.param b/xflr/outputs/Trade Study planform/Old Param/FDR006.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR006.param rename to xflr/outputs/Trade Study planform/Old Param/FDR006.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR007.param b/xflr/outputs/Trade Study planform/Old Param/FDR007.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR007.param rename to xflr/outputs/Trade Study planform/Old Param/FDR007.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR008.param b/xflr/outputs/Trade Study planform/Old Param/FDR008.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR008.param rename to xflr/outputs/Trade Study planform/Old Param/FDR008.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR009.param b/xflr/outputs/Trade Study planform/Old Param/FDR009.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR009.param rename to xflr/outputs/Trade Study planform/Old Param/FDR009.param diff --git a/XFLR Outputs/Trade Study planform/Old Param/FDR010.param b/xflr/outputs/Trade Study planform/Old Param/FDR010.param similarity index 100% rename from XFLR Outputs/Trade Study planform/Old Param/FDR010.param rename to xflr/outputs/Trade Study planform/Old Param/FDR010.param diff --git a/xflr/outputs/Trade Study planform/Thumbs.db b/xflr/outputs/Trade Study planform/Thumbs.db new file mode 100755 index 0000000..7ed913b Binary files /dev/null and b/xflr/outputs/Trade Study planform/Thumbs.db differ diff --git a/XFLR Project Files/mohammad funtime.xlsx b/xflr/outputs/mohammad funtime.xlsx similarity index 100% rename from XFLR Project Files/mohammad funtime.xlsx rename to xflr/outputs/mohammad funtime.xlsx diff --git a/XFLR Project Files/FDR013.wpa b/xflr/projects/FDR013.wpa similarity index 100% rename from XFLR Project Files/FDR013.wpa rename to xflr/projects/FDR013.wpa diff --git a/XFLR Project Files/FDR020.wpa b/xflr/projects/FDR020.wpa similarity index 100% rename from XFLR Project Files/FDR020.wpa rename to xflr/projects/FDR020.wpa diff --git a/XFLR Project Files/trade study copy.wpa b/xflr/projects/trade study copy.wpa similarity index 100% rename from XFLR Project Files/trade study copy.wpa rename to xflr/projects/trade study copy.wpa diff --git a/XFLR Project Files/trade study.wpa b/xflr/projects/trade study.wpa similarity index 100% rename from XFLR Project Files/trade study.wpa rename to xflr/projects/trade study.wpa diff --git a/XFLR Project Files/whatthehellamidoing.wpa b/xflr/projects/whatthehellamidoing.wpa similarity index 100% rename from XFLR Project Files/whatthehellamidoing.wpa rename to xflr/projects/whatthehellamidoing.wpa diff --git a/XFLR Project Files/whatthehellamidoing2.wpa b/xflr/projects/whatthehellamidoing2.wpa similarity index 100% rename from XFLR Project Files/whatthehellamidoing2.wpa rename to xflr/projects/whatthehellamidoing2.wpa