Merge pull request #232 from suavecode/develop

1.1 Merge into Master
suavecode · Apr 11, 2018 · c178c43 · c178c43
2 parents 91e5d85 + c56ba5c
commit c178c43
Show file tree

Hide file tree

Showing 275 changed files with 8,701 additions and 4,180 deletions.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,12 @@
+# Pull Request Checklist
+ * Merge in the latest Develop branch changes to your branch
+ * Remove .pyc files from your repository:
+   * Linux/Mac
+     * find . -name *.pyc -delete
+   * Windows
+     * del /S *.pyc
+ * Run automatic regression and makes sure everything is passing
+ * Did you make a new regression test that covers your new code?
+ * Did you update your docstrings?
+ * Did you update your headers to include your name and date?
+ * Do a final compare with the Develop branch to be sure what you're changing
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Its purpose is to credibly produce conceptual-level design conclusions
 for future aircraft incorporating advanced technologies.
 
 [![Build Status](https://travis-ci.org/suavecode/SUAVE.svg?branch=master)](https://travis-ci.org/suavecode/SUAVE)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.239361.svg)](https://doi.org/10.5281/zenodo.239361)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.842938.svg)](https://doi.org/10.5281/zenodo.842938)
 
 License: LGPL-2.1
 
@@ -29,12 +29,14 @@ Contributing Developers
 * Michael Colonno
 * Michael Kruger
 * Michael Vegh
+* Pedro Gonçalves
 * Rick Fenrich
 * Tarik Orra
 * Tim MacDonald
 * Tim Momose
 * Tom Economon
 * Trent Lukaczyk
+* Walter Maier
 
 Contributing Institutions
 -------------------------

diff --git a/doc/PULL_REQUEST_TEMPLATE.md b/doc/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+# # Pull Request Checklist
+
+ * Merge in the latest Develop branch changes to your branch
+ * Remove .pyc files from your repository: 
+  * Linux/Mac
+     * find . -name \*.pyc -delete
+  * Windows
+     * del /S *.pyc
+ * Run automatic regression and makes sure everything is passing
+ * Did you make a new regression test that covers your new code?
+ * Did you update your docstrings?
+ * Did you update your headers to include your name and date?
+ * Do a final compare with the Develop branch to be sure what you're changing
diff --git a/regression/automatic_regression.py b/regression/automatic_regression.py
@@ -3,6 +3,7 @@
 # Created:  Jun 2014, T. Lukaczyk
 # Modified: Jun 2014, SUAVE Team
 #           Jul 2017, SUAVE Team
+#           Jan 2018, SUAVE Team
 
 # ----------------------------------------------------------------------
 #   Imports
@@ -26,7 +27,6 @@
 #
 # For more information, see ../templates/example_test_script.py
 
-
 # ----------------------------------------------------------------------
 #   The Modules to Test
 # ----------------------------------------------------------------------
@@ -64,6 +64,9 @@
     'scripts/Regional_Jet_Optimization/Optimize2.py',
     'scripts/industrial_costs/industrial_costs.py',
     'scripts/sizing_loop/sizing_loop.py',
+    'scripts/ramjet_network/ramjet_network.py',
+    'scripts/lifting_line/lifting_line.py',
+    'scripts/sweeps/test_sweeps.py',
 ]
 
 

diff --git a/regression/scripts/AVL/avl_files/aircraft.avl b/regression/scripts/AVL/avl_files/aircraft.avl
@@ -0,0 +1,167 @@
+cruise
+#Mach
+ 0.0
+#Iysym   IZsym   Zsym
+  0      0     0.0
+
+#Sref    Cref    Bref 	<meters>
+124.862      4.235     34.32
+
+#Xref    Yref    Zref   <meters>
+15.30987849      0.0     -0.48023939
+
+
+
+#---------------------------------------------------------
+SURFACE
+horizontal_stabilizer
+#Nchordwise  Cspace   Nspanwise  Sspace
+20         1.0         11.0      1.0
+
+YDUPLICATE
+0.0
+
+
+SECTION
+#Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+32.83  0    1.14    4.7    0.0523598775598     
+
+SECTION
+#Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+38.7876073814  7.1    1.14    0.955    0.0523598775598     
+
+
+#---------------------------------------------------------
+SURFACE
+main_wing
+#Nchordwise  Cspace   Nspanwise  Sspace
+20         1.0         26.0      1.0
+
+YDUPLICATE
+0.0
+
+
+SECTION
+#Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+13.61  0    -1.27    7.76    0.0698131700798     
+
+SECTION
+#Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+21.6118394139  17.16    -1.27    0.782    0.0     
+
+
+#---------------------------------------------------------
+SURFACE
+vertical_stabilizer
+#Nchordwise  Cspace   Nspanwise  Sspace
+20         1.0         12.0      -1.1 
+
+SECTION
+#Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+28.79  0    1.54    8.19    0.0     
+
+SECTION
+#Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+32.4164746575  1.54    7.777    0.95    0.0     
+
+
+#---------------------------------------------------------
+SURFACE
+fuselage_horizontal
+#Nchordwise  Cspace   Nspanwise  Sspace
+20           1.0      
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+6.4    -1.87     0     23.62     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+3.64612038251    -1.496     0     29.5714001643     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+2.19436817059    -1.122     0     32.8478236524     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+1.14076771669    -0.748     0     35.2773803711     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+0.392464413565    -0.374     0     37.0465209103     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+0.0    0.0     0     38.02     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+0.392464413565    0.374     0     37.0465209103     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+1.14076771669    0.748     0     35.2773803711     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+2.19436817059    1.122     0     32.8478236524     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+3.64612038251    1.496     0     29.5714001643     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+6.4    1.87     0     23.62     0.0      1        0
+
+
+#---------------------------------------------------------
+SURFACE
+fuselage_vertical
+#Nchordwise  Cspace   Nspanwise  Sspace
+20           1.0      
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+6.4    0     -1.87     23.62     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+3.64612038251    0     -1.496     29.5714001643     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+2.19436817059    0     -1.122     32.8478236524     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+1.14076771669    0     -0.748     35.2773803711     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+0.392464413565    0     -0.374     37.0465209103     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+0.0    0     0.0     38.02     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+0.392464413565    0     0.374     37.0465209103     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+1.14076771669    0     0.748     35.2773803711     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+2.19436817059    0     1.122     32.8478236524     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+3.64612038251    0     1.496     29.5714001643     0.0      1        0
+
+SECTION
+#Xle     Yle      Zle      Chord     Ainc  Nspanwise  Sspace
+6.4    0     1.87     23.62     0.0      1        0