Refactoring

Author: ufechner7

examples/bench.jl

@@ -46,12 +46,11 @@ vsm_solver = Solver{P}(aerodynamic_model_type=VSM)
 # Step 5: Solve using both methods
 results_vsm = solve(vsm_solver, wa)
 sol = solve!(vsm_solver, wa)
-results_vsm_base = solve_base(vsm_solver, wa)
-println("Rectangular wing, solve_base:")
-@time results_vsm_base = solve_base(vsm_solver, wa)
-# time Python: 32.0 ms Ryzen 7950x
-# time Julia:   0.6 ms Ryzen 7950x
-#               0.8 ms laptop, performance mode, battery 
+results_vsm_base = solve_base!(vsm_solver, wa)
+println("Rectangular wing, solve_base!:")
+@time results_vsm_base = solve_base!(vsm_solver, wa)
+# time Python: 32.0  ms Ryzen 7950x
+# time Julia:   0.42 ms Ryzen 7950x
 println("Rectangular wing, solve!:")
 @time sol = solve!(vsm_solver, wa)
 println("Rectangular wing, solve:")
@@ -83,8 +82,8 @@ set_va!(body_aero, vel_app)
 
 # Solving and plotting distributions
 results = solve(vsm_solver, body_aero)
-results_base = solve_base(vsm_solver, body_aero)
+results_base = solve_base!(vsm_solver, body_aero)
 println("RAM-air kite:")
-@time results_base = solve_base(vsm_solver, body_aero)
+@time results_base = solve_base!(vsm_solver, body_aero)
 
 nothing

src/VortexStepMethod.jl

@@ -21,7 +21,7 @@ using Pkg
 # Export public interface
 export Wing, Section, RamAirWing
 export BodyAerodynamics
-export Solver, solve, solve_base, solve!, VSMSolution
+export Solver, solve, solve_base!, solve!, VSMSolution
 export calculate_results
 export add_section!, set_va!
 export calculate_span, calculate_projected_area

src/body_aerodynamics.jl

@@ -438,9 +438,7 @@ function update_effective_angle_of_attack_if_VSM(body_aero::BodyAerodynamics,
     va_unit_array::Matrix{Float64})
 
     # Calculate AIC matrices (keep existing optimized view)
-    calculate_AIC_matrices!(
-        body_aero, LLT, core_radius_fraction, va_norm_array, va_unit_array
-    )
+    calculate_AIC_matrices!(body_aero, LLT, core_radius_fraction, va_norm_array, va_unit_array)
     AIC_x, AIC_y, AIC_z = @views body_aero.AIC[1, :, :], body_aero.AIC[2, :, :], body_aero.AIC[3, :, :]
 
     # Preallocate and calculate induced velocity directly

src/solver.jl

@@ -15,7 +15,7 @@ Struct for storing the solution of the [solve!](@ref) function. Must contain all
 - solver_status::SolverStatus: enum, see [SolverStatus](@ref)
 """
 @with_kw mutable struct VSMSolution{P}
-    ### private vectors of solve_base
+    ### private vectors of solve_base!
     x_airf_array::Matrix{Float64} = zeros(P, 3)
     y_airf_array::Matrix{Float64} = zeros(P, 3)
     z_airf_array::Matrix{Float64} = zeros(P, 3)
@@ -146,7 +146,7 @@ function solve!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=
     log=false, reference_point=zeros(MVec3), moment_frac=0.1)
 
     # calculate intermediate result
-    solve_base(solver, body_aero, gamma_distribution; log, reference_point)
+    solve_base!(solver, body_aero, gamma_distribution; log, reference_point)
     gamma_new = solver.lr.gamma_new
     if !isnothing(solver.sol.gamma_distribution)
         solver.sol.gamma_distribution .= gamma_new
@@ -312,7 +312,7 @@ A dictionary with the results.
 function solve(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=nothing; 
     log=false, reference_point=zeros(MVec3))
     # calculate intermediate result
-    solve_base(solver, body_aero, gamma_distribution; log, reference_point)
+    solve_base!(solver, body_aero, gamma_distribution; log, reference_point)
 
     # Calculate final results as dictionary
     results = calculate_results(
@@ -344,7 +344,7 @@ end
     end
 end
 
-function solve_base(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=nothing; 
+function solve_base!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=nothing; 
                log=false, reference_point=zeros(MVec3))
 
     # check arguments

test/bench2.jl

@@ -43,8 +43,8 @@ P = length(wa.panels)
 vsm_solver = Solver{P}(aerodynamic_model_type=VSM)
 
 # Step 5: Solve using both methods
-println("Rectangular wing, solve_base:")
-@btime results_vsm_base = solve_base($vsm_solver, $wa) # 112 allocations
+println("Rectangular wing, solve_base!:")
+@btime results_vsm_base = solve_base!($vsm_solver, $wa) # 112 allocations
 # time Python: 32.0 ms Ryzen 7950x
 # time Julia:   0.6 ms Ryzen 7950x
 #               0.47 ms laptop, performance mode, grid