Comment out unnecessary memory allocation

Author: EdoAlvarezR

Project.toml

@@ -22,7 +22,7 @@ WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"
 Dierckx = "0.5"
 GeometricTools = "2.2"
 ImplicitAD = "0.3"
-Krylov = "0.9"
+Krylov = "0.10"
 Requires = "1"
 julia = "1.6"
 

examples/sweptwing_aoasweep.jl

@@ -188,12 +188,15 @@ CLs = sign.(dot.(Ls, Lhats)) .* norm.(Ls) / nondim
 CDs = sign.(dot.(Ds, Dhats)) .* norm.(Ds) / nondim
 
 # VSPAERO CL and CD
-data_vsp = CSV.read(vsp_file, DataFrame; skipto=397, limit=419-397+1)
+# data_vsp = CSV.read(vsp_file, DataFrame; skipto=397, limit=419-397+1)
+data_vsp = CSV.read(vsp_file, DataFrame; skipto=495, limit=536-495+1)
 alphas_vsp = [val for val in data_vsp[1, 2:end]]
 CDi_vsp = [val for val in data_vsp[3, 2:end]]
 CDtot_vsp = [val for val in data_vsp[6, 2:end]]
-CL_vsp = [val for val in data_vsp[11, 2:end]]
-CMy_vsp = [val for val in data_vsp[16, 2:end]]
+# CL_vsp = [val for val in data_vsp[11, 2:end]]
+CL_vsp = [val for val in data_vsp[20, 2:end]]
+# CMy_vsp = [val for val in data_vsp[16, 2:end]]
+CMy_vsp = [val for val in data_vsp[29, 2:end]]
 
 fig5 = plt.figure(figsize=[7*2, 5*1*0.75]*2/3)
 axs = fig5.subplots(1, 2)

examples/sweptwing_postprocessing.jl

