Remove last instances of groups

1-Bart-1 · 1-Bart-1 · commit 135a71394f58 · 2025-12-06T17:01:28.000+01:00
diff --git a/data/TUDELFT_V3_KITE/vsm_settings.yaml b/data/TUDELFT_V3_KITE/vsm_settings.yaml
@@ -30,7 +30,6 @@
 #   NEWTON:             Newton-Raphson nonlinear solver
 #
 # USAGE NOTES:
-# - n_panels should be divisible by n_groups for proper load balancing
 # - Higher n_panels improves accuracy but increases computation time
 # - Lower relaxation_factor if convergence issues occur
 
@@ -46,7 +45,6 @@ wings:
     - name: V3_Kite                    # Wing identifier for output labeling
       geometry_file: data/TUDELFT_V3_KITE/aero_geometry.yaml
       n_panels: 36                     # Total number of panels along wingspan
-      n_groups: 1                      # Number of panel groups (must divide n_panels)
       spanwise_panel_distribution: LINEAR    # Panel spacing algorithm
       spanwise_direction: [0.0, 1.0, 0.0]   # Unit vector defining wingspan direction
       remove_nan: true                 # Remove NaN values from polar data
diff --git a/data/pyramid_model/vsm_settings.yaml b/data/pyramid_model/vsm_settings.yaml
@@ -30,7 +30,6 @@
 #   NEWTON:             Newton-Raphson nonlinear solver
 #
 # USAGE NOTES:
-# - n_panels should be divisible by n_groups for proper load balancing
 # - Higher n_panels improves accuracy but increases computation time
 # - Lower relaxation_factor if convergence issues occur
 
@@ -46,7 +45,6 @@ wings:
     - name: V3_Kite                    # Wing identifier for output labeling
       geometry_file: data/pyramid_model/wing_geometry.yaml
       n_panels: 2                     # Total number of panels along wingspan
-      n_groups: 1                      # Number of panel groups (must divide n_panels)
       spanwise_panel_distribution: LINEAR    # Panel spacing algorithm
       spanwise_direction: [0.0, 1.0, 0.0]   # Unit vector defining wingspan direction
       remove_nan: true                 # Remove NaN values from polar data
diff --git a/data/ram_air_kite/vsm_settings.yaml b/data/ram_air_kite/vsm_settings.yaml
@@ -10,21 +10,14 @@ PanelDistribution:
 InitialGammaDistribution:
     ELLIPTIC:           Elliptic distribution
     ZEROS:              Constant distribution
-PanelGroupingMethod:
-    EQUAL_SIZE:         Divide panels into equally-sized sequential groups
-    REFINE:             Group refined panels by their original unrefined section
-
 wings:
     - name: main_wing
       n_panels: 40
-      n_groups: 40
       spanwise_panel_distribution: LINEAR
       spanwise_direction: [0.0, 1.0, 0.0]
-      grouping_method: EQUAL_SIZE
       remove_nan: true
 solver_settings:
     n_panels: 40
-    n_groups: 40
     aerodynamic_model_type: VSM
     density: 1.225                   # air density  [kg/m³]
     max_iterations: 1500
diff --git a/data/ram_air_kite/vsm_settings_dual.yaml b/data/ram_air_kite/vsm_settings_dual.yaml
@@ -14,13 +14,11 @@ InitialGammaDistribution:
 wings:
     - name: main_wing
       n_panels: 40
-      n_groups: 40
       spanwise_panel_distribution: LINEAR
       spanwise_direction: [0.0, 1.0, 0.0]
       remove_nan: true
     - name: tail
       n_panels: 20
-      n_groups: 20
       spanwise_panel_distribution: COSINE
       spanwise_direction: [0.0, 1.1, 0.0]
       remove_nan: false
diff --git a/docs/src/tips_and_tricks.md b/docs/src/tips_and_tricks.md
@@ -10,37 +10,28 @@ The following bodies can be simulated:
 To build the geometry of a RAM-air kite, a 3D .obj file can be used as input. In addition a `.dat` file is needed.
 It should have two columns, one for the `x` and one for the `y` coordinate of the 2D polar that is used.
 
