Nonlinear solveru sing claero (this time for real)

Author: EdoAlvarezR

src/liftingline/liftingline.jl

@@ -1833,7 +1833,7 @@ function _plot_polars(airfoils, airfoils_extrapolated, airfoils_blended;
 
             if isnothing(slice)
                 axs[1].plot(airfoil.alpha, airfoil.cl, stl; label=L"$2y/b = $"*"$(ypos)", color=clr, fmt...)
-                axs[1].plot([airfoil.alpha0], [calc_cl(airfoil, airfoil.alpha0)], "*"; color=clr, fmt...)
+                axs[1].plot([airfoil.alpha0], [calc_claero(airfoil, airfoil.alpha0)], "*"; color=clr, fmt...)
                 axs[2].plot(airfoil.alpha, airfoil.cd, stl; label=L"$2y/b = $"*"$(ypos)", color=clr, fmt...)
                 axs[3].plot(airfoil.alpha, airfoil.cm, stl; label=L"$2y/b = $"*"$(ypos)", color=clr, fmt...)
             end
@@ -1848,18 +1848,18 @@ function _plot_polars(airfoils, airfoils_extrapolated, airfoils_blended;
 
             if isnothing(slice)
                 axs[1].plot(airfoil.alpha, airfoil.cl, stl; color=clr, fmt...)
-                axs[1].plot([airfoil.alpha0], [calc_cl(airfoil, airfoil.alpha0)], "*"; color=clr, fmt...)
+                axs[1].plot([airfoil.alpha0], [calc_claero(airfoil, airfoil.alpha0)], "*"; color=clr, fmt...)
                 axs[2].plot(airfoil.alpha, airfoil.cd, stl; color=clr, fmt...)
                 axs[3].plot(airfoil.alpha, airfoil.cm, stl; color=clr, fmt...)
             else
                 plot_slice(airfoil, slice_alphas, slice; fig, axs, stl, color=clr, fmt...)
-                axs[1].plot([airfoil.alpha0], [calc_cl(airfoil, airfoil.alpha0, slice...)], "*"; color=clr, fmt...)
+                axs[1].plot([airfoil.alpha0], [calc_claero(airfoil, airfoil.alpha0, slice...)], "*"; color=clr, fmt...)
             end
 
         end
 
         ax = axs[1]
-        ax.set_ylabel(L"Lift $c_\ell$")
+        ax.set_ylabel(L"Lift $c_{\ell_\mathrm{aero}}$")
 
         ax = axs[2]
         ax.set_ylabel(L"Drag $c_d$")
@@ -1902,12 +1902,12 @@ function _plot_polars(airfoils, airfoils_extrapolated, airfoils_blended;
 
             if isnothing(slice)
                 axs[1].plot(airfoil.alpha, airfoil.cl, stl; label=lbl, color=clr, fmt...)
-                axs[1].plot([airfoil.alpha0], [calc_cl(airfoil, airfoil.alpha0)], "*"; color=clr, fmt...)
+                axs[1].plot([airfoil.alpha0], [calc_claero(airfoil, airfoil.alpha0)], "*"; color=clr, fmt...)
                 axs[2].plot(airfoil.alpha, airfoil.cd, stl; label=lbl, color=clr, fmt...)
                 axs[3].plot(airfoil.alpha, airfoil.cm, stl; label=lbl, color=clr, fmt...)
             else
                 plot_slice(airfoil, slice_alphas, slice; fig, axs, stl, label=lbl, color=clr, fmt...)
-                axs[1].plot([airfoil.alpha0], [calc_cl(airfoil, airfoil.alpha0, slice...)], "*"; color=clr, fmt...)
+                axs[1].plot([airfoil.alpha0], [calc_claero(airfoil, airfoil.alpha0, slice...)], "*"; color=clr, fmt...)
             end
 
         end
@@ -1916,7 +1916,7 @@ function _plot_polars(airfoils, airfoils_extrapolated, airfoils_blended;
     end
 
     ax = axs[1]
-    ax.set_ylabel(L"Lift $c_\ell$")
+    ax.set_ylabel(L"Lift $c_{\ell_\mathrm{aero}}$")
 
     ax = axs[2]
     ax.set_ylabel(L"Drag $c_d$")

src/liftingline/optimization.jl

@@ -147,6 +147,8 @@ function run_liftingline(;
                             abstol = 1e-13,  
                             maxiters = 800,
                             ),
+        aoas_initial_guess = alpha,                     # Solver initial guess
+        solver_verbose = true,                          # Whether to show solver verbose in unsuccessfull runs
 
         align_joints_with_Uinfs = false,                # Whether to align joint bound vortices with the freestream
 
@@ -274,7 +276,7 @@ function run_liftingline(;
     # Run solver
     result, solver_cache = solve(ll, Uinfs; 
                                         debug=plot_convergence,      # `true` returns the residual rms
-                                        aoas_initial_guess=alpha, 
+                                        aoas_initial_guess, 
                                         align_joints_with_Uinfs, 
                                         solver, solver_optargs,
                                         solver_cache=cache["solver_cache"][NumType]
@@ -283,7 +285,7 @@ function run_liftingline(;
     # Check solver success
     success = SimpleNonlinearSolve.SciMLBase.successful_retcode(result)
 
-    if !success
+    if !success && solver_verbose
         @warn "Lifting line solver did not converge!"
         @show success
         @show solver_cache[:fcalls]

src/liftingline/stripwise.jl

@@ -113,7 +113,7 @@ end
     calc_cm(self, args...; optargs...)
 )
 
-calc_claero(self::FunctionalAirfoil, args...; optargs...) = calc_cl(self, args...; optargs...)
+calc_claero(self::FunctionalAirfoil, args...; optargs...) = self.fun_claero(args...; optargs...)
 
 calc_cl(self::FunctionalAirfoil, args...; optargs...) = self.fun_cl(args...; optargs...)
 calc_cd(self::FunctionalAirfoil, args...; optargs...) = self.fun_cd(args...; optargs...)
@@ -156,9 +156,9 @@ function plot_slice(self::FunctionalAirfoil{N}, alphas, slice;
     fig.suptitle("Element polar at slice [" * join(("x$(i)" for i in 1:length(slice)), ", ") * "] = [" * join(("$x" for x in slice), ", ")*"]")
 
     ax = axs[1]
-    ax.plot(alphas, [calc_cl(self, a, slice...) for a in alphas], stl; optargs...)
+    ax.plot(alphas, [calc_claero(self, a, slice...) for a in alphas], stl; optargs...)
 
-    ax.set_ylabel(L"c_\ell")
+    ax.set_ylabel(L"c_{\ell_\mathrm{aero}}")
 
     ax = axs[2]
     ax.plot(alphas, [calc_cd(self, a, slice...) for a in alphas], stl; optargs...)