Add controlplots tests

Author: 1-Bart-1

.github/workflows/CI.yml

@@ -86,6 +86,14 @@ jobs:
     - uses: julia-actions/julia-runtest@v1
       env:
         BUILD_IS_PRODUCTION_BUILD: false
+    - name: Install matplotlib
+      run: sudo apt-get install -y python3-matplotlib
+    - name: Build PyCall
+      run: julia --project=test -e 'ENV["PYTHON"]=""; using Pkg; Pkg.add("PyCall"); Pkg.build("PyCall")'
+    - name: Test Makie plotting
+      run: julia --project=test test/plotting/test_plotting.jl Makie
+    - name: Test ControlPlots plotting
+      run: julia --project=test --threads=1 test/plotting/test_plotting.jl ControlPlots
     - uses: julia-actions/julia-processcoverage@v1
     - uses: codecov/codecov-action@v5
       with:

test/Project.toml

@@ -5,6 +5,7 @@ CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
 Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -22,6 +23,7 @@ CSV = "0.10"
 DataFrames = "1.7"
 Documenter = "1.8"
 CairoMakie = "0"
+ControlPlots = "0.2.5"
 Interpolations = "0.15, 0.16"
 LinearAlgebra = "1"
 Logging = "1"

test/plotting/test_plotting.jl

@@ -1,5 +1,13 @@
+backend = length(ARGS) >= 1 ? ARGS[1] : "Makie"
+if backend == "Makie"
+    using CairoMakie
+elseif backend == "ControlPlots"
+    using ControlPlots
+else
+    error("Unknown plotting backend: $backend. Use \"Makie\" or \"ControlPlots\".")
+end
+
 using VortexStepMethod
-using CairoMakie
 using Test
 
 # Resolve repo data directory for ram air kite assets
@@ -29,7 +37,9 @@ if !@isdefined ram_wing
     foil_src = joinpath(_ram_data_dir, "ram_air_kite_foil.dat")
     cp(body_src, body_path; force=true)
     cp(foil_src, foil_path; force=true)
-    ram_wing = ObjWing(body_path, foil_path; alpha_range=deg2rad.(-1:1), delta_range=deg2rad.(-1:1))
+    ram_wing = ObjWing(body_path, foil_path;
+                       alpha_range=deg2rad.(-1:1),
+                       delta_range=deg2rad.(-1:1))
 end
 
 function create_body_aero()
@@ -38,33 +48,31 @@ function create_body_aero()
     span = 20.0            # Wing span [m]
     chord = 1.0            # Chord length [m]
     v_a = 20.0             # Magnitude of inflow velocity [m/s]
-    density = 1.225        # Air density [kg/m³]
     alpha_deg = 30.0       # Angle of attack [degrees]
     alpha = deg2rad(alpha_deg)
 
     # Step 2: Create wing geometry with linear panel distribution
     wing = Wing(n_panels, spanwise_distribution=LINEAR)
 
