Merge pull request #368 from suavecode/develop

Big Merge for 2.2

.gitignore

@@ -43,7 +43,8 @@ nosetests.xml
 
 # local directories
 /workspace
-
+.idea
+
 # latex
 *.aux
 *.log

README.md

@@ -30,6 +30,7 @@ Contributing Developers
 * Michael Kruger
 * Michael Vegh
 * Pedro Goncalves
+* Racheal Erhard
 * Rick Fenrich
 * Tarik Orra
 * Theo St. Francis
@@ -67,3 +68,55 @@ Developer Install
 -----------------
 
 See [develop](http://suave.stanford.edu/download/develop_install.html).
+
+Citing SUAVE
+-----------------
+
+This respository may be cited via BibTex as:
+
+```
+@software{SUAVEGit,
+  author = {
+    Wendorff, A. and
+    Variyar, A. and
+    Ilario, C. and
+    Botero, E. and
+    Capristan, F. and
+    Smart, J. and 
+    Alonso, J. and
+    Kulik, L. and
+    Clarke, M. and
+    Colonno, M. and 
+    Kruger, M. and
+    Vegh, J. M. and 
+    Goncalves, P. and
+    Erhard, R. and
+    Fenrich, R. and
+    Orra, T. and 
+    St. Francis, T. and
+    MacDonald, T. and
+    Momose, T. and
+    Economon, T. and
+    Lukaczyk, T. and
+    Maier, W.
+},
+  title = {SUAVE: An Aerospace Vehicle Environment for Designing Future Aircraft},
+  url = {https://github.com/suavecode/SUAVE},
+  version = {2.1},
+  year = {2020},
+}
+```
+The most recent publication covering the general capabilities of SUAVE was presented at the 18th AIAA/ISSMO Multidisciplinary Analysis and Optimization Conference and may be cited via BibTex as:
+
+```
+@inbook{SUAVE2017,
+author = {Timothy MacDonald and Matthew Clarke and Emilio M. Botero and Julius M. Vegh and Juan J. Alonso},
+title = {SUAVE: An Open-Source Environment Enabling Multi-Fidelity Vehicle Optimization},
+booktitle = {18th AIAA/ISSMO Multidisciplinary Analysis and Optimization Conference},
+chapter = {},
+pages = {},
+doi = {10.2514/6.2017-4437},
+URL = {https://arc.aiaa.org/doi/abs/10.2514/6.2017-4437},
+eprint = {https://arc.aiaa.org/doi/pdf/10.2514/6.2017-4437}
+}
+```

regression/automatic_regression.py

@@ -5,19 +5,20 @@
 #           Jul 2017, SUAVE Team
 #           Jan 2018, SUAVE Team
 #           May 2019, T. MacDonald
-#           Mar 2020, M. Clarke
+#           Mar 2020, M. Clarke 
 
 # ----------------------------------------------------------------------
 #   Imports
 # ----------------------------------------------------------------------
 
+import matplotlib.pyplot as plt
 import matplotlib
 matplotlib.use('Agg')
 
 import SUAVE
 from SUAVE.Core.DataOrdered import DataOrdered
 import sys, os, traceback, time
-import matplotlib.pyplot as plt
+
 
 # ----------------------------------------------------------------------
 #   How This Works
@@ -36,9 +37,7 @@
 modules = [
 
     # ----------------------- Regression List --------------------------
-    'scripts/aerodynamics/aerodynamics.py',
-    #'scripts/aerodynamics_super/aerodynamics_super.py',
-    #'scripts/regression/test_mission_AS2.py', 
+    'scripts/aerodynamics/aerodynamics.py', 
     'scripts/airfoil_import/airfoil_import_test.py',    
     'scripts/atmosphere/atmosphere.py',
     'scripts/atmosphere/constant_temperature.py',
@@ -67,20 +66,21 @@
     'scripts/mission_range_and_weight_sizing/landing_field_length.py', 
     'scripts/mission_range_and_weight_sizing/take_off_field_length.py',
     'scripts/mission_range_and_weight_sizing/take_off_weight_from_tofl.py', 
+    'scripts/motor/motor_test.py',     
     'scripts/multifidelity/optimize_mf.py',
     'scripts/noise_optimization/Noise_Test.py', 
     'scripts/optimization_packages/optimization_packages.py',    
-    'scripts/payload_range/payload_range.py',
+    'scripts/payload_range/payload_range.py', 
+    'scripts/plots/plot_test.py',    
     'scripts/propeller/propeller_test.py',
-    'scripts/motor/motor_test.py', 
     'scripts/propulsion_surrogate/propulsion_surrogate.py',
     'scripts/ramjet_network/ramjet_network.py',
     'scripts/Regional_Jet_Optimization/Optimize2.py',
     'scripts/scramjet_network/scramjet_network.py',
     'scripts/rocket_network/Rocketdyne_F1.py',
     'scripts/rocket_network/Rocketdyne_J2.py',   
     'scripts/segments/segment_test.py',     
-    'scripts/sizing_loop/sizing_loop.py',
+    'scripts/slipstream/slipstream_test.py',
     'scripts/solar_network/solar_network.py',
     'scripts/solar_network/solar_low_fidelity_network.py',
     'scripts/solar_radiation/solar_radiation.py',
@@ -205,3 +205,4 @@ def test_module(module_path):
 
 if __name__ == '__main__':
     main()
+