SolverSettings constructor complete

Author: ufechner7

data/vsm_settings.yaml

@@ -2,11 +2,14 @@ Model:
     VSM: Vortex Step Method
     LLT: Lifting Line Theory
 PanelDistribution:
-   LINEAR:             Linear distribution
-   COSINE:             Cosine distribution
-   COSINE_VAN_GARREL:  van Garrel cosine distribution
-   SPLIT_PROVIDED:     Split provided sections
-   UNCHANGED:          Keep original sections
+    LINEAR:             Linear distribution
+    COSINE:             Cosine distribution
+    COSINE_VAN_GARREL:  van Garrel cosine distribution
+    SPLIT_PROVIDED:     Split provided sections
+    UNCHANGED:          Keep original sections
+InitialGammaDistribution:
+    ELLIPTIC:           Elliptic distribution
+    ZEROS:              Constant distribution
 
 wings:
     - name: main_wing
@@ -16,5 +19,18 @@ wings:
       spanwise_direction: [0.0, 1.0, 0.0]
       remove_nan: true
 solver_settings:
+    n_panels: 40
+    n_groups: 40
     aerodynamic_model_type: VSM
-    max_iterations: 1000
+    density: 1.225                   # air density  [kg/m³]
+    max_iterations: 1500
+    rtol: 1e-5                       # relative error   [-]
+    tol_reference_error: 0.001
+    relaxation_factor: 0.03          # relaxation factor for convergence
+    artificial_damping: false        # whether to apply artificial damping
+    k2: 0.1                          # artificial damping parameter
+    k4: 0.0                          # artificial damping parameter
+    type_initial_gamma_distribution: ELLIPTIC
+    core_radius_fraction: 1e-20
+    mu: 1.81e-5                      # dynamic viscosity [N·s/m²]
+    calc_only_f_and_gamma: false     # whether to only output f and gamma

src/settings.jl

@@ -33,8 +33,25 @@ end
 function vs(filename)
     res = VSMSettings()
     data = YAML.load_file(joinpath("data", filename))
-    res.solver_settings.max_iterations = data["solver_settings"]["max_iterations"]
-    res.solver_settings.aerodynamic_model_type = eval(Symbol(data["solver_settings"]["aerodynamic_model_type"]))
+    # update solver settings
+    solver = data["solver_settings"]
+    res.solver_settings.n_panels = solver["n_panels"]
+    res.solver_settings.n_groups = solver["n_groups"]
+    res.solver_settings.aerodynamic_model_type = eval(Symbol(solver["aerodynamic_model_type"]))
+    res.solver_settings.density = solver["density"]
+    res.solver_settings.max_iterations = solver["max_iterations"]
+    res.solver_settings.rtol = solver["rtol"]
+    res.solver_settings.tol_reference_error = solver["tol_reference_error"]
+    res.solver_settings.relaxation_factor = solver["relaxation_factor"]
+    res.solver_settings.artificial_damping = solver["artificial_damping"]
+    res.solver_settings.k2 = solver["k2"]
+    res.solver_settings.k4 = solver["k4"]
+    res.solver_settings.type_initial_gamma_distribution = eval(Symbol(solver["type_initial_gamma_distribution"]))
+    res.solver_settings.core_radius_fraction = solver["core_radius_fraction"]
+    res.solver_settings.mu = solver["mu"]
+    res.solver_settings.calc_only_f_and_gamma = solver["calc_only_f_and_gamma"]
+
+    # add and update wing settings
     for (i, wing) in pairs(data["wings"])
         push!(res.wings, WingSettings())
         res.wings[i].name = wing["name"]