Merge 6554d2b into a323ed2

suavecode · Mar 17, 2022 · a291807 · a291807
2 parents a323ed2 + 6554d2b
commit a291807
Show file tree

Hide file tree

Showing 575 changed files with 25,800 additions and 20,578 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ for future aircraft incorporating advanced technologies.
 
 [![Build status](https://ci.appveyor.com/api/projects/status/h33v9tottm2t5b9a?svg=true)](https://ci.appveyor.com/project/planes/suave)
 [![Coverage Status](https://coveralls.io/repos/github/suavecode/SUAVE/badge.svg?branch=develop)](https://coveralls.io/github/suavecode/SUAVE?branch=develop)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4784705.svg)](https://doi.org/10.5281/zenodo.4784705)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5661107.svg)](https://doi.org/10.5281/zenodo.5661107)
 
 License: LGPL-2.1
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -18,7 +18,7 @@ install:
     - cd trunk
     - pip3 install --upgrade pip
     - pip3 install --upgrade numpy
-    - pip3 install --upgrade scipy
+    - pip3 install --upgrade scipy==1.7.3
     - pip3 install --upgrade scikit-learn
     - pip3 install --upgrade matplotlib
     - pip3 install --upgrade plotly

diff --git a/doc/suave_config b/doc/suave_config
@@ -38,7 +38,7 @@ PROJECT_NAME           = SUAVE
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.1.0
+PROJECT_NUMBER         = 2.5.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/regression/automatic_regression.py b/regression/automatic_regression.py
@@ -40,16 +40,17 @@
     'scripts/aerodynamics/aerodynamics.py',
     'scripts/aerodynamics/all_moving_surfaces_vlm.py',
     'scripts/aerodynamics/control_surfaces_vlm.py',
+    'scripts/aerodynamics/sears_haack.py',
     'scripts/aerodynamics/sideslip_and_rotation_vlm.py',
     'scripts/airfoil_import/airfoil_import_test.py',
     'scripts/airfoil_import/airfoil_interpolation_test.py',
-    'scripts/airfoil_analysis/airfoil_panel_method_test.py',  
+    'scripts/airfoil_analysis/airfoil_panel_method_test.py',
     'scripts/atmosphere/atmosphere.py',
     'scripts/atmosphere/constant_temperature.py',
     'scripts/AVL/test_AVL.py',
-    'scripts/B737/mission_B737.py', 
+    'scripts/B737/mission_B737.py',
     'scripts/battery/aircraft_discharge_comparisons.py',
-    'scripts/battery/battery_cell_discharge_tests.py', 
+    'scripts/battery/battery_cell_discharge_tests.py',
     'scripts/cmalpha/cmalpha.py',
     'scripts/cnbeta/cnbeta.py',
     'scripts/concorde/concorde.py',
@@ -76,10 +77,10 @@
     '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/noise_optimization/Noise_Test.py',
     'scripts/noise_fidelity_zero/DC_10_noise.py', 
-    'scripts/noise_fidelity_one/propeller_noise.py',  
-    'scripts/noise_fidelity_one/aircraft_noise.py',  
+    'scripts/noise_fidelity_one/propeller_noise.py',
+    'scripts/noise_fidelity_one/aircraft_noise.py',
     'scripts/nonuniform_propeller_inflow/nonuniform_propeller_inflow.py',
     'scripts/optimization_packages/optimization_packages.py',
     'scripts/payload_range/payload_range.py',
@@ -98,17 +99,18 @@
     'scripts/solar_network/solar_network.py',
     'scripts/solar_network/solar_low_fidelity_network.py',
     'scripts/solar_radiation/solar_radiation.py',
-    'scripts/aerodynamics/sears_haack.py',
     'scripts/SU2_surrogate/BWB-450.py',
     'scripts/sweeps/test_sweeps.py',
     'scripts/test_input_output/test_xml_read_write.py',
     'scripts/test_input_output/test_freemind_write.py',
+    'scripts/turboelectric_HTS_ducted_fan_network/turboelectric_HTS_ducted_fan_network.py',
     'scripts/variable_cruise_distance/variable_cruise_distance.py',
     'scripts/V_n_diagram/V_n_diagram_regression.py',
     'scripts/VTOL/test_Multicopter.py',
     'scripts/VTOL/test_Tiltwing.py',
     'scripts/VTOL/test_Stopped_Rotor.py',
     'scripts/weights/weights.py'
+
 ]
 
 # ----------------------------------------------------------------------

diff --git a/regression/scripts/AVL/avl_files/base.avl b/regression/scripts/AVL/avl_files/base.avl
@@ -7,7 +7,7 @@ cruise
   0      0     0.0
 
 #Sref    Cref    Bref 	<meters>
-124.862      4.235     34.32
+124.862      4.4875106307239605     34.32
 
 #Xref    Yref    Zref   <meters>
 15.30987849      0.0     -0.48023939
@@ -44,11 +44,7 @@ SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
 17.5681  5.5598    -0.6873    3.88    0.0472     
 AFILE
-B737c.dat
-CONTROL
-slat    -1.0   -0.075   0. 0. 0.  +1
-CONTROL
-flap    1.0   0.7   0. 0. 0.  +1
+B737b.dat
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
@@ -64,9 +60,9 @@ aileron    -1.0   0.84   0. 0. 0.  -1
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-23.2506  16.5251    0.3686    1.7072    0.02     
+23.2506  16.5251    0.3686    1.7072    0.0026     
 AFILE
-B737c.dat
+B737d.dat
 CONTROL
 slat    -1.0   -0.075   0. 0. 0.  +1
 CONTROL

diff --git a/...ession/scripts/AVL/avl_files/batch_01.run → ...sion/scripts/AVL/avl_files/batch_0001.run b/...ession/scripts/AVL/avl_files/batch_01.run → ...sion/scripts/AVL/avl_files/batch_0001.run
@@ -1,18 +1,21 @@
 
 
  ---------------------------------------------
- Run case  1:   case_01_01
+ Run case  1:   case_0001_0001
 
  alpha        ->  alpha       =   -2.0        
  beta         ->  beta        =   0.0
- pb/2V        ->  pb/2V       =   0.00000
- qc/2V        ->  qc/2V       =   0.00000
+ pb/2V        ->  pb/2V       =   0.0
+ qc/2V        ->  qc/2V       =   0.0
  rb/2V        ->  rb/2V       =   0.00000
+ flap         ->  flap        =   0.00000
+ aileron      ->  Cl roll mom =   0.00000
+ elevator     ->  Cm pitchmom =   0.00000
 
  alpha     =   0.00000     deg
  beta      =   0.00000     deg
- pb/2V     =   0.00000
- qc/2V     =   0.00000
+ pb/2V     =   0.0
+ qc/2V     =   0.0
  rb/2V     =   0.00000
  CL        =   0.00000                        
  CDo       =   0.0
@@ -43,18 +46,21 @@
 
 
  ---------------------------------------------
- Run case  2:   case_01_02
+ Run case  2:   case_0001_0002
 
  alpha        ->  alpha       =   0.0        
  beta         ->  beta        =   0.0
- pb/2V        ->  pb/2V       =   0.00000
- qc/2V        ->  qc/2V       =   0.00000
+ pb/2V        ->  pb/2V       =   0.0
+ qc/2V        ->  qc/2V       =   0.0
  rb/2V        ->  rb/2V       =   0.00000
+ flap         ->  flap        =   0.00000
+ aileron      ->  Cl roll mom =   0.00000
+ elevator     ->  Cm pitchmom =   0.00000
 
  alpha     =   0.00000     deg
  beta      =   0.00000     deg
- pb/2V     =   0.00000
- qc/2V     =   0.00000
+ pb/2V     =   0.0
+ qc/2V     =   0.0
  rb/2V     =   0.00000
  CL        =   0.00000                        
  CDo       =   0.0
@@ -85,18 +91,21 @@
 
 
  ---------------------------------------------
- Run case  3:   case_01_03
+ Run case  3:   case_0001_0003
 
  alpha        ->  alpha       =   2.0        
  beta         ->  beta        =   0.0
- pb/2V        ->  pb/2V       =   0.00000
- qc/2V        ->  qc/2V       =   0.00000
+ pb/2V        ->  pb/2V       =   0.0
+ qc/2V        ->  qc/2V       =   0.0
  rb/2V        ->  rb/2V       =   0.00000
+ flap         ->  flap        =   0.00000
+ aileron      ->  Cl roll mom =   0.00000
+ elevator     ->  Cm pitchmom =   0.00000
 
  alpha     =   0.00000     deg
  beta      =   0.00000     deg
- pb/2V     =   0.00000
- qc/2V     =   0.00000
+ pb/2V     =   0.0
+ qc/2V     =   0.0
  rb/2V     =   0.00000
  CL        =   0.00000                        
  CDo       =   0.0
@@ -127,18 +136,21 @@
 
 
  ---------------------------------------------
- Run case  4:   case_01_04
+ Run case  4:   case_0001_0004
 
  alpha        ->  alpha       =   5.0        
  beta         ->  beta        =   0.0
- pb/2V        ->  pb/2V       =   0.00000
- qc/2V        ->  qc/2V       =   0.00000
+ pb/2V        ->  pb/2V       =   0.0
+ qc/2V        ->  qc/2V       =   0.0
  rb/2V        ->  rb/2V       =   0.00000
+ flap         ->  flap        =   0.00000
+ aileron      ->  Cl roll mom =   0.00000
+ elevator     ->  Cm pitchmom =   0.00000
 
  alpha     =   0.00000     deg
  beta      =   0.00000     deg
- pb/2V     =   0.00000
- qc/2V     =   0.00000
+ pb/2V     =   0.0
+ qc/2V     =   0.0
  rb/2V     =   0.00000
  CL        =   0.00000                        
  CDo       =   0.0
@@ -169,18 +181,21 @@
 
 
  ---------------------------------------------
- Run case  5:   case_01_05
+ Run case  5:   case_0001_0005
 
  alpha        ->  alpha       =   7.0        
  beta         ->  beta        =   0.0
- pb/2V        ->  pb/2V       =   0.00000
- qc/2V        ->  qc/2V       =   0.00000
+ pb/2V        ->  pb/2V       =   0.0
+ qc/2V        ->  qc/2V       =   0.0
  rb/2V        ->  rb/2V       =   0.00000
+ flap         ->  flap        =   0.00000
+ aileron      ->  Cl roll mom =   0.00000
+ elevator     ->  Cm pitchmom =   0.00000
 
  alpha     =   0.00000     deg
  beta      =   0.00000     deg
- pb/2V     =   0.00000
- qc/2V     =   0.00000
+ pb/2V     =   0.0
+ qc/2V     =   0.0
  rb/2V     =   0.00000
  CL        =   0.00000                        
  CDo       =   0.0
@@ -211,18 +226,21 @@
 
 
  ---------------------------------------------
- Run case  6:   case_01_06
+ Run case  6:   case_0001_0006
 
  alpha        ->  alpha       =   10.0        
  beta         ->  beta        =   0.0
- pb/2V        ->  pb/2V       =   0.00000
- qc/2V        ->  qc/2V       =   0.00000
+ pb/2V        ->  pb/2V       =   0.0
+ qc/2V        ->  qc/2V       =   0.0
  rb/2V        ->  rb/2V       =   0.00000
+ flap         ->  flap        =   0.00000
+ aileron      ->  Cl roll mom =   0.00000
+ elevator     ->  Cm pitchmom =   0.00000
 
  alpha     =   0.00000     deg
  beta      =   0.00000     deg
- pb/2V     =   0.00000
- qc/2V     =   0.00000
+ pb/2V     =   0.0
+ qc/2V     =   0.0
  rb/2V     =   0.00000
  CL        =   0.00000                        
  CDo       =   0.0