@@ -63,10 +63,10 @@ function plot_Cps(body::Union{pnl.NonLiftingBody, pnl.AbstractLiftingBody}, cont
         # Plot VSPAERO
         if plot_vsp && AOA == 4.2
 
-            rowstart =  spanpos==0.041 ? 1139 :
-                        spanpos==0.163 ? 1169 :
-                        spanpos==0.245 ? 1184 :
-                        spanpos==0.510 ? 1199 :
+            rowstart =  spanpos==0.041 ? 1139 + (1578 - 1139) :
+                        spanpos==0.163 ? 1169 + (1578 - 1139) :
+                        spanpos==0.245 ? 1184 + (1578 - 1139) :
+                        spanpos==0.510 ? 1199 + (1578 - 1139) :
                         nothing
 
             if !isnothing(rowstart)
@@ -258,19 +258,32 @@ function plot_loading(body::Union{pnl.NonLiftingBody, pnl.AbstractLiftingBody},
         # Plot VSPAERO
         if plot_vsp
 
-            rowstart =  AOA==2.1 ? 482 :
-                        AOA==4.2 ? 544 :
-                        AOA==6.3 ? 606 :
-                        AOA==8.4 ? 668 :
+            # rowstart =  AOA==2.1 ? 482 :
+            #             AOA==4.2 ? 544 :
+            #             AOA==6.3 ? 606 :
+            #             AOA==8.4 ? 668 :
+            rowstart =  AOA==2.1 ? 644 :
+                        AOA==4.2 ? 751 :
+                        AOA==6.3 ? 858 :
+                        AOA==8.4 ? 965 :
                         nothing
 
             if !isnothing(rowstart)
 
-                data_vsp = CSV.read(vsp_file, DataFrame; skipto=rowstart+20, limit=24)
+                data_vsp = CSV.read(vsp_file, DataFrame; skipto=rowstart+28, limit=77)
 
-                ypos_vsp = [val for val in data_vsp[1, 2:end]]
-                cl_vsp = [val for val in data_vsp[9, 2:end]]
-                cd_vsp = [val for val in data_vsp[7, 2:end]]
+                println(rowstart)
+                # display(data_vsp)
+
+                println(data_vsp[21, 1])
+                println(data_vsp[29, 1])
+                println(data_vsp[23, 1])
+
+                ypos_vsp = 2*[val for val in data_vsp[21, 2:end]] / 2.48920 
+                ypos_vsp .+= 1
+                ypos_vsp ./= 2
+                cl_vsp = [val for val in data_vsp[29, 2:end]]
+                cd_vsp = [val for val in data_vsp[23, 2:end]]
 
                 ypos_vsp .-= 0.5
                 ypos_vsp .*= 2.0

src/FLOWPanel_liftingbody.jl

@@ -368,15 +368,8 @@ function _G_U_RHS_leastsquares!(self::AbstractBody,
 
     @assert size(G, 1)==n && size(G, 2)==n ""*
         "Invalid $(size(G, 1))x$(size(G, 2)) matrix G; expected $(n)x$(n)"
-    @assert size(Gred, 1)==n && size(Gred, 2)==n-npres ""*
-        "Invalid $(size(Gred, 1))x$(size(Gred, 2)) matrix Gred; expected $(n)x$(n-npres)"
-    @assert size(tGred, 1)==n-npres && size(tGred, 2)==n ""*
-        "Invalid $(size(tGred, 1))x$(size(tGred, 2)) matrix tGred; expected $(n-npres)x$(n)"
-    @assert size(Gls, 1)==n-npres && size(Gls, 2)==n-npres ""*
-        "Invalid $(size(Gls, 1))x$(size(Gls, 2)) matrix Gls; expected $(n-npres)x$(n-npres)"
 
     @assert length(RHS)==n "Invalid RHS length $(length(RHS)); expected $(n)"
-    @assert length(RHSls)==n-npres "Invalid RHSls length $(length(RHSls)); expected $(n-npres)"
 
     # Sort prescribed elements by index
     sort!(elprescribe, by = x -> x[1])
@@ -392,6 +385,14 @@ function _G_U_RHS_leastsquares!(self::AbstractBody,
         return Gls, RHSls
     end
 
+    @assert size(Gls, 1)==n-npres && size(Gls, 2)==n-npres ""*
+        "Invalid $(size(Gls, 1))x$(size(Gls, 2)) matrix Gls; expected $(n-npres)x$(n-npres)"
+    @assert length(RHSls)==n-npres "Invalid RHSls length $(length(RHSls)); expected $(n-npres)"
+    @assert size(Gred, 1)==n && size(Gred, 2)==n-npres ""*
+        "Invalid $(size(Gred, 1))x$(size(Gred, 2)) matrix Gred; expected $(n)x$(n-npres)"
+    @assert size(tGred, 1)==n-npres && size(tGred, 2)==n ""*
+        "Invalid $(size(tGred, 1))x$(size(tGred, 2)) matrix tGred; expected $(n-npres)x$(n)"
+
     # Move influence of prescribed vortex ring elements to right-hand side
     for (eli, elval) in elprescribe
         for i in 1:length(RHS)

src/FLOWPanel_multibody.jl

@@ -404,14 +404,21 @@ function allocate_solver(self::Union{MultiBody{VortexRing, 2}, RigidWakeBody{Vor
     npres = length(_elprescribe)
 
     Gamma = zeros(T, n)
-    Gammals = zeros(T, n-npres)
+    # Gammals = zeros(T, n-npres)
     G = zeros(T, n, n)
-    Gred = zeros(T, n, n-npres)
-    tGred = zeros(T, n-npres, n)
-    gpuGred = zeros(T, n, n-npres)
-    Gls = zeros(T, n-npres, n-npres)
+    # Gred = zeros(T, n, n-npres)
+    # tGred = zeros(T, n-npres, n)
+    # gpuGred = zeros(T, n, n-npres)
+    # Gls = zeros(T, n-npres, n-npres)
     RHS = zeros(T, n)
-    RHSls = zeros(T, n-npres)
+    # RHSls = zeros(T, n-npres)
+
+    Gammals = nothing
+    Gred = nothing
+    tGred = nothing
+    gpuGred = nothing
+    Gls = nothing
+    RHSls = nothing
 
     return (; Gamma, Gammals, G, Gred, tGred, gpuGred, Gls, RHS, RHSls)
 end