Reduce allocs

Author: 1-Bart-1

examples/ram_air_kite.jl

@@ -2,9 +2,9 @@ using ControlPlots
 using VortexStepMethod
 using LinearAlgebra
 
-PLOT = false
+PLOT = true
 USE_TEX = false
-DEFORM = true
+DEFORM = false
 
 # Create wing geometry
 wing = RamAirWing("data/ram_air_kite_body.obj", "data/ram_air_kite_foil.dat")
@@ -14,15 +14,8 @@ println("First init")
 
 if DEFORM
     # Linear interpolation of alpha from 10° at one tip to 0° at the other
-    n_panels = wing.n_panels
-    theta_start = deg2rad(10)
-    theta_end = deg2rad(0)
-    delta_start = deg2rad(10)
-    delta_end = deg2rad(0)
-    theta_dist = [theta_start - i * (theta_start - theta_end)/(n_panels-1) for i in 0:(n_panels-1)]
-    delta_dist = [delta_start - i * (delta_start - delta_end)/(n_panels-1) for i in 0:(n_panels-1)]
     println("Deform")
-    @time VortexStepMethod.deform!(wing, theta_dist, delta_dist)
+    @time VortexStepMethod.smooth_deform!(wing, deg2rad.([10,20,10,0]), deg2rad.([-10,0,-10,0]))
     println("Deform init")
     @time VortexStepMethod.init!(body_aero; init_aero=false)
 end

src/kite_geometry.jl

@@ -519,29 +519,29 @@ end
 
 function smooth_deform!(wing::RamAirWing, theta_angles::AbstractVector, delta_angles::AbstractVector)
     !(wing.n_panels % length(theta_angles) == 0) && throw(ArgumentError("Number of angles has to be a multiple of number of panels"))
-    panels = wing.panels
+    n_panels = wing.n_panels
     theta_dist = wing.theta_dist
     delta_dist = wing.delta_dist
 
-    dist_idx = 1
+    dist_idx = 0
     for angle_idx in eachindex(theta_angles)
         for _ in 1:(wing.n_panels ÷ length(theta_angles))
+            dist_idx += 1
             theta_dist[dist_idx] = theta_angles[angle_idx]
             delta_dist[dist_idx] = delta_angles[angle_idx]
-            dist_idx += 1
         end
     end
     @assert (dist_idx == wing.n_panels)
 
     window_size = wing.n_panels ÷ length(theta_angles)
-    if length(panels) > window_size
+    if n_panels > window_size
         smoothed = copy(theta_dist)
-        for i in (window_size÷2 + 1):(length(panels) - window_size÷2)
-            smoothed[i] = mean(theta_dist[(i - window_size÷2):(i + window_size÷2)])
+        for i in (window_size÷2 + 1):(n_panels - window_size÷2)
+            @views smoothed[i] = mean(theta_dist[(i - window_size÷2):(i + window_size÷2)])
         end
         theta_dist .= smoothed
-        for i in (window_size÷2 + 1):(length(panels) - window_size÷2)
-            smoothed[i] = mean(delta_dist[(i - window_size÷2):(i + window_size÷2)])
+        for i in (window_size÷2 + 1):(n_panels - window_size÷2)
+            @views smoothed[i] = mean(delta_dist[(i - window_size÷2):(i + window_size÷2)])
         end
         delta_dist .= smoothed
     end