Merge pull request #24 from byuflowlab/updateccbtojuliav1.11

Fix broken type broadcast in latest Julia
byuflowlab · Dec 15, 2024 · 44b009d · 44b009d
2 parents 7d55262 + 2cf24eb
commit 44b009d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "FLOWVLM"
 uuid = "1a3ff0be-0410-4572-aa62-b496bdd1f33b"
 authors = ["Eduardo J. Alvarez <[email protected]>"]
-version = "2.1.2"
+version = "2.1.3"
 
 [deps]
 PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"

diff --git a/src/FLOWVLM_rotor_ccb.jl b/src/FLOWVLM_rotor_ccb.jl
@@ -186,9 +186,19 @@ function OCCB2CCB(orotor::OCCBRotor, turbine::Bool, oinflow::OCCBInflow;
 
     airfoil_funs = [(alpha, Re, Mach) -> occb_airfoil(af, alpha) for af in orotor.af]
 
-    sections = ccb.Section.(orotor.r, orotor.chord, orotor.theta, airfoil_funs)
+    # sections = ccb.Section.(orotor.r, orotor.chord, orotor.theta, airfoil_funs)
+    # sections = [ccb.Section(r, c, tht, rfl) for (r, c, tht, rfl) in zip(orotor.r, orotor.chord, orotor.theta, airfoil_funs)]
+    sections = []
+    for (r, c, tht, rfl) in zip(orotor.r, orotor.chord, orotor.theta, airfoil_funs)
+        push!(sections, ccb.Section(r, c, tht, rfl))
+    end
 
-    ops = ccb.OperatingPoint.(oinflow.Vx, oinflow.Vy, oinflow.rho)
+    # ops = ccb.OperatingPoint.(oinflow.Vx, oinflow.Vy, oinflow.rho)
+    # ops = [ccb.OperatingPoint(Vx, Vy, oinflow.rho) for (Vx, Vy) in zip(oinflow.Vx, oinflow.Vy)]
+    ops = []
+    for (Vx, Vy) in zip(oinflow.Vx, oinflow.Vy)
+        push!(ops, ccb.OperatingPoint(Vx, Vy, oinflow.rho))
+    end
 
     return rotor, sections, ops
 end