Merge branch 'dev'

src/airfoil_data/polargenerator.py

@@ -33,7 +33,7 @@ def main():
 
     airfoil = parse_inputs()
     reynolds = [re * 1000000 for re in [0.2, 0.5, 1, 1.5, 2, 5, 10]]
-    aoa = list(np.arange(-20, 30, 0.5))
+    aoa = list(np.arange(-18, 25, 0.5))
 
     i = 1
     for re in reynolds:

src/classes/@OperRotor/calcperf.m

@@ -33,7 +33,7 @@ function calcperf(self)
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
     % Defaults and constants
-    INTEGRATION_TYPE = 'rect'; % Integrate using rectangular ('rect') or trapezoidal ('trap') method
+    INTEGRATION_TYPE = 'trap'; % Integrate using rectangular ('rect') or trapezoidal ('trap') method
 
     % Thrust, torque and power
     if strcmp(INTEGRATION_TYPE, 'rect')

src/configs/caradonna1981.m

@@ -52,6 +52,7 @@ Sim.Misc.appli  = 'heli'; % Type of application ('helicopter', 'propeller', 'win
 
 % Solvers
 Mod.solvers = {'all'};   % BEMT Solver ('leishman', 'indfact', 'indvel', 'stahlhut', 'all')
+% Mod.solvers = {'leishman'};   % BEMT Solver ('leishman', 'indfact', 'indvel', 'stahlhut', 'all')
 
 % Extensions/corrections
 Mod.Ext.losses = 'all';  % Include losses using Prandtl formula ('none', 'hub', 'tip', 'both')

matlab_airfoil_toolbox @ ec8f9f9b

-Subproject commit 4ae367f38b46b5f058631b8e90c3e4d9b1420e63
+Subproject commit ec8f9f9b31c077d1e1082c1e0a85d72dfa3a2c06

rotor-db @ df827afa

-Subproject commit bafadead8329f955bc8dfd676a996315d9b9b000
+Subproject commit df827afaf6fff36f78104e467c764ecde30dc389