-    # Add wing sections - defining only tip sections with inviscid airfoil model
-    add_section!(wing, 
-        [0.0, span/2, 0.0],    # Left tip LE 
-        [chord, span/2, 0.0],  # Left tip TE
+    # Add wing sections
+    add_section!(wing,
+        [0.0, span/2, 0.0],
+        [chord, span/2, 0.0],
         INVISCID)
-    add_section!(wing, 
-        [0.0, -span/2, 0.0],   # Right tip LE
-        [chord, -span/2, 0.0], # Right tip TE
+    add_section!(wing,
+        [0.0, -span/2, 0.0],
+        [chord, -span/2, 0.0],
         INVISCID)
 
     # Step 3: Initialize aerodynamics
     refine!(wing)
     body_aero = BodyAerodynamics([wing])
-    # Set inflow conditions
     vel_app = [cos(alpha), 0.0, sin(alpha)] .* v_a
     set_va!(body_aero, vel_app)
     body_aero
 end
 
-@testset "Plotting" begin
+@testset "Plotting ($backend)" begin
     save_dir = tempdir()
     body_aero = create_body_aero()
 
@@ -75,15 +83,27 @@ end
         save_path=save_dir,
         is_save=true,
         is_show=false)
-    @test fig isa Figure
-    @test isfile(joinpath(save_dir, "Rectangular_wing_geometry_angled_view.png"))
-    safe_rm(joinpath(save_dir, "Rectangular_wing_geometry_angled_view.png"))
-    @test isfile(joinpath(save_dir, "Rectangular_wing_geometry_front_view.png"))
-    safe_rm(joinpath(save_dir, "Rectangular_wing_geometry_front_view.png"))
-    @test isfile(joinpath(save_dir, "Rectangular_wing_geometry_side_view.png"))
-    safe_rm(joinpath(save_dir, "Rectangular_wing_geometry_side_view.png"))
-    @test isfile(joinpath(save_dir, "Rectangular_wing_geometry_top_view.png"))
-    safe_rm(joinpath(save_dir, "Rectangular_wing_geometry_top_view.png"))
+    if backend == "Makie"
+        @test fig isa Figure
+    else
+        @test fig !== nothing
+    end
+    @test isfile(joinpath(save_dir,
+                          "Rectangular_wing_geometry_angled_view.png"))
+    safe_rm(joinpath(save_dir,
+                     "Rectangular_wing_geometry_angled_view.png"))
+    @test isfile(joinpath(save_dir,
+                          "Rectangular_wing_geometry_front_view.png"))
+    safe_rm(joinpath(save_dir,
+                     "Rectangular_wing_geometry_front_view.png"))
+    @test isfile(joinpath(save_dir,
+                          "Rectangular_wing_geometry_side_view.png"))
+    safe_rm(joinpath(save_dir,
+                     "Rectangular_wing_geometry_side_view.png"))
+    @test isfile(joinpath(save_dir,
+                          "Rectangular_wing_geometry_top_view.png"))
+    safe_rm(joinpath(save_dir,
+                     "Rectangular_wing_geometry_top_view.png"))
 
     # Step 5: Initialize the solvers
     vsm_solver = Solver(body_aero; aerodynamic_model_type=VSM)
@@ -94,7 +114,8 @@ end
     results_llt = solve(llt_solver, body_aero)
 
     # Step 7: Plot spanwise distributions
-    y_coordinates = [panel.aero_center[2] for panel in body_aero.panels]
+    y_coordinates = [panel.aero_center[2]
+                     for panel in body_aero.panels]
 
     fig = plot_distribution(
         [y_coordinates, y_coordinates],
@@ -103,10 +124,14 @@ end
         title="Spanwise Distributions",
         is_show=false
     )
-    @test fig isa Figure
+    if backend == "Makie"
+        @test fig isa Figure
+    else
+        @test fig !== nothing
+    end
 
     # Step 8: Plot polar curves
-    v_a = 20.0            # Magnitude of inflow velocity [m/s]
+    v_a = 20.0
     angle_range = range(0, 20, 20)
     fig = plot_polars(
         [llt_solver, vsm_solver],
@@ -121,14 +146,21 @@ end
         is_save=true,
         is_show=false
     )
-    @test fig isa Figure
+    if backend == "Makie"
+        @test fig isa Figure
+    else
+        @test fig !== nothing
+    end
     @test isfile(joinpath(save_dir, "Rectangular_Wing_Polars.png"))
     safe_rm(joinpath(save_dir, "Rectangular_Wing_Polars.png"))
 
     # Step 9: Test polar data plotting
-    # ram_wing is an ObjWing - no refine! needed
     body_aero = BodyAerodynamics([ram_wing])
     fig = plot_polar_data(body_aero; is_show=false)
-    @test fig isa Figure
+    if backend == "Makie"
+        @test fig isa Figure
+    else
+        @test fig !== nothing
+    end
 end
-nothing
+nothing

test/runtests.jl

@@ -41,7 +41,6 @@ end::Bool
     should_run_test("filament/test_bound_filament.jl") && include("filament/test_bound_filament.jl")
     should_run_test("filament/test_semi_infinite_filament.jl") && include("filament/test_semi_infinite_filament.jl")
     should_run_test("panel/test_panel.jl") && include("panel/test_panel.jl")
-    should_run_test("plotting/test_plotting.jl") && include("plotting/test_plotting.jl")
     should_run_test("polars/test_polars.jl") && include("polars/test_polars.jl")
     should_run_test("ram_geometry/test_kite_geometry.jl") && include("ram_geometry/test_kite_geometry.jl")
     should_run_test("settings/test_settings.jl") && include("settings/test_settings.jl")