From 62368ea4ef3614bdf0293b6c01f1c0a26e6db13d Mon Sep 17 00:00:00 2001 From: Uwe Fechner Date: Thu, 20 Feb 2025 13:38:17 +0100 Subject: [PATCH 1/2] test second plot --- test/test_plotting.jl | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/test/test_plotting.jl b/test/test_plotting.jl index 4a5808e5..8beef02f 100644 --- a/test/test_plotting.jl +++ b/test/test_plotting.jl @@ -2,7 +2,7 @@ using VortexStepMethod using ControlPlots using Test -function result_vsm() +function create_wa() # Step 1: Define wing parameters n_panels = 20 # Number of panels span = 20.0 # Wing span [m] @@ -43,7 +43,7 @@ plt.ioff() @test isfile("/tmp/plot.pdf") rm("/tmp/plot.pdf") show_plot(fig) - wa = result_vsm() + wa = create_wa() if Sys.islinux() fig = plot_geometry( wa, @@ -61,6 +61,23 @@ plt.ioff() rm("/tmp/Rectangular_wing_geometry_side_view.pdf") @test isfile("/tmp/Rectangular_wing_geometry_top_view.pdf") rm("/tmp/Rectangular_wing_geometry_top_view.pdf") + # Step 5: Initialize the solvers + vsm_solver = Solver(aerodynamic_model_type="VSM") + llt_solver = Solver(aerodynamic_model_type="LLT") + # Step 6: Solve the VSM and LLT + results_vsm = solve(vsm_solver, wa) + results_llt = solve(llt_solver, wa) + # Step 7: Plot spanwise distributions + y_coordinates = [panel.aerodynamic_center[2] for panel in wa.panels] + + fig = plot_distribution( + [y_coordinates, y_coordinates], + [results_vsm, results_llt], + ["VSM", "LLT"], + title="Spanwise Distributions" + ) + @test fig isa plt.PyPlot.Figure end end -plt.ion() \ No newline at end of file +plt.ion() +nothing \ No newline at end of file From a743eda143476a9ca69dc299bf1a42814722a30b Mon Sep 17 00:00:00 2001 From: Uwe Fechner Date: Thu, 20 Feb 2025 13:56:53 +0100 Subject: [PATCH 2/2] Update CI.yml --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d8fb3870..cbee4ea7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,14 +31,14 @@ jobs: arch: x64 version: 1 - os: macOS-latest - arch: x64 + arch: aarch64 version: 1 steps: - name: Install matplotlib run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi shell: bash - name: Install LaTeX - run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get -qq install texlive-full texlive-fonts-extra cm-super; fi + run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get -qq install texlive-full cm-super; fi shell: bash - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2