-## Panel Grouping Methods
-When creating a wing, you can specify how panels should be grouped for moment and force calculations using the `grouping_method` parameter. Two methods are available:
+## Unrefined Section Distribution
+When creating a wing, panel forces and moments are automatically computed for each unrefined section. The unrefined sections correspond to the original geometry sections you define, while panels represent the refined mesh used for aerodynamic calculations.
 
-### EQUAL_SIZE (Default)
-Divides refined panels into equally-sized sequential groups. This is the original behavior.
+### How It Works
+The solver automatically tracks which panels belong to which original unrefined section. After refinement (e.g., splitting each section into multiple panels), the aerodynamic forces and moments are aggregated back to the unrefined section level.
 
 ```julia
-wing = Wing(40; n_groups=4, grouping_method=EQUAL_SIZE)
-```
-
-In this example, with 40 panels and 4 groups, each group will contain 10 consecutive panels (panels 1-10, 11-20, 21-30, 31-40).
-
-### REFINE
-Groups refined panels back to their original unrefined section. This is useful when you want group moments and forces to represent the original wing structure, regardless of panel refinement.
-
-```julia
-# Create wing with 4 unrefined sections (3 panels)
-wing = Wing(40; n_groups=3, grouping_method=REFINE)
+# Create wing with 4 sections, refined to 40 panels
+wing = Wing(40)
 add_section!(wing, [0, 5, 0], [1, 5, 0], INVISCID)    # Section 1
 add_section!(wing, [0, 2.5, 0], [1, 2.5, 0], INVISCID) # Section 2
 add_section!(wing, [0, 0, 0], [1, 0, 0], INVISCID)     # Section 3
 add_section!(wing, [0, -5, 0], [1, -5, 0], INVISCID)   # Section 4
 ```
 
-**Important:** When using `REFINE`, `n_groups` must equal the number of unrefined panels (number of sections - 1). The solver will automatically map each refined panel to its closest original unrefined panel and sum their moments and forces accordingly.
+The 40 panels are distributed across the 3 unrefined panels (sections 1-2, 2-3, 3-4). Forces and moments are computed per panel during the solve, then automatically aggregated to the 3 unrefined panels for output.
 
-This is particularly useful for:
+This approach is useful for:
 - LEI kites where you want loads per rib
 - Wings with discrete control surfaces
 - Cases where physical structure doesn't align with uniform panel distribution
-- Dynamic simulations where you have fewer structural segments than panels needed for accurate VSM aerodynamics. For example, a 6-segment structural model can be combined with 40-panel aerodynamics by using `n_groups=6` and `grouping_method=REFINE` to map aerodynamic loads back to the structural segments.
+- Dynamic simulations where you have fewer structural segments than panels needed for accurate VSM aerodynamics. For example, a 6-segment structural model can be combined with 40-panel aerodynamics, with loads automatically mapped back to the 6 structural segments.
 
 ## RAM-air kite model
 If running the example `ram_air_kite.jl` fails, try to run the `cleanup.jl` script and then try again. Background: this example caches the calculated polars. Reading cached polars can fail after an update.
