refact(indvel): more logical place for nBlades

src/configs/caradonna1981.m

@@ -94,7 +94,7 @@ Airfoil.polarType = 'file'; % Type of polar to use ('file', 'polynomial')
 Airfoil.coordFile = 'airfoil_data/naca0012.dat';
 
 % If Airfoil.polarType == 'file'
-Airfoil.polarFile = 'airfoil_data/NACA_0012-Re_2e5-1e7.mat';
+Airfoil.polarFile = 'airfoil_data/NACA_0012-Re_1e5-1e7.mat';
 Airfoil.extrapMethod = 'viterna'; % Polar extrapol. ('none', 'spline', 'Viterna')
 
 % ==================================================================================================

src/solvers/indvel.m

@@ -89,8 +89,8 @@ function indvel(OpRot, Mod)
         dD = coeff2force(cd, OpRot, relVel);
 
         % Thrust and torque contributions
-        dFa = dL .* cos(phi) - dD .* sin(phi);
-        dFu = dL .* sin(phi) + dD .* cos(phi);
+        dFa = OpRot.Rot.nBlades * (dL .* cos(phi) - dD .* sin(phi));
+        dFu = OpRot.Rot.nBlades * (dL .* sin(phi) + dD .* cos(phi));
 
         % Final system to solve for v and u
         vw = OpRot.Op.speed + dFa ./ dmdot ./ K_T;
@@ -125,7 +125,7 @@ function force = coeff2force(coeff, OpRot, speed)
     % COEFF2FORCE Convert aerodynamic coefficient to force
 
     rho = OpRot.Op.Flow.rho;
-    nondim = OpRot.Rot.nBlades .* (0.5 * rho * OpRot.Rot.Bl.area .* speed.^2);
+    nondim = 0.5 * rho * 2 * pi * OpRot.Rot.Bl.area .* speed.^2;
 
     force = coeff .* nondim;