diff --git a/examples/V3_kite.jl b/examples/V3_kite.jl
@@ -50,7 +50,7 @@ PLOT && plot_polars(
     side_slip=sideslip_deg,
     v_a=wind_speed,
     title="$(wing.n_panels)_panels_$(wing.spanwise_distribution)_from_yaml_settings",
-    data_type=".pdf",
+    data_type=".png",
     is_save=false,
     is_show=true,
     use_tex=USE_TEX
@@ -80,7 +80,7 @@ PLOT && plot_distribution(
     [results],
     ["VSM"];
     title="CAD_spanwise_distributions_alpha_$(round(angle_of_attack_deg, digits=1))_delta_$(round(sideslip_deg, digits=1))_yaw_$(round(yaw_rate, digits=1))_v_a_$(round(wind_speed, digits=1))",
-    data_type=".pdf",
+    data_type=".png",
     is_save=false,
     is_show=true,
     use_tex=USE_TEX
diff --git a/examples/pyramid_model.jl b/examples/pyramid_model.jl
@@ -39,7 +39,7 @@ PLOT && plot_polars(
     side_slip=sideslip_deg,
     v_a=wind_speed,
     title="$(wing.n_panels)_panels_$(wing.spanwise_distribution)_pyramid_model",
-    data_type=".pdf",
+    data_type=".png",
     is_save=false,
     is_show=true,
     use_tex=USE_TEX
@@ -67,7 +67,7 @@ PLOT && plot_distribution(
     [results],
     ["VSM"];
     title="pyramid_spanwise_distributions_alpha_$(round(angle_of_attack_deg, digits=1))_delta_$(round(sideslip_deg, digits=1))_yaw_$(round(yaw_rate, digits=1))_v_a_$(round(wind_speed, digits=1))",
-    data_type=".pdf",
+    data_type=".png",
     is_save=false,
     is_show=true,
     use_tex=USE_TEX
diff --git a/examples/rectangular_wing.jl b/examples/rectangular_wing.jl
@@ -57,7 +57,7 @@ println("Projected area = $(round(results_vsm["projected_area"], digits=4)) m²"
 PLOT && plot_geometry(
       body_aero,
       "Rectangular_wing_geometry";
-      data_type=".pdf",
+      data_type=".png",
       save_path=".",
       is_save=false,
       is_show=true,
diff --git a/examples/stall_model.jl b/examples/stall_model.jl
@@ -89,7 +89,7 @@ PLOT && plot_distribution(
     [results, results_with_stall],
     ["VSM", "VSM with stall correction"];
     title="CAD_spanwise_distributions_alpha_$(round(aoa, digits=1))_delta_$(round(side_slip, digits=1))_yaw_$(round(yaw_rate, digits=1))_v_a_$(round(v_a, digits=1))",
-    data_type=".pdf",
+    data_type=".png",
     save_path=joinpath(save_folder, "spanwise_distributions"),
     is_save=false,
     is_show=true,
@@ -123,7 +123,7 @@ PLOT && plot_polars(
     side_slip=0,
     v_a=10,
     title="tutorial_testing_stall_model_n_panels_$(n_panels)_distribution_$(spanwise_distribution)_unrefined_$(CAD_wing.n_unrefined_sections)",
-    data_type=".pdf",
+    data_type=".png",
     save_path=joinpath(save_folder, "polars"),
     is_save=true,
     is_show=true,
diff --git a/ext/VortexStepMethodMakieExt.jl b/ext/VortexStepMethodMakieExt.jl
@@ -237,7 +237,7 @@ function Makie.plot(body_aero::VortexStepMethod.BodyAerodynamics; size = (1200,
 end
 
 """
-    save_plot(fig, save_path, title; data_type=".pdf")
+    save_plot(fig, save_path, title; data_type=".png")
 
 Save a Makie figure to a file.
 
@@ -247,9 +247,9 @@ Save a Makie figure to a file.
 - `title`: Title of the plot
 
 # Keyword arguments
-- `data_type`: File extension (default: ".pdf")
+- `data_type`: File extension (default: ".png", also supports ".jpeg")
 """
-function VortexStepMethod.save_plot(fig, save_path, title; data_type=".pdf")
+function VortexStepMethod.save_plot(fig, save_path, title; data_type=".png")
     isnothing(save_path) && throw(ArgumentError("save_path should be provided"))
 
     !isdir(save_path) && mkpath(save_path)
@@ -434,7 +434,7 @@ end
 
 """
     plot_geometry(body_aero::BodyAerodynamics, title;
-                  data_type=".pdf", save_path=nothing,
+                  data_type=".png", save_path=nothing,
                   is_save=false, is_show=false,
                   view_elevation=15, view_azimuth=-120, use_tex=false)
 
@@ -445,7 +445,7 @@ Plot wing geometry from different viewpoints using Makie.
 - `title`: plot title
 
 # Keyword arguments:
-- `data_type`: File extension (default: ".pdf")
+- `data_type`: File extension (default: ".png", also supports ".jpeg")
 - `save_path`: Path for saving (default: nothing)
 - `is_save`: Whether to save (default: false)
 - `is_show`: Whether to display (default: false)
@@ -454,7 +454,7 @@ Plot wing geometry from different viewpoints using Makie.
 - `use_tex`: Ignored for Makie (default: false)
 """
 function VortexStepMethod.plot_geometry(body_aero::BodyAerodynamics, title;
-    data_type=".pdf",
+    data_type=".png",
     save_path=nothing,
     is_save=false,
     is_show=false,
@@ -491,7 +491,7 @@ end
 
 """
     plot_distribution(y_coordinates_list, results_list, label_list;
-                      title="spanwise_distribution", data_type=".pdf",
+                      title="spanwise_distribution", data_type=".png",
                       save_path=nothing, is_save=false, is_show=true, use_tex=false)
 
 Plot spanwise distributions of aerodynamic properties using Makie.
@@ -503,15 +503,15 @@ Plot spanwise distributions of aerodynamic properties using Makie.
 
 # Keyword arguments
 - `title`: Plot title (default: "spanwise_distribution")
-- `data_type`: File extension (default: ".pdf")
+- `data_type`: File extension (default: ".png", also supports ".jpeg")
 - `save_path`: Path to save plots (default: nothing)
 - `is_save`: Whether to save (default: false)
 - `is_show`: Whether to display (default: true)
 - `use_tex`: Ignored for Makie (default: false)
 """
 function VortexStepMethod.plot_distribution(y_coordinates_list, results_list, label_list;
     title="spanwise_distribution",
-    data_type=".pdf",
+    data_type=".png",
     save_path=nothing,
     is_save=false,
     is_show=true,
@@ -703,7 +703,7 @@ end
                 literature_path_list=String[],
                 angle_range=range(0, 20, 2), angle_type="angle_of_attack",
                 angle_of_attack=0.0, side_slip=0.0, v_a=10.0,
-                title="polar", data_type=".pdf", save_path=nothing,
+                title="polar", data_type=".png", save_path=nothing,
                 is_save=true, is_show=true, use_tex=false)
 
 Plot polar data comparing different solvers using Makie.
@@ -721,7 +721,7 @@ Plot polar data comparing different solvers using Makie.
 - `side_slip`: Side slip angle [rad] (default: 0.0)
 - `v_a`: Wind speed [m/s] (default: 10.0)
 - `title`: Plot title
-- `data_type`: File extension (default: ".pdf")
+- `data_type`: File extension (default: ".png", also supports ".jpeg")
 - `save_path`: Path to save (default: nothing)
 - `is_save`: Whether to save (default: true)
 - `is_show`: Whether to display (default: true)
@@ -738,7 +738,7 @@ function VortexStepMethod.plot_polars(
     side_slip=0.0,
     v_a=10.0,
     title="polar",
-    data_type=".pdf",
+    data_type=".png",
     save_path=nothing,
     is_save=true,
     is_show=true,
diff --git a/src/VortexStepMethod.jl b/src/VortexStepMethod.jl
@@ -36,8 +36,7 @@ export calculate_span, calculate_projected_area
 export MVec3
 export Model, VSM, LLT
 export AeroModel, LEI_AIRFOIL_BREUKELS, POLAR_VECTORS, POLAR_MATRICES, INVISCID
-export PanelDistribution, LINEAR, COSINE, COSINE_VAN_GARREL, SPLIT_PROVIDED, UNCHANGED
-export PanelGroupingMethod, EQUAL_SIZE, REFINE
+export PanelDistribution, LINEAR, COSINE, COSINE_VAN_GARREL, SPLIT_PROVIDED, UNCHANGED, NONE
 export InitialGammaDistribution, ELLIPTIC, ZEROS
 export SolverStatus, FEASIBLE, INFEASIBLE, FAILURE
 export SolverType, LOOP, NONLIN
@@ -143,20 +142,6 @@ Enumeration of the implemented panel distributions.
    NONE               # No refinement - sections already refined
 end
 
-"""
-   PanelGroupingMethod EQUAL_SIZE REFINE
-
-**DEPRECATED**: This enum is deprecated and no longer used.
-Grouping is now automatically handled via unrefined section mapping.
-
-Enumeration of methods for grouping panels (legacy).
-
-# Elements
-- EQUAL_SIZE: (Deprecated) Divide panels into equally-sized sequential groups
-- REFINE: (Deprecated) Group refined panels back to their original unrefined section
-"""
-@enum PanelGroupingMethod EQUAL_SIZE REFINE
-
 """
    InitialGammaDistribution ELLIPTIC ZEROS
 
diff --git a/src/obj_geometry.jl b/src/obj_geometry.jl
@@ -392,8 +392,7 @@ The resulting Wing supports deformation through unrefined_deform! and deform! fu
 - `wind_vel=10.0`: Reference wind velocity for XFoil analysis (m/s)
 - `mass=1.0`: Wing mass (kg)
 - `n_panels=56`: Number of aerodynamic panels across wingspan
-- `n_groups=4`: Number of control groups for deformation
-- `n_sections=n_panels+1`: Number of spanwise cross-sections
+- `n_unrefined_sections`: Number of unrefined sections for deformation control (default: inferred from geometry)
 - `align_to_principal=false`: Align body frame to principal axes of inertia
 - `spanwise_distribution=UNCHANGED`: Panel distribution type (forced to UNCHANGED for ObjWing)
 - `remove_nan=true`: Interpolate NaN values in aerodynamic data
@@ -412,7 +411,7 @@ wing = ObjWing(
     "path/to/airfoil.dat";
     mass=1.5,
     n_panels=40,
-    n_groups=4
+    n_unrefined_sections=4
 )
 
 # Apply deformation
@@ -422,28 +421,12 @@ unrefined_deform!(wing, deg2rad.([5, 10, 5, 0]), deg2rad.([-5, 0, -5, 0]))
 function ObjWing(
     obj_path, dat_path;
     crease_frac=0.9, wind_vel=10., mass=1.0,
-    n_panels=56, n_sections=nothing, n_unrefined_sections=nothing, n_groups=nothing,
+    n_panels=56, n_unrefined_sections=nothing,
     spanwise_distribution=UNCHANGED,
     spanwise_direction=[0.0, 1.0, 0.0], remove_nan=true, align_to_principal=false,
     alpha_range=deg2rad.(-5:1:20), delta_range=deg2rad.(-5:1:20), prn=true,
-    interp_steps=n_panels+1, grouping_method::PanelGroupingMethod=EQUAL_SIZE
+    interp_steps=n_panels+1
 )
-    # Handle deprecated parameters
-    if !isnothing(n_groups)
-        if !isnothing(n_unrefined_sections)
-            error("Cannot specify both n_groups and n_unrefined_sections. Use n_unrefined_sections only.")
-        end
-        @warn "Parameter n_groups is deprecated. Use n_unrefined_sections instead." maxlog=1
-        n_unrefined_sections = n_groups
-    end
-
-    if !isnothing(n_sections)
-        @warn "Parameter n_sections is deprecated. It is now always n_panels+1 for refined sections. Use n_unrefined_sections to control initial sections." maxlog=1
-    end
-
-    if grouping_method != EQUAL_SIZE
-        @warn "Parameter grouping_method is deprecated and ignored. Grouping is now always by unrefined sections." maxlog=1
-    end
 
     # Force NONE distribution for ObjWing
     if spanwise_distribution != NONE
diff --git a/src/settings.jl b/src/settings.jl
diff --git a/src/wing_geometry.jl b/src/wing_geometry.jl
diff --git a/src/yaml_geometry.jl b/src/yaml_geometry.jl
diff --git a/test/plotting/test_plotting.jl b/test/plotting/test_plotting.jl
diff --git a/test/ram_geometry/test_kite_geometry.jl b/test/ram_geometry/test_kite_geometry.jl
diff --git a/test/yaml_geometry/test_yaml_wing_deformation.jl b/test/yaml_geometry/test_yaml_wing_deformation